Merge pull request #533 from FriendsOfSymfony/symfony-5

symfony 5 compatibility

Author: dbu

.styleci.yml

@@ -3,3 +3,6 @@ preset: symfony
 enabled:
   - alpha_ordered_imports
   - short_array_syntax
+
+disabled:
+  - single_line_throw

.travis.yml

@@ -28,16 +28,15 @@ matrix:
   include:
     # Minimum supported dependencies with the latest and oldest PHP version
 
-    - php: 7.1
-      env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
     - php: 7.2
       env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest" DEPENDENCIES="symfony/validator:^3.4.4 symfony/templating:^3.4.4"
+    - php: 7.3
+      env:
+        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest" DEPENDENCIES="symfony/validator:^3.4.4 symfony/templating:^3.4.4"
 
     # Test the latest stable release
 
-    - php: 7.1
     - php: 7.2
     - php: 7.3
       env:
@@ -49,6 +48,9 @@ matrix:
     - php: 7.3
       env: DEPENDENCIES="symfony/lts:^3"
 
+    - php: 7.3
+      env: DEPENDENCIES="symfony/flex" SYMFONY_VERSION="^4"
+
       # Latest commit to master
     - php: 7.3
       env: STABILITY="dev"
@@ -60,7 +62,8 @@ matrix:
 before_install:
   - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
   - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
-  - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
+  - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
+  - if ! [ -z "$SYMFONY_VERSION" ]; then composer config extra.symfony.require ${SYMFONY_VERSION}; fi;
 
 install:
   # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.8.0
+-----
+
+### Fixed
+
+* Adjusted to work with Twig 3
+* Adjusted to work with Symfony 5
+
 2.7.2
 -----
 

composer.json

@@ -21,30 +21,30 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "friendsofsymfony/http-cache": "^2.5.2",
-        "symfony/framework-bundle": "^3.4.4 || ^4.0",
-        "symfony/http-foundation": "^3.4.4 || ^4.0",
-        "symfony/http-kernel": "^3.4.4 || ^4.0"
+        "symfony/framework-bundle": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/http-foundation": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/http-kernel": "^3.4.4 || ^4.1.12 || ^5.0"
     },
     "require-dev": {
         "php-http/guzzle6-adapter": "^1.0 || ^2.0",
         "php-http/message": "^1.0",
         "mockery/mockery": "^1.0",
         "monolog/monolog": "*",
-        "sensio/framework-extra-bundle": "^3.0",
-        "symfony/browser-kit": "^3.4.4 || ^4.0",
-        "symfony/console": "^3.4.4 || ^4.0",
-        "symfony/finder": "^3.4.4 || ^4.0",
-        "symfony/phpunit-bridge": "^4.2.4",
-        "symfony/security-bundle": "^3.4.4 || ^4.0",
-        "symfony/twig-bundle": "^3.4.4 || ^4.0",
-        "symfony/yaml": "^3.4.4 || ^4.0",
-        "symfony/css-selector": "^3.4.4 || ^4.0",
-        "symfony/expression-language": "^3.4.4 || ^4.0",
-        "symfony/monolog-bundle": "^3.0",
-        "symfony/routing": "^3.4.4 || ^4.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.3",
+        "sensio/framework-extra-bundle": "^3.0 || ^4.0 || ^5.0",
+        "symfony/browser-kit": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/console": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/finder": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/phpunit-bridge": "^4.2.4 || ^5.0",
+        "symfony/security-bundle": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/twig-bundle": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/yaml": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/css-selector": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/expression-language": "^3.4.4 || ^4.1.12 || ^5.0",
+        "symfony/monolog-bundle": "^3.0 || ^4.1.12 || ^5.0",
+        "symfony/routing": "^3.4.4 || ^4.1.12 || ^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "sebastian/exporter": "^2.0"
     },
     "suggest": {
@@ -71,7 +71,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

src/Command/InvalidatePathCommand.php

@@ -80,5 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $this->getCacheManager()->invalidatePath($path);
         }
+
+        return 0;
     }
 }

src/Command/InvalidateRegexCommand.php

@@ -77,5 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $regex = $input->getArgument('regex');
 
         $this->getCacheManager()->invalidateRegex($regex);
+
+        return 0;
     }
 }

src/Command/InvalidateTagCommand.php

@@ -72,5 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $tags = $input->getArgument('tags');
 
         $this->getCacheManager()->invalidateTags($tags);
+
+        return 0;
     }
 }

src/Command/RefreshPathCommand.php

@@ -80,5 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $this->getCacheManager()->refreshPath($path);
         }
+
+        return 0;
     }
 }

src/EventListener/CacheControlListener.php

@@ -16,8 +16,16 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelEvents;
 
+if (Kernel::MAJOR_VERSION >= 5) {
+    class_alias(ResponseEvent::class, 'FOS\HttpCacheBundle\EventListener\CacheControlResponseEvent');
+} else {
+    class_alias(FilterResponseEvent::class, 'FOS\HttpCacheBundle\EventListener\CacheControlResponseEvent');
+}
+
 /**
  * Set caching settings on matching response according to the configurations.
  *
@@ -95,10 +103,8 @@ public function setSkip($skip = true)
 
     /**
      * Apply the header rules if the request matches.
-     *
-     * @param FilterResponseEvent $event
      */
-    public function onKernelResponse(FilterResponseEvent $event)
+    public function onKernelResponse(CacheControlResponseEvent $event)
     {
         $request = $event->getRequest();
         $response = $event->getResponse();

src/EventListener/FlashMessageListener.php

@@ -16,10 +16,18 @@
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 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;
 
+if (Kernel::MAJOR_VERSION >= 5) {
+    class_alias(ResponseEvent::class, 'FOS\HttpCacheBundle\EventListener\FlashMessageResponseEvent');
+} else {
+    class_alias(FilterResponseEvent::class, 'FOS\HttpCacheBundle\EventListener\FlashMessageResponseEvent');
+}
+
 /**
  * This event handler reads all flash messages and moves them into a cookie.
  *
@@ -66,10 +74,8 @@ public static function getSubscribedEvents()
 
     /**
      * Moves flash messages from the session to a cookie inside a Response Kernel listener.
-     *
-     * @param FilterResponseEvent $event
      */
-    public function onKernelResponse(FilterResponseEvent $event)
+    public function onKernelResponse(FlashMessageResponseEvent $event)
     {
         if (HttpKernel::MASTER_REQUEST !== $event->getRequestType()) {
             return;