upgrade intervention

Pushword · Dec 22, 2023 · 05cb79e · 05cb79e
1 parent e5a44bf
commit 05cb79e
Show file tree

Hide file tree

Showing 19 changed files with 358 additions and 370 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "doctrine/orm": "^2.17",
     "fortawesome/font-awesome": "^6.1",
     "imagine/imagine": "^1.3",
-    "intervention/image": "^2.5",
+    "intervention/image": "^3.1",
     "michelf/php-markdown": "^2",
     "miljar/php-exif": "^0.6.5",
     "nette/utils": "^4.0",
@@ -40,34 +40,34 @@
     "sonata-project/doctrine-orm-admin-bundle": "^4.9",
     "spatie/image-optimizer": "^1.3",
     "spatie/yaml-front-matter": "^2.0",
-    "symfony/asset": "^6.4|^7.0",
-    "symfony/cache": "^6.4|^7.0",
-    "symfony/console": "^6.4|^7.0",
-    "symfony/expression-language": "^6.4|^7.0",
-    "symfony/finder": "^6.4|^7.0",
-    "symfony/form": "^6.4|^7.0",
-    "symfony/framework-bundle": "^6.4|^7.0",
-    "symfony/lock": "^6.4|^7.0",
-    "symfony/mailer": "^6.4|^7.0",
+    "symfony/asset": "^7.0",
+    "symfony/cache": "^7.0",
+    "symfony/console": "^7.0",
+    "symfony/expression-language": "^7.0",
+    "symfony/finder": "^7.0",
+    "symfony/form": "^7.0",
+    "symfony/framework-bundle": "^7.0",
+    "symfony/lock": "^7.0",
+    "symfony/mailer": "^7.0",
     "symfony/monolog-bundle": "^3.7",
-    "symfony/process": "^6.4|^7.0",
-    "symfony/security-bundle": "^6.4|^7.0",
-    "symfony/security-csrf": "^6.4|^7.0",
-    "symfony/serializer": "^6.4|^7.0",
-    "symfony/translation": "^6.4|^7.0",
-    "symfony/twig-bundle": "^6.4|^7.0",
-    "symfony/validator": "^6.4|^7.0",
-    "symfony/web-link": "^6.4|^7.0",
+    "symfony/process": "^7.0",
+    "symfony/security-bundle": "^7.0",
+    "symfony/security-csrf": "^7.0",
+    "symfony/serializer": "^7.0",
+    "symfony/translation": "^7.0",
+    "symfony/twig-bundle": "^7.0",
+    "symfony/validator": "^7.0",
+    "symfony/web-link": "^7.0",
     "symfony/webpack-encore-bundle": "^2.0",
-    "symfony/yaml": "^6.4|^7.0",
+    "symfony/yaml": "^7.0",
     "thecodingmachine/safe": "^2.2",
     "twig/intl-extra": "^3.2",
     "vich/uploader-bundle": "^2.0",
     "villfa/invert-color": "^0.5",
     "wyrihaximus/html-compress": "^4.2"
   },
   "require-dev": {
-    "composer/composer": "^2.0",
+    "composer/composer": "^2.6.6",
     "friendsofphp/php-cs-fixer": "^3.2",
     "phpstan/phpstan": "^1.0",
     "phpstan/phpstan-doctrine": "^1.0",
@@ -76,11 +76,11 @@
     "psalm/plugin-symfony": "^5.1",
     "rector/rector": "^0.18",
     "squizlabs/php_codesniffer": "^3.5",
-    "symfony/debug-bundle": "^6.4|^7.0",
-    "symfony/dotenv": "^6.4|^7.0",
+    "symfony/debug-bundle": "^7.0",
+    "symfony/dotenv": "^7.0",
     "symfony/maker-bundle": "^1.35",
     "symfony/panther": "^1 || ^2.0",
-    "symfony/phpunit-bridge": "^6.4|^7.0",
+    "symfony/phpunit-bridge": "^7.0",
     "symfony/profiler-pack": "^1.0",
     "symplify/config-transformer": "^12.1",
     "symplify/monorepo-builder": "^11.1",

diff --git a/packages/admin-block-editor-tools/package.json b/packages/admin-block-editor-tools/package.json
@@ -1,56 +1,56 @@
 {
-    "name": "@pushword/editorjs-tools",
-    "version": "1.0.0",
-    "keywords": [
-        "editorjs",
-        "plugin",
-        "image",
-        "embed"
-    ],
-    "scripts": {
-        "build": "webpack --mode production",
-        "watch": "webpack --mode development --watch"
-    },
-    "author": {
-        "name": "Robin from Pied Web",
-        "url": "https://piedweb.com"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.10.2",
-        "@babel/preset-env": "^7.10.2",
-        "@codexteam/ajax": "^4.2.0",
-        "@codexteam/icons": "^0.3",
-        "@editorjs/attaches": "https://github.com/editor-js/attaches.git",
-        "@editorjs/editorjs": "^2.28",
-        "@editorjs/header": "https://github.com/editor-js/header",
-        "@editorjs/image": "https://github.com/editor-js/image.git",
-        "@editorjs/raw": "https://github.com/editor-js/raw.git",
-        "@vietlongn/editorjs-carousel": "https://github.com/mr8bit/carousel-editorjs.git",
-        "babel-loader": "^9.1",
-        "browserslist": "^4.22",
-        "caniuse-lite": "^1",
-        "cross-env": "^6.4|^7.0.3",
-        "css-loader": "^6.5",
-        "editorjs-hyperlink": "https://github.com/trinhtam/editorjs-hyperlink.git",
-        "postcss": "^8.4",
-        "postcss-cssnext": "^3.1.1",
-        "postcss-loader": "^7.3",
-        "postcss-nested": "^6.0",
-        "postcss-nested-ancestors": "^3.0",
-        "postcss-smart-import": "^0.7.6",
-        "raw-loader": "^4.0.1",
-        "sass": "^1.56",
-        "sass-loader": "^13.2",
-        "style-loader": "^3.3",
-        "webpack": "^5.65",
-        "webpack-cli": "^5.0"
-    },
-    "bugs": {
-        "url": "https://github.com/pushword/pushword/issues"
-    },
-    "homepage": "https://puswhord.piedweb.com",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/pushword/pushword.git"
-    }
+  "name": "@pushword/editorjs-tools",
+  "version": "1.0.0",
+  "keywords": [
+    "editorjs",
+    "plugin",
+    "image",
+    "embed"
+  ],
+  "scripts": {
+    "build": "webpack --mode production",
+    "watch": "webpack --mode development --watch"
+  },
+  "author": {
+    "name": "Robin from Pied Web",
+    "url": "https://piedweb.com"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.10.2",
+    "@babel/preset-env": "^7.10.2",
+    "@codexteam/ajax": "^4.2.0",
+    "@codexteam/icons": "^0.3",
+    "@editorjs/attaches": "https://github.com/editor-js/attaches.git",
+    "@editorjs/editorjs": "^2.28",
+    "@editorjs/header": "https://github.com/editor-js/header",
+    "@editorjs/image": "https://github.com/editor-js/image.git",
+    "@editorjs/raw": "https://github.com/editor-js/raw.git",
+    "@vietlongn/editorjs-carousel": "https://github.com/mr8bit/carousel-editorjs.git",
+    "babel-loader": "^9.1",
+    "browserslist": "^4.22",
+    "caniuse-lite": "^1",
+    "cross-env": "^7.0.3",
+    "css-loader": "^6.5",
+    "editorjs-hyperlink": "https://github.com/trinhtam/editorjs-hyperlink.git",
+    "postcss": "^8.4",
+    "postcss-cssnext": "^3.1.1",
+    "postcss-loader": "^7.3",
+    "postcss-nested": "^6.0",
+    "postcss-nested-ancestors": "^3.0",
+    "postcss-smart-import": "^0.7.6",
+    "raw-loader": "^4.0.1",
+    "sass": "^1.56",
+    "sass-loader": "^13.2",
+    "style-loader": "^3.3",
+    "webpack": "^5.65",
+    "webpack-cli": "^5.0"
+  },
+  "bugs": {
+    "url": "https://github.com/pushword/pushword/issues"
+  },
+  "homepage": "https://puswhord.piedweb.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pushword/pushword.git"
+  }
 }
diff --git a/packages/admin-block-editor/src/Controller/MediaBlockController.php b/packages/admin-block-editor/src/Controller/MediaBlockController.php
@@ -48,7 +48,7 @@ public function manage(Request $request, ImageManager $imageManager, string $pub
             }
         }
 
-        $url = $imageManager->isImage($media) ? $imageManager->getBrowserPath((string) $media->getMedia())
+        $url = $imageManager->isImage($media) ? $imageManager->getBrowserPath($media->getMedia())
              : '/'.$publicMediaDir.'/'.$media->getMedia();
 
         return new Response(\Safe\json_encode([
@@ -118,8 +118,8 @@ private function getMediaFileFromUrl(string $url): UploadedFile
 
         $fileContent = \Safe\file_get_contents($url);
 
-        $originalName = $matches[1];
-        $filename = md5((string) $matches[1]);
+        $originalName = ($matches[1] ?? throw new \Exception($url));
+        $filename = md5($originalName);
         $filePath = sys_get_temp_dir().'/'.$filename;
         if (0 === \Safe\file_put_contents($filePath, $fileContent)) {
             throw new \LogicException('Storing in tmp folder filed');

diff --git a/packages/admin/src/FormField/MediaPreviewField.php b/packages/admin/src/FormField/MediaPreviewField.php
@@ -22,7 +22,7 @@ final class MediaPreviewField extends AbstractField
      */
     public function formField(FormMapper $form): void
     {
-        if (null !== $this->admin->getSubject()->getMedia()) {
+        if ('' !== $this->admin->getSubject()->getMedia()) {
             $form->with('admin.media.preview.label', [
                 'class' => 'col-md-12',
                 'description' => $this->showMediaPreview(),