Merge branch 'craft-3' of https://github.com/verbb/image-resizer into…

… craft-4 # Conflicts: # src/controllers/BaseController.php # src/controllers/LogsController.php # src/jobs/ImageResize.php # src/models/Log.php # src/models/Settings.php # src/services/Logs.php # src/services/Resize.php # src/services/Service.php
verbb · Jul 10, 2022 · 3ba5337 · 3ba5337
2 parents 8aad011 + 8ef3789
commit 3ba5337
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 51 deletions.
diff --git a/config.codekit3 b/config.codekit3
@@ -7,7 +7,7 @@
       "uuidString" : "ECE3F09A-2816-43C6-9715-3F4A30BD28C5"
     }
   ],
-  "creatorBuild" : "34335",
+  "creatorBuild" : "34365",
   "files" : {
     "\/.github\/FUNDING.yml" : {
       "cB" : 0,
@@ -508,6 +508,14 @@
       "oA" : 1,
       "oAP" : "\/src\/templates",
       "oF" : 0
+    },
+    "\/src\/translations\/en\/image-resizer.php" : {
+      "cB" : 0,
+      "ft" : 8192,
+      "hM" : 0,
+      "oA" : 2,
+      "oAP" : "\/src\/translations\/en\/image-resizer.php",
+      "oF" : 0
     }
   },
   "hooks" : [
@@ -520,8 +528,8 @@
     "creationDate" : 528723773,
     "displayValue" : "image-resizer",
     "displayValueWasSetByUser" : 0,
-    "iconImageName" : "meme-ariel",
-    "iconImageWasSetByUser" : 0
+    "iconImageName" : "brackets-koamaru",
+    "iconImageWasSetByUser" : 1
   },
   "projectSettings" : {
     "abortBuildOnError" : 1,
@@ -871,10 +879,6 @@
         "active" : 0,
         "optionString" : "'1tbs', {'allowSingleLine': true}"
       },
-      "callback-return" : {
-        "active" : 0,
-        "optionString" : "['callback', 'cb', 'next']"
-      },
       "camelcase" : {
         "active" : 0,
         "optionString" : "{'properties': 'always'}"
@@ -966,6 +970,10 @@
         "active" : 0,
         "optionString" : "'expression'"
       },
+      "function-call-argument-newline" : {
+        "active" : 0,
+        "optionString" : "'always'"
+      },
       "function-paren-newline" : {
         "active" : 0,
         "optionString" : "'multiline'"
@@ -978,21 +986,14 @@
         "active" : 0,
         "optionString" : "{'allowImplicit': false}"
       },
-      "global-require" : {
-        "active" : 0
-      },
       "grouped-accessor-pairs" : {
         "active" : 0,
         "optionString" : "'anyOrder'"
       },
       "guard-for-in" : {
         "active" : 0
       },
-      "handle-callback-err" : {
-        "active" : 0,
-        "optionString" : "'err'"
-      },
-      "id-blacklist" : {
+      "id-denylist" : {
         "active" : 0,
         "optionString" : "'data', 'err', 'e', 'cb', 'callback'"
       },
@@ -1116,9 +1117,6 @@
         "active" : 0,
         "optionString" : "{'allow': ['~'], 'int32Hint': true}"
       },
-      "no-buffer-constructor" : {
-        "active" : 0
-      },
       "no-caller" : {
         "active" : 0
       },
@@ -1146,6 +1144,9 @@
       "no-const-assign" : {
         "active" : 1
       },
+      "no-constant-binary-expression" : {
+        "active" : 0
+      },
       "no-constant-condition" : {
         "active" : 1,
         "optionString" : "{'checkLoops': true}"
@@ -1180,6 +1181,9 @@
       "no-dupe-keys" : {
         "active" : 1
       },
+      "no-duplicate-case" : {
+        "active" : 1
+      },
       "no-duplicate-imports" : {
         "active" : 0,
         "optionString" : "{'includeExports': false}"
@@ -1221,7 +1225,7 @@
       "no-extra-boolean-cast" : {
         "active" : 1
       },
-      "no-extra-labels" : {
+      "no-extra-label" : {
         "active" : 0
       },
       "no-extra-parens" : {
@@ -1309,10 +1313,6 @@
         "active" : 0,
         "optionString" : "{'groups': [['+', '-', '*', '\/', '%', '**'], ['&', '|', '^', '~', '<<', '>>', '>>>'], ['==', '!=', '===', '!==', '>', '>=', '<', '<='], ['&&', '||'], ['in', 'instanceof']], 'allowSamePrecedence': true}"
       },
-      "no-mixed-requires" : {
-        "active" : 0,
-        "optionString" : "{'grouping': false, 'allowCall': false }"
-      },
       "no-mixed-spaces-and-tabs" : {
         "active" : 0,
         "optionString" : ""
@@ -1347,9 +1347,6 @@
       "no-new-object" : {
         "active" : 0
       },
-      "no-new-require" : {
-        "active" : 0
-      },
       "no-new-symbol" : {
         "active" : 1
       },
@@ -1372,19 +1369,10 @@
         "active" : 0,
         "optionString" : "{'props': false}"
       },
-      "no-path-concat" : {
-        "active" : 0
-      },
       "no-plusplus" : {
         "active" : 0,
         "optionString" : "{'allowForLoopAfterthoughts': false}"
       },
-      "no-process-env" : {
-        "active" : 0
-      },
-      "no-process-exit" : {
-        "active" : 0
-      },
       "no-promise-executor-return" : {
         "active" : 0
       },
@@ -1412,10 +1400,6 @@
       "no-restricted-imports" : {
         "active" : 0
       },
-      "no-restricted-modules" : {
-        "active" : 0,
-        "optionString" : ""
-      },
       "no-restricted-properties" : {
         "active" : 0,
         "optionString" : "[{'object': 'disallowedObjectName', 'property': 'disallowedPropertyName'}, {'object': 'disallowedObjectName', 'property': 'anotherDisallowedPropertyName', 'message': 'Please use allowedObjectName.allowedPropertyName.'}]"
@@ -1458,10 +1442,6 @@
       "no-sparse-arrays" : {
         "active" : 1
       },
-      "no-sync" : {
-        "active" : 0,
-        "optionString" : "{'allowAtRootLevel': false}"
-      },
       "no-tabs" : {
         "active" : 0,
         "optionString" : ""
@@ -1693,10 +1673,6 @@
       "require-await" : {
         "active" : 0
       },
-      "require-jsdoc" : {
-        "active" : 0,
-        "optionString" : "{'require': {'FunctionDeclaration': true, 'MethodDefinition': false, 'ClassDeclaration': false, 'ArrowFunctionExpression': false}}"
-      },
       "require-unicode-regexp" : {
         "active" : 0
       },
@@ -1782,10 +1758,6 @@
         "active" : 1,
         "optionString" : ""
       },
-      "valid-jsdoc" : {
-        "active" : 0,
-        "optionString" : "{'prefer': {'return': 'returns'}, 'requireReturn': true, 'requireReturnDescription': true, 'requireReturnType': true, 'requireParamDescription': true}"
-      },
       "valid-typeof" : {
         "active" : 1,
         "optionString" : "{'requireStringLiterals': true}"
@@ -2286,6 +2258,10 @@
         "active" : 0,
         "flagValue" : -1
       },
+      "keep_numbers" : {
+        "active" : 0,
+        "flagValue" : -1
+      },
       "keep_quoted_props" : {
         "active" : 0,
         "flagValue" : -1
@@ -2310,6 +2286,10 @@
         "active" : 1,
         "flagValue" : 1
       },
+      "preserve_annotations" : {
+        "active" : 0,
+        "flagValue" : -1
+      },
       "properties" : {
         "active" : 1,
         "flagValue" : -1
@@ -2414,6 +2394,10 @@
         "active" : 0,
         "flagValue" : -1
       },
+      "wrap_func_args" : {
+        "active" : 1,
+        "flagValue" : -1
+      },
       "wrap_iife" : {
         "active" : 0,
         "flagValue" : -1

diff --git a/src/translations/en/image-resizer.php b/src/translations/en/image-resizer.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+
+];