Sulu upgrade from 2.3.7 -> 2.4.0

icapps · Dec 22, 2021 · 602d965 · 602d965
1 parent d2dcdc5
commit 602d965
Show file tree

Hide file tree

Showing 23 changed files with 226 additions and 165 deletions.
diff --git a/symfony/.env b/symfony/.env
@@ -14,14 +14,20 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
-APP_ENV=prod
+APP_ENV=dev
 APP_SECRET=b41733f1e41298e4b57cc8bae3c27eef
 BASE_URL=https://php.wip
 APP_VERSION=v1.0
 #TRUSTED_PROXIES=127.0.0.1,127.0.0.2
 #TRUSTED_HOSTS=localhost,example.com
 ###< symfony/framework-bundle ###
 
+###> symfony/lock ###
+# Choose one of the stores below
+# postgresql+advisory://db_user:db_password@localhost/db_name
+LOCK_DSN=semaphore
+###< symfony/lock ###
+
 ###> sulu/sulu ###
 # Email address that will receive system notifications and might be used as universal fallback value by bundles
 ADMIN_EMAIL=[email protected]
@@ -37,27 +43,21 @@ MAILER_DSN=smtp://127.0.0.1:1025
 # MAILER_DSN=mailgun+smtp://USERNAME:PASSWORD@default?region=us
 ###< symfony/mailgun-mailer ###
 
+###> doctrine/phpcr-bundle ###
+PHPCR_USER=admin
+PHPCR_PASSWORD=admin
+PHPCR_WORKSPACE=default
+###< doctrine/phpcr-bundle ###
+
 ###> doctrine/doctrine-bundle ###
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7"
-DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
+DATABASE_URL=mysql://root:ChangeMe@127.0.0.1:3306/su_myapp?serverVersion=8.0.27
 ###< doctrine/doctrine-bundle ###
 
-###> doctrine/phpcr-bundle ###
-PHPCR_USER=admin
-PHPCR_PASSWORD=admin
-PHPCR_WORKSPACE=default
-###< doctrine/phpcr-bundle ###
-
-###> symfony/lock ###
-# Choose one of the stores below
-# postgresql+advisory://db_user:db_password@localhost/db_name
-LOCK_DSN=semaphore
-###< symfony/lock ###
-
 ###> snc/redis-bundle ###
 # passwords that contain special characters (@, %, :, +) must be urlencoded
 REDIS_URL=redis://localhost

diff --git a/symfony/.env.test b/symfony/.env.test
@@ -1,3 +1,4 @@
 # define your env variables for the test env here
 APP_DEBUG=0
-APP_VERSION=v1.0-test
+APP_VERSION=v1.0-test
+SYMFONY_DEPRECATIONS_HELPER=999999
diff --git a/symfony/assets/admin/app.js b/symfony/assets/admin/app.js
@@ -1 +1 @@
-// Add project specific javascript code here:
+// Add project specific javascript code and import of additional bundles here:
diff --git a/symfony/assets/admin/babel.config.json b/symfony/assets/admin/babel.config.json
@@ -6,7 +6,8 @@
     "plugins": [
         ["@babel/plugin-proposal-decorators", {"legacy": true}],
         "@babel/plugin-transform-flow-strip-types",
-        "@babel/plugin-proposal-nullish-coalescing-operator"
+        "@babel/plugin-proposal-nullish-coalescing-operator",
+        "@babel/plugin-proposal-class-properties"
     ],
     "assumptions": {
         "setPublicClassFields": true

diff --git a/symfony/assets/admin/index.js b/symfony/assets/admin/index.js
@@ -1,4 +1,7 @@
-// Bundles
+// This file should only be changed by the `bin/console sulu:admin:update-build` command:
+// See https://docs.sulu.io/en/latest/upgrades/upgrade-2.x.html
+
+// Sulu Core Bundles
 import {startAdmin} from 'sulu-admin-bundle';
 import 'sulu-audience-targeting-bundle';
 import 'sulu-category-bundle';
@@ -12,9 +15,10 @@ import 'sulu-route-bundle';
 import 'sulu-search-bundle';
 import 'sulu-security-bundle';
 import 'sulu-snippet-bundle';
+import 'sulu-trash-bundle';
 import 'sulu-website-bundle';
 
-// Add project specific javascript code to the following file:
+// Add project specific javascript code and import of additional bundles to the following file:
 import './app.js';
 
 // Start admin application

diff --git a/symfony/assets/admin/package.json b/symfony/assets/admin/package.json
@@ -26,26 +26,28 @@
         "sulu-search-bundle": "file:node_modules/@sulu/vendor/sulu/sulu/src/Sulu/Bundle/SearchBundle/Resources/js",
         "sulu-security-bundle": "file:node_modules/@sulu/vendor/sulu/sulu/src/Sulu/Bundle/SecurityBundle/Resources/js",
         "sulu-snippet-bundle": "file:node_modules/@sulu/vendor/sulu/sulu/src/Sulu/Bundle/SnippetBundle/Resources/js",
+        "sulu-trash-bundle": "file:node_modules/@sulu/vendor/sulu/sulu/src/Sulu/Bundle/TrashBundle/Resources/js",
         "sulu-website-bundle": "file:node_modules/@sulu/vendor/sulu/sulu/src/Sulu/Bundle/WebsiteBundle/Resources/js"
     },
     "devDependencies": {
         "@babel/core": "^7.5.5",
+        "@babel/plugin-proposal-class-properties": "^7.16.5",
         "@babel/plugin-proposal-decorators": "^7.4.4",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
         "@babel/plugin-transform-flow-strip-types": "^7.4.4",
         "@babel/preset-env": "^7.5.5",
         "@babel/preset-react": "^7.0.0",
-        "@ckeditor/ckeditor5-dev-utils": "^24.4.2",
-        "@ckeditor/ckeditor5-theme-lark": "^27.1.0",
+        "@ckeditor/ckeditor5-dev-utils": "^26.1.0",
+        "@ckeditor/ckeditor5-theme-lark": "^31.0.0",
         "autoprefixer": "^9.8.6",
         "babel-loader": "^8.0.6",
-        "clean-webpack-plugin": "^3.0.0",
+        "clean-webpack-plugin": "^4.0.0",
         "core-js": "^3.18.0",
         "css-loader": "^5.2.4",
         "file-loader": "^6.0.0",
         "glob": "^7.1.2",
         "mini-css-extract-plugin": "^1.5.0",
-        "optimize-css-assets-webpack-plugin": "^5.0.3",
+        "optimize-css-assets-webpack-plugin": "^6.0.1",
         "postcss": "7.0.35",
         "postcss-calc": "^7.0.5",
         "postcss-hexrgba": "^2.0.0",
@@ -58,7 +60,7 @@
         "webpack": "^4.27.0",
         "webpack-clean-obsolete-chunks": "^0.4.0",
         "webpack-cli": "^4.7.0",
-        "webpack-manifest-plugin": "^3.1.1"
+        "webpack-manifest-plugin": "^4.0.2"
     },
     "engines": {
         "node": ">=12",

diff --git a/symfony/composer.json b/symfony/composer.json
@@ -31,15 +31,15 @@
         "composer/package-versions-deprecated": "1.11.99.1",
         "dantleech/phpcr-migrations-bundle": "^1.2",
         "doctrine/annotations": "^1.0",
-        "doctrine/doctrine-bundle": "^2.3",
-        "doctrine/doctrine-fixtures-bundle": "^3.0",
+        "doctrine/doctrine-bundle": "^2.5",
+        "doctrine/doctrine-fixtures-bundle": "^3.4",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.8",
         "elasticsearch/elasticsearch": "^7.12",
-        "friendsofsymfony/http-cache-bundle": "^2.8",
+        "friendsofsymfony/http-cache-bundle": "^2.9",
         "gesdinet/jwt-refresh-token-bundle": "^0.12",
-        "handcraftedinthealps/zendsearch": "^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.3",
+        "handcraftedinthealps/zendsearch": "^2.1",
+        "jackalope/jackalope-doctrine-dbal": "^1.7",
         "lexik/jwt-authentication-bundle": "^2.11",
         "nesbot/carbon": "^2.48",
         "phpdocumentor/reflection-docblock": "^5.2",
@@ -48,34 +48,34 @@
         "sensio/framework-extra-bundle": "^5.1",
         "sentry/sentry-symfony": "^4.2",
         "snc/redis-bundle": "^3.3",
-        "sulu/sulu": "~2.3.1",
+        "sulu/sulu": "~2.4.0",
         "symfony/amqp-messenger": "^5.1",
         "symfony/asset": "5.2.*",
         "symfony/cache": "^5.1",
-        "symfony/config": "^5.1",
+        "symfony/config": "^5.4",
         "symfony/console": "5.2.*",
-        "symfony/dotenv": "^5.1",
+        "symfony/dotenv": "^5.4",
         "symfony/expression-language": "5.2.*",
-        "symfony/flex": "^1.2",
+        "symfony/flex": "^1.17 || ^2.0",
         "symfony/form": "5.2.*",
-        "symfony/framework-bundle": "^5.1",
+        "symfony/framework-bundle": "^5.4",
         "symfony/http-client": "5.2.*",
         "symfony/intl": "5.2.*",
         "symfony/mailer": "5.2.*",
         "symfony/mime": "5.2.*",
-        "symfony/monolog-bridge": "^5.1",
+        "symfony/monolog-bridge": "^5.4",
         "symfony/monolog-bundle": "^3.1",
         "symfony/notifier": "5.2.*",
         "symfony/process": "5.2.*",
         "symfony/property-access": "5.2.*",
         "symfony/property-info": "5.2.*",
         "symfony/proxy-manager-bridge": "5.2.*",
-        "symfony/security-bundle": "^5.1",
+        "symfony/security-bundle": "^5.4",
         "symfony/serializer": "5.2.*",
         "symfony/string": "5.2.*",
         "symfony/swiftmailer-bundle": "^3.5",
         "symfony/translation": "5.2.*",
-        "symfony/twig-bundle": "^5.1",
+        "symfony/twig-bundle": "^5.4",
         "symfony/validator": "5.2.*",
         "symfony/web-link": "5.2.*",
         "symfony/webpack-encore-bundle": "^1.11",
@@ -86,22 +86,22 @@
     },
     "require-dev": {
         "friendsoftwig/twigcs": "^5.0",
-        "phpcr/phpcr-shell": "^1.2",
+        "phpcr/phpcr-shell": "^1.3",
         "phpro/grumphp-shim": "^1.3",
         "phpstan/phpstan": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^8.5 || ^9.5",
         "sclable/xml-lint": "^0.4.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/browser-kit": "^5.2",
-        "symfony/css-selector": "^5.2",
-        "symfony/debug-bundle": "^5.2",
-        "symfony/error-handler": "^5.1",
+        "symfony/browser-kit": "^5.4",
+        "symfony/css-selector": "^5.4",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/error-handler": "^5.4",
         "symfony/maker-bundle": "^1.0",
-        "symfony/phpunit-bridge": "^5.1",
+        "symfony/phpunit-bridge": "^5.4",
         "symfony/stopwatch": "^5.2",
-        "symfony/thanks": "^1.1",
+        "symfony/thanks": "^1.2",
         "symfony/var-dumper": "^5.2",
-        "symfony/web-profiler-bundle": "^5.1"
+        "symfony/web-profiler-bundle": "^5.3"
     },
     "config": {
         "optimize-autoloader": true,