Merge branch 'release/2.1' of github.com:sulu/skeleton into release/2.2

config/packages/stof_doctrine_extensions.yaml

@@ -1,4 +1,4 @@
 # Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
 # See the official DoctrineExtensions documentation for more details: https://github.com/Atlantic18/DoctrineExtensions/tree/master/doc/
 stof_doctrine_extensions:
-    default_locale: en_US
+    default_locale: '%default_locale%'

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="tests/bootstrap.php"
@@ -13,7 +13,9 @@
         <server name="SHELL_VERBOSITY" value="-1" />
         <!-- See: https://symfony.com/doc/current/components/phpunit_bridge.html#modified-phpunit-script -->
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
-        <!-- Set "SYMFONY_PHPUNIT_REMOVE" to "symfony/yaml" will install also "prophecy" see phpunit bridge docs for more information. -->
+        <!-- Set "SYMFONY_PHPUNIT_VERSION" to use fixed phpunit version: https://symfony.com/doc/current/components/phpunit_bridge.html#modified-phpunit-script -->
+        <!-- <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" /> -->
+        <!-- Set "SYMFONY_PHPUNIT_REMOVE" to "symfony/yaml" to install "prophecy": https://symfony.com/doc/current/components/phpunit_bridge.html#modified-phpunit-script -->
         <server name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml"/>
     </php>
 
@@ -29,4 +31,3 @@
         </whitelist>
     </filter>
 </phpunit>
-

public/build/admin/manifest.json

@@ -1,7 +1,7 @@
 {
-  "main.css": "build/admin/main.3e760a8f87217e076221.css",
-  "main.js": "build/admin/main.3e760a8f87217e076221.js",
-  "main.js.map": "build/admin/main.3e760a8f87217e076221.js.map",
+  "main.css": "build/admin/main.f6f6f9bbc91ffcc55e4e.css",
+  "main.js": "build/admin/main.f6f6f9bbc91ffcc55e4e.js",
+  "main.js.map": "build/admin/main.f6f6f9bbc91ffcc55e4e.js.map",
   "/build/admin/fonts/font-awesome.min.css": "/build/admin/fonts/fontawesome-webfont.f691f37e57f04c152e2315ab7dbad881.woff",
   "/build/admin/fonts/global.scss": "/build/admin/fonts/open-sans-v15-latin-regular.ec806460121999bcfb12bc264d46d41e.woff2",
   "/build/admin/fonts/sulu-icon.css": "/build/admin/fonts/sulu.7918956d252a916c3102478369c134b8.ttf",