Merge pull request #573 from FriendsOfSymfony/sf6

Sf6

Author: dbu

.github/workflows/php.yml

@@ -20,17 +20,19 @@ jobs:
           - php-version: '7.3'
           - php-version: '7.4'
           - php-version: '8.0'
+          - php-version: '7.4'
+            symfony-version: '4.*'
+          - php-version: '7.4'
+            symfony-version: '5.*'
           - php-version: '8.0'
-            symfony-version: '^4'
-          - php-version: '8.0'
-            symfony-version: '^5'
+            symfony-version: '6.*'
           # Minimum supported dependencies with the oldest PHP version
           - php-version: '7.3'
             composer-flag: '--prefer-stable --prefer-lowest'
             symfony-version: '4.4'
           # Test latest unreleased versions
           - php-version: '8.0'
-            symfony-version: '^5'
+            symfony-version: '6.*'
             stability: 'dev'
     name: PHP ${{ matrix.php-version }} Test on Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}} ${{ matrix.stability }} ${{ matrix.composer-flag }}
     steps:

CHANGELOG.md

@@ -1,9 +1,10 @@
 Changelog
 =========
 
-unreleased
-----------
+(unreleased)
+------------
 
+* Support Symfony 6
 * Drop support for Symfony 3 and 4.3 (keep using 2.11.* for legacy projects).
 
 2.11.2

composer.json

@@ -23,9 +23,9 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "friendsofsymfony/http-cache": "^2.6",
-        "symfony/framework-bundle": "^4.4.0 || ^5.0",
-        "symfony/http-foundation": "^4.4.0 || ^5.0",
-        "symfony/http-kernel": "^4.4.0 || ^5.0"
+        "symfony/framework-bundle": "^4.4.0 || ^5.0 || ^6.0",
+        "symfony/http-foundation": "^4.4.0 || ^5.0 || ^6.0",
+        "symfony/http-kernel": "^4.4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {
         "php-http/guzzle7-adapter": "^0.1.1",
@@ -35,20 +35,20 @@
         "guzzlehttp/guzzle": "^7.2",
         "mockery/mockery": "^1.3.2",
         "monolog/monolog": "*",
-        "sensio/framework-extra-bundle": "^4.0 || ^5.5.1",
+        "sensio/framework-extra-bundle": "^4.0 || ^5.5.1 || ^6.0",
         "doctrine/annotations": "^1.11",
-        "symfony/browser-kit": "^4.4 || ^5.0",
-        "symfony/console": "^4.4 || ^5.0",
-        "symfony/finder": "^4.4 || ^5.0",
+        "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
+        "symfony/console": "^4.4 || ^5.0 || ^6.0",
+        "symfony/finder": "^4.4 || ^5.0 || ^6.0",
         "symfony/phpunit-bridge": "v5.3.7",
-        "symfony/security-bundle": "^4.4 || ^5.0",
-        "symfony/twig-bundle": "^4.4 || ^5.0",
+        "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0",
+        "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0",
         "twig/twig": "^2.13",
-        "symfony/yaml": "^4.4 || ^5.0",
-        "symfony/css-selector": "^4.4 || ^5.0",
-        "symfony/expression-language": "^4.4 || ^5.0",
+        "symfony/yaml": "^4.4 || ^5.0 || ^6.0",
+        "symfony/css-selector": "^4.4 || ^5.0 || ^6.0",
+        "symfony/expression-language": "^4.4 || ^5.0 || ^6.0",
         "symfony/monolog-bundle": "^3.0",
-        "symfony/routing": "^4.4 || ^5.0",
+        "symfony/routing": "^4.4 || ^5.0 || ^6.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "sebastian/exporter": "^2.0"
     },

src/DependencyInjection/FOSHttpCacheExtension.php

@@ -26,6 +26,7 @@
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -280,6 +281,12 @@ private function loadUserContext(ContainerBuilder $container, XmlFileLoader $loa
         }
 
         $loader->load('user_context.xml');
+        // TODO: Remove this service file when going to version 3 of the bundle
+        if (Kernel::MAJOR_VERSION >= 6) {
+            $loader->load('user_context_legacy_sf6.xml');
+        } else {
+            $loader->load('user_context_legacy.xml');
+        }
 
         $container->getDefinition('fos_http_cache.user_context.request_matcher')
             ->replaceArgument(0, $config['match']['accept'])

src/EventListener/FlashMessageListener.php

@@ -17,7 +17,6 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -41,12 +40,14 @@ final class FlashMessageListener implements EventSubscriberInterface
     private $options;
 
     /**
-     * @var Session
+     * For legacy support. If not set, we take the session from the request on the event.
+     *
+     * @var Session|null
      */
     private $session;
 
     /**
-     * @param Session $session A session instance
+     * @param Session|null $session
      */
     public function __construct($session, array $options = [])
     {
@@ -76,18 +77,24 @@ public static function getSubscribedEvents()
      */
     public function onKernelResponse(FlashMessageResponseEvent $event)
     {
-        if (HttpKernel::MASTER_REQUEST !== $event->getRequestType()) {
+        // BC for symfony < 5.3
+        if (method_exists($event, 'isMainRequest') ? !$event->isMainRequest() : !$event->isMasterRequest()) {
+            return;
+        }
+
+        $session = $this->session ?: $event->getRequest()->getSession();
+        if (null === $session) {
             return;
         }
 
         // Flash messages are stored in the session. If there is none, there
         // can't be any flash messages in it. $session->getFlashBag() would
         // create a session, we need to avoid that.
-        if (!$this->session->isStarted()) {
+        if (!$session->isStarted()) {
             return;
         }
 
-        $flashBag = $this->session->getFlashBag();
+        $flashBag = $session->getFlashBag();
         $flashes = $flashBag->all();
 
         if (empty($flashes)) {

src/EventListener/TagListener.php

@@ -20,7 +20,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -110,7 +109,8 @@ public function onKernelResponse(TagResponseEvent $event)
         if ($this->cacheableRule->matches($request, $response)) {
             // For safe requests (GET and HEAD), set cache tags on response
             $this->symfonyResponseTagger->addTags($tags);
-            if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+            // BC for symfony < 5.3
+            if (method_exists($event, 'isMainRequest') ? $event->isMainRequest() : $event->isMasterRequest()) {
                 $this->symfonyResponseTagger->tagSymfonyResponse($response);
             }
         } elseif (count($tags)

src/EventListener/UserContextListener.php

@@ -132,7 +132,8 @@ public function __construct(
      */
     public function onKernelRequest(UserContextRequestEvent $event)
     {
-        if (HttpKernelInterface::MASTER_REQUEST != $event->getRequestType()) {
+        // BC for symfony < 5.3
+        if (method_exists($event, 'isMainRequest') ? !$event->isMainRequest() : !$event->isMasterRequest()) {
             return;
         }
 

src/Http/RequestMatcher/CacheableRequestMatcher.php

@@ -19,7 +19,7 @@
  */
 class CacheableRequestMatcher implements RequestMatcherInterface
 {
-    public function matches(Request $request)
+    public function matches(Request $request): bool
     {
         return $request->isMethodCacheable();
     }

src/Http/RequestMatcher/QuerystringRequestMatcher.php

@@ -35,7 +35,7 @@ public function setQueryString($queryString)
     /**
      * {@inheritdoc}
      */
-    public function matches(Request $request)
+    public function matches(Request $request): bool
     {
         if (!parent::matches($request)) {
             return false;

src/Http/RequestMatcher/UnsafeRequestMatcher.php

@@ -16,7 +16,7 @@
 
 class UnsafeRequestMatcher implements RequestMatcherInterface
 {
-    public function matches(Request $request)
+    public function matches(Request $request): bool
     {
         return !$request->isMethodSafe();
     }