Make Symfony 6.2 the minimum version

contao · Aug 25, 2023 · 80483d8 · 80483d8
1 parent 178b1da
commit 80483d8
Show file tree

Hide file tree

Showing 90 changed files with 253 additions and 262 deletions.
diff --git a/calendar-bundle/composer.json b/calendar-bundle/composer.json
@@ -30,20 +30,20 @@
         "php": "^8.1",
         "contao/core-bundle": "self.version",
         "friendsofsymfony/http-cache": "^2.4",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/deprecation-contracts": "^2.1 || ^3.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
+        "symfony/config": "^6.2",
+        "symfony/dependency-injection": "^6.2",
+        "symfony/deprecation-contracts": "^3.0",
+        "symfony/http-foundation": "^6.2",
+        "symfony/http-kernel": "^6.2",
         "symfony/polyfill-mbstring": "^1.0",
-        "symfony/yaml": "^5.4 || ^6.0"
+        "symfony/yaml": "^6.2"
     },
     "require-dev": {
         "contao/manager-plugin": "^2.3.1",
         "contao/test-case": "self.version",
         "phpunit/phpunit": "^9.5",
-        "symfony/http-client": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0"
+        "symfony/http-client": "^6.2",
+        "symfony/phpunit-bridge": "^6.2"
     },
     "conflict": {
         "contao/core": "*",

diff --git a/calendar-bundle/src/Picker/EventPickerProvider.php b/calendar-bundle/src/Picker/EventPickerProvider.php
@@ -20,8 +20,8 @@
 use Contao\CoreBundle\Picker\DcaPickerProviderInterface;
 use Contao\CoreBundle\Picker\PickerConfig;
 use Knp\Menu\FactoryInterface;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class EventPickerProvider extends AbstractInsertTagPickerProvider implements DcaPickerProviderInterface, FrameworkAwareInterface

diff --git a/calendar-bundle/tests/Picker/EventPickerProviderTest.php b/calendar-bundle/tests/Picker/EventPickerProviderTest.php
@@ -20,8 +20,8 @@
 use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
 use Knp\Menu\MenuItem;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class EventPickerProviderTest extends ContaoTestCase

diff --git a/comments-bundle/composer.json b/comments-bundle/composer.json
@@ -29,14 +29,14 @@
     "require": {
         "php": "^8.1",
         "contao/core-bundle": "self.version",
-        "symfony/http-kernel": "^5.4 || ^6.0"
+        "symfony/http-kernel": "^6.2"
     },
     "require-dev": {
         "contao/manager-plugin": "^2.3.1",
         "contao/test-case": "self.version",
         "phpunit/phpunit": "^9.5",
-        "symfony/http-client": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0"
+        "symfony/http-client": "^6.2",
+        "symfony/phpunit-bridge": "^6.2"
     },
     "conflict": {
         "contao/core": "*",

diff --git a/composer.json b/composer.json
@@ -103,61 +103,61 @@
         "spomky-labs/otphp": "^10.0",
         "symfony-cmf/routing": "^3.0",
         "symfony-cmf/routing-bundle": "^3.0",
-        "symfony/asset": "^5.4 || ^6.0",
-        "symfony/cache": "^5.4 || ^6.0",
+        "symfony/asset": "^6.2",
+        "symfony/cache": "^6.2",
         "symfony/cache-contracts": "^2.5",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/deprecation-contracts": "^2.1 || ^3.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0",
-        "symfony/doctrine-messenger": "^5.4 || ^6.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
-        "symfony/error-handler": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
+        "symfony/config": "^6.2",
+        "symfony/console": "^6.2",
+        "symfony/debug-bundle": "^6.2",
+        "symfony/dependency-injection": "^6.2.2",
+        "symfony/deprecation-contracts": "^3.0",
+        "symfony/doctrine-bridge": "^6.2",
+        "symfony/doctrine-messenger": "^6.2",
+        "symfony/dom-crawler": "^6.2",
+        "symfony/dotenv": "^6.2",
+        "symfony/error-handler": "^6.2",
+        "symfony/event-dispatcher": "^6.2",
         "symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
-        "symfony/expression-language": "^5.4 || ^6.0",
-        "symfony/filesystem": "^5.4.25 || ^6.2.12",
-        "symfony/finder": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^6.1.2",
-        "symfony/html-sanitizer": "^6.1",
-        "symfony/http-client": "^5.4 || ^6.0",
+        "symfony/expression-language": "^6.2",
+        "symfony/filesystem": "^6.2.12",
+        "symfony/finder": "^6.2",
+        "symfony/framework-bundle": "^6.2",
+        "symfony/html-sanitizer": "^6.2",
+        "symfony/http-client": "^6.2",
         "symfony/http-client-contracts": "^2.4 || ^3.1",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/lock": "^5.4 || ^6.0",
-        "symfony/mailer": "^5.4 || ^6.0",
+        "symfony/http-foundation": "^6.2",
+        "symfony/http-kernel": "^6.2",
+        "symfony/intl": "^6.2",
+        "symfony/lock": "^6.2",
+        "symfony/mailer": "^6.2",
         "symfony/maker-bundle": "^1.1",
-        "symfony/messenger": "^6.1",
-        "symfony/mime": "^5.4 || ^6.0",
-        "symfony/monolog-bridge": "^5.4 || ^6.0",
+        "symfony/messenger": "^6.2",
+        "symfony/mime": "^6.2",
+        "symfony/monolog-bridge": "^6.2",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/password-hasher": "^5.4 || ^6.0",
+        "symfony/options-resolver": "^6.2",
+        "symfony/password-hasher": "^6.2",
         "symfony/polyfill-intl-idn": "^1.0",
         "symfony/polyfill-mbstring": "^1.0",
-        "symfony/process": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/rate-limiter": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
-        "symfony/security-bundle": "^6.0.2",
-        "symfony/security-core": "^6.1",
-        "symfony/security-csrf": "^6.0",
-        "symfony/security-http": "^6.0",
+        "symfony/process": "^6.2",
+        "symfony/property-access": "^6.2",
+        "symfony/rate-limiter": "^6.2",
+        "symfony/routing": "^6.2",
+        "symfony/security-bundle": "^6.2",
+        "symfony/security-core": "^6.2",
+        "symfony/security-csrf": "^6.2",
+        "symfony/security-http": "^6.2",
         "symfony/service-contracts": "^2.2",
-        "symfony/stopwatch": "^5.4 || ^6.0",
-        "symfony/string": "^5.4 || ^6.0",
-        "symfony/translation": "^5.4 || ^6.0",
+        "symfony/stopwatch": "^6.2",
+        "symfony/string": "^6.2",
+        "symfony/translation": "^6.2",
         "symfony/translation-contracts": "^2.3",
-        "symfony/twig-bridge": "^6.1",
-        "symfony/twig-bundle": "^6.1.1",
-        "symfony/uid": "^5.4 || ^6.0",
-        "symfony/var-dumper": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
-        "symfony/yaml": "^5.4 || ^6.0",
+        "symfony/twig-bridge": "^6.2",
+        "symfony/twig-bundle": "^6.2",
+        "symfony/uid": "^6.2",
+        "symfony/var-dumper": "^6.2",
+        "symfony/web-profiler-bundle": "^6.2",
+        "symfony/yaml": "^6.2",
         "terminal42/escargot": "^1.4.1",
         "terminal42/service-annotation-bundle": "^1.1",
         "toflar/psr6-symfony-http-cache-store": "^3.0 || ^4.0",
@@ -174,8 +174,8 @@
         "composer/composer": "^2.0",
         "league/flysystem-memory": "^3.0",
         "roave/better-reflection": "^4.12.2 || ^5.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0"
+        "symfony/browser-kit": "^6.2",
+        "symfony/phpunit-bridge": "^6.2"
     },
     "replace": {
         "contao/calendar-bundle": "self.version",
@@ -200,7 +200,6 @@
         "nikic/php-parser": "4.7.0",
         "phpunit/phpunit": "<8.0",
         "roave/better-reflection": "<4.12.2 || >=6.0",
-        "symfony/dependency-injection": "5.4.16 || 6.0.16 || 6.1.8 || 6.2.0 || 6.2.1",
         "terminal42/contao-ce-access": "<3.0",
         "thecodingmachine/safe": "<1.2",
         "zendframework/zend-code": "<3.3.1"

diff --git a/core-bundle/composer.json b/core-bundle/composer.json
@@ -101,53 +101,53 @@
         "spomky-labs/otphp": "^10.0",
         "symfony-cmf/routing": "^3.0",
         "symfony-cmf/routing-bundle": "^3.0",
-        "symfony/asset": "^5.4 || ^6.0",
-        "symfony/cache": "^5.4 || ^6.0",
+        "symfony/asset": "^6.2",
+        "symfony/cache": "^6.2",
         "symfony/cache-contracts": "^2.5",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/deprecation-contracts": "^2.1 || ^3.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0",
-        "symfony/doctrine-messenger": "^5.4 || ^6.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
+        "symfony/config": "^6.2",
+        "symfony/console": "^6.2",
+        "symfony/dependency-injection": "^6.2.2",
+        "symfony/deprecation-contracts": "^3.0",
+        "symfony/doctrine-bridge": "^6.2",
+        "symfony/doctrine-messenger": "^6.2",
+        "symfony/dom-crawler": "^6.2",
+        "symfony/event-dispatcher": "^6.2",
         "symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
-        "symfony/expression-language": "^5.4 || ^6.0",
-        "symfony/filesystem": "^5.4 || ^6.0",
-        "symfony/finder": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^6.1.2",
-        "symfony/html-sanitizer": "^6.1",
-        "symfony/http-client": "^5.4 || ^6.0",
+        "symfony/expression-language": "^6.2",
+        "symfony/filesystem": "^6.2",
+        "symfony/finder": "^6.2",
+        "symfony/framework-bundle": "^6.2",
+        "symfony/html-sanitizer": "^6.2",
+        "symfony/http-client": "^6.2",
         "symfony/http-client-contracts": "^2.4 || ^3.1",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/lock": "^5.4 || ^6.0",
-        "symfony/mailer": "^5.4 || ^6.0",
-        "symfony/messenger": "^6.1",
-        "symfony/mime": "^5.4 || ^6.0",
-        "symfony/monolog-bridge": "^5.4 || ^6.0",
-        "symfony/password-hasher": "^5.4 || ^6.0",
+        "symfony/http-foundation": "^6.2",
+        "symfony/http-kernel": "^6.2",
+        "symfony/intl": "^6.2",
+        "symfony/lock": "^6.2",
+        "symfony/mailer": "^6.2",
+        "symfony/messenger": "^6.2",
+        "symfony/mime": "^6.2",
+        "symfony/monolog-bridge": "^6.2",
+        "symfony/password-hasher": "^6.2",
         "symfony/polyfill-intl-idn": "^1.0",
         "symfony/polyfill-mbstring": "^1.0",
-        "symfony/process": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/rate-limiter": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
-        "symfony/security-bundle": "^6.0.2",
-        "symfony/security-core": "^6.1",
-        "symfony/security-csrf": "^6.0",
-        "symfony/security-http": "^6.0",
+        "symfony/process": "^6.2",
+        "symfony/property-access": "^6.2",
+        "symfony/rate-limiter": "^6.2",
+        "symfony/routing": "^6.2",
+        "symfony/security-bundle": "^6.2",
+        "symfony/security-core": "^6.2",
+        "symfony/security-csrf": "^6.2",
+        "symfony/security-http": "^6.2",
         "symfony/service-contracts": "^2.2",
-        "symfony/string": "^5.4 || ^6.0",
-        "symfony/translation": "^5.4 || ^6.0",
+        "symfony/string": "^6.2",
+        "symfony/translation": "^6.2",
         "symfony/translation-contracts": "^2.3",
-        "symfony/twig-bridge": "^6.1",
-        "symfony/twig-bundle": "^6.1.1",
-        "symfony/uid": "^5.4 || ^6.0",
-        "symfony/var-dumper": "^5.4 || ^6.0",
-        "symfony/yaml": "^5.4 || ^6.0",
+        "symfony/twig-bridge": "^6.2",
+        "symfony/twig-bundle": "^6.2",
+        "symfony/uid": "^6.2",
+        "symfony/var-dumper": "^6.2",
+        "symfony/yaml": "^6.2",
         "terminal42/escargot": "^1.4.1",
         "terminal42/service-annotation-bundle": "^1.1",
         "twig/string-extra": "^3.0",
@@ -163,8 +163,8 @@
         "league/flysystem-memory": "^3.0",
         "phpunit/phpunit": "^9.5.19",
         "roave/better-reflection": "^4.12.2 || ^5.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0"
+        "symfony/browser-kit": "^6.2",
+        "symfony/phpunit-bridge": "^6.2"
     },
     "conflict": {
         "contao-community-alliance/composer-plugin": "<3.0",
@@ -174,7 +174,6 @@
         "doctrine/cache": "<1.10",
         "doctrine/dbal": "3.3.0",
         "friendsofsymfony/http-cache": "2.14.0",
-        "symfony/dependency-injection": "5.4.16 || 6.0.16 || 6.1.8 || 6.2.0 || 6.2.1",
         "terminal42/contao-ce-access": "<3.0",
         "thecodingmachine/safe": "<1.2"
     },

diff --git a/core-bundle/contao/modules/ModuleTwoFactor.php b/core-bundle/contao/modules/ModuleTwoFactor.php
@@ -14,8 +14,8 @@
 use Contao\CoreBundle\Exception\RedirectResponseException;
 use Contao\CoreBundle\Security\TwoFactor\Authenticator;
 use ParagonIE\ConstantTime\Base32;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Core\Security;
 
 /**
  * Back end module "two factor".

diff --git a/core-bundle/src/Controller/BackendPreviewSwitchController.php b/core-bundle/src/Controller/BackendPreviewSwitchController.php
@@ -19,12 +19,12 @@
 use Contao\CoreBundle\Security\ContaoCorePermissions;
 use Contao\Date;
 use Doctrine\DBAL\Connection;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment as TwigEnvironment;
 use Twig\Error\Error as TwigError;

diff --git a/core-bundle/src/Controller/ContentElement/DownloadsController.php b/core-bundle/src/Controller/ContentElement/DownloadsController.php
@@ -33,12 +33,12 @@
 use Contao\FrontendUser;
 use Contao\LayoutModel;
 use Contao\StringUtil;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Filesystem\Path;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Security\Core\Security;
 
 #[AsContentElement('download', category: 'files')]
 #[AsContentElement('downloads', category: 'files')]

diff --git a/core-bundle/src/Controller/ContentElement/ImagesController.php b/core-bundle/src/Controller/ContentElement/ImagesController.php
@@ -22,9 +22,9 @@
 use Contao\CoreBundle\Image\Studio\Studio;
 use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\FrontendUser;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Security;
 
 #[AsContentElement('image', category: 'media')]
 #[AsContentElement('gallery', category: 'media')]

diff --git a/core-bundle/src/Controller/FrontendModule/TwoFactorController.php b/core-bundle/src/Controller/FrontendModule/TwoFactorController.php
@@ -24,10 +24,10 @@
 use Contao\Template;
 use ParagonIE\ConstantTime\Base32;
 use Scheb\TwoFactorBundle\Security\Authentication\Exception\InvalidTwoFactorCodeException;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 use Symfony\Contracts\Translation\TranslatorInterface;
 

diff --git a/core-bundle/src/EventListener/AdministratorEmailListener.php b/core-bundle/src/EventListener/AdministratorEmailListener.php
@@ -15,9 +15,9 @@
 use Contao\Config;
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\Security\ContaoCorePermissions;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**

diff --git a/core-bundle/src/EventListener/BackendLocaleListener.php b/core-bundle/src/EventListener/BackendLocaleListener.php
@@ -14,8 +14,8 @@
 
 use Contao\BackendUser;
 use Contao\CoreBundle\Util\LocaleUtil;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\LocaleAwareInterface;
 
 /**

diff --git a/core-bundle/src/EventListener/ClearSessionDataListener.php b/core-bundle/src/EventListener/ClearSessionDataListener.php
@@ -13,9 +13,9 @@
 namespace Contao\CoreBundle\EventListener;
 
 use Contao\CoreBundle\Session\Attribute\AutoExpiringAttribute;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
-use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal