Merge pull request #48 from icapps/feature/sulu-upgrade

Sulu 2.4 upgrade

symfony/.env

@@ -22,6 +22,12 @@ APP_VERSION=v1.0
 #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

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

symfony/assets/admin/app.js

@@ -1 +1 @@
-// Add project specific javascript code here:
+// Add project specific javascript code and import of additional bundles here:

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

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