Fix CI Build and update PHPUnit

.styleci.yml

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

.travis.yml

@@ -17,7 +17,6 @@ env:
   global:
         - PHPUNIT_FLAGS="-v"
         - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
-        - SYMFONY_PHPUNIT_VERSION=6.5
 
 branches:
   only:

composer.json

@@ -30,13 +30,13 @@
     "require-dev": {
         "php-http/guzzle6-adapter": "^1.0 || ^2.0",
         "php-http/message": "^1.0 || ^2.0",
-        "mockery/mockery": "^1.0 || ^2.0",
+        "mockery/mockery": "^1.3.2",
         "monolog/monolog": "*",
         "sensio/framework-extra-bundle": "^3.0 || ^4.0 || ^5.0",
         "symfony/browser-kit": "^3.4.4 || ^4.2.7 || ^5.0",
         "symfony/console": "^3.4.26 || ^4.2.7 || ^5.0",
         "symfony/finder": "^3.4.26 || ^4.2.7 || ^5.0",
-        "symfony/phpunit-bridge": "^4.2.4 || ^5.0",
+        "symfony/phpunit-bridge": "^4.4.11 || ^5.1.3",
         "symfony/security-bundle": "^3.4.26 || ^4.2.7 || ^5.0",
         "symfony/twig-bundle": "^3.4.26 || ^4.2.7 || ^5.0",
         "symfony/yaml": "^3.4.26 || ^4.2.7 || ^5.0",

phpunit.xml.dist

@@ -4,8 +4,7 @@
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         syntaxCheck="true">
+         convertWarningsToExceptions="true">
     <testsuites>
         <testsuite name="unit">
             <directory suffix="Test.php">./tests/Unit</directory>
@@ -32,5 +31,6 @@
         <env name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
         <env name="KERNEL_CLASS" value="AppKernel" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
     </php>
 </phpunit>

src/Security/Http/Logout/ContextInvalidationLogoutHandler.php

@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Http\Event\LogoutEvent;
 use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface;
 
 /**
@@ -38,6 +39,13 @@ public function __construct(UserContextInvalidator $invalidator)
     public function logout(Request $request, Response $response, TokenInterface $token)
     {
         @trigger_error('Using the ContextInvalidationLogoutHandler is deprecated', E_USER_DEPRECATED);
+
+        if (class_exists(LogoutEvent::class)) {
+            // This class no longer works at all with Symfony 5.1, force usage of ContextInvalidationSessionLogoutHandler instead
+            // See also: https://github.com/FriendsOfSymfony/FOSHttpCacheBundle/pull/545#discussion_r465089219
+            throw new \LogicException(__CLASS__.'::'.__METHOD__.' no longer works with Symfony 5.1. Remove fos_http_cache.user_context.logout_handler from your firewall configuration. See the changelog for version 2.2. for more information.');
+        }
+
         $this->invalidator->invalidateContext($request->getSession()->getId());
     }
 }

tests/Functional/DependencyInjection/ServiceTest.php

@@ -58,7 +58,7 @@ public function testCanBeLoaded()
             if ('fos_http_cache.user_context.logout_handler' === $id) {
                 continue;
             }
-            $this->assertInternalType('object', $container->get($id));
+            $this->assertIsObject($container->get($id));
         }
     }
 }

tests/Functional/EventListener/CacheControlListenerTest.php

@@ -34,6 +34,6 @@ public function testNotCached()
         $client->request('GET', '/noncached');
         $response = $client->getResponse();
         // using contains because Symfony 3.2 add `private` when the cache is not public
-        $this->assertContains('no-cache', $response->headers->get('Cache-Control'));
+        $this->assertStringContainsString('no-cache', $response->headers->get('Cache-Control'));
     }
 }

tests/Functional/Security/Http/Logout/ContextInvalidationLogoutHandlerTest.php

@@ -16,13 +16,20 @@
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Http\Event\LogoutEvent;
 
 class ContextInvalidationLogoutHandlerTest extends WebTestCase
 {
     use MockeryPHPUnitIntegration;
 
     public function testLogout()
     {
+        if (class_exists(LogoutEvent::class)) {
+            // @see https://github.com/symfony/symfony/pull/36243/files#r465083756
+            // @see https://github.com/FriendsOfSymfony/FOSHttpCacheBundle/pull/545/files#diff-05cbcfd492fd361b33ee70130dc687b2
+            $this->markTestSkipped('This test does not work with Symfony 5.1.');
+        }
+
         $client = static::createClient();
         $session = $client->getContainer()->get('session');
 

tests/Unit/CacheManagerTest.php

@@ -25,7 +25,7 @@ class CacheManagerTest extends TestCase
 
     protected $proxyClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->proxyClient = \Mockery::mock(ProxyClient::class);
     }

tests/Unit/Command/InvalidatePathCommandTest.php

@@ -22,11 +22,10 @@ class InvalidatePathCommandTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testExecuteMissingParameters()
     {
+        $this->expectException(\RuntimeException::class);
+
         $invalidator = \Mockery::mock(CacheManager::class);
 
         $application = new Application();

tests/Unit/Command/InvalidateRegexCommandTest.php

@@ -22,11 +22,10 @@ class InvalidateRegexCommandTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testExecuteNoParameters()
     {
+        $this->expectException(\RuntimeException::class);
+
         $invalidator = \Mockery::mock(CacheManager::class);
 
         $application = new Application();

tests/Unit/Command/InvalidateTagCommandTest.php

@@ -22,11 +22,10 @@ class InvalidateTagCommandTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testExecuteMissingParameters()
     {
+        $this->expectException(\RuntimeException::class);
+
         $invalidator = \Mockery::mock(CacheManager::class);
 
         $application = new Application();

tests/Unit/Command/RefreshPathCommandTest.php

@@ -22,11 +22,10 @@ class RefreshPathCommandTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testExecuteMissingParameters()
     {
+        $this->expectException(\RuntimeException::class);
+
         $invalidator = \Mockery::mock(CacheManager::class);
 
         $application = new Application();

tests/Unit/Configuration/InvalidateRouteTest.php

@@ -22,24 +22,22 @@ class InvalidateRouteTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage InvalidateRoute params must be an array
-     */
     public function testExecuteInvalidParams()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('InvalidateRoute params must be an array');
+
         new InvalidateRoute([
             'name' => 'test',
             'params' => 'foo',
         ]);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage InvalidateRoute param id must be string
-     */
     public function testExecuteNoExpression()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('InvalidateRoute param id must be string');
+
         new InvalidateRoute([
             'name' => 'test',
             'params' => [

tests/Unit/Configuration/TagTest.php

@@ -12,6 +12,7 @@
 namespace FOS\HttpCacheBundle\Tests\Unit\Configuration;
 
 use FOS\HttpCacheBundle\Configuration\Tag;
+use FOS\HttpCacheBundle\Exception\InvalidTagException;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 
@@ -22,12 +23,11 @@ class TagTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \FOS\HttpCacheBundle\Exception\InvalidTagException
-     * @expectedExceptionMessage is invalid because it contains ,
-     */
     public function testExecuteInvalidParams()
     {
+        $this->expectException(InvalidTagException::class);
+        $this->expectExceptionMessage('is invalid because it contains ,');
+
         new Tag([
             'tags' => ['foo, bar'],
         ]);

tests/Unit/DependencyInjection/Compiler/HashGeneratorPassTest.php

@@ -15,6 +15,7 @@
 use FOS\HttpCacheBundle\DependencyInjection\FOSHttpCacheExtension;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -33,7 +34,7 @@ class HashGeneratorPassTest extends TestCase
      */
     private $userContextListenerPass;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->extension = new FOSHttpCacheExtension();
         $this->userContextListenerPass = new HashGeneratorPass();
@@ -56,12 +57,11 @@ public function testConfigNoContext()
         }
     }
 
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage No user context providers found
-     */
     public function testConfigNoProviders()
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('No user context providers found');
+
         $container = $this->createContainer();
         $config = $this->getBaseConfig();
         $config['user_context']['enabled'] = true;

tests/Unit/DependencyInjection/Compiler/TagListenerPassTest.php

@@ -22,12 +22,11 @@ class TagListenerPassTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage require the SensioFrameworkExtraBundle
-     */
     public function testNoFrameworkBundle()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('require the SensioFrameworkExtraBundle');
+
         $extension = new FOSHttpCacheExtension();
         $tagListenerPass = new TagListenerPass();
         $container = $this->createContainer();

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -298,12 +298,11 @@ public function testSupportsSymfony()
         }
     }
 
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Either configure the "http.servers" section or enable "proxy_client.symfony.use_kernel_dispatcher
-     */
     public function testEmptyServerConfigurationIsNotAllowed()
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Either configure the "http.servers" section or enable "proxy_client.symfony.use_kernel_dispatcher');
+
         $params = $this->getEmptyConfig();
         $params['proxy_client'] = [
             'symfony' => [
@@ -457,7 +456,7 @@ public function testCacheManagerNoClient()
                 $this->assertProcessedConfigurationEquals([], [$format]);
                 $this->fail('No exception thrown on invalid configuration');
             } catch (InvalidConfigurationException $e) {
-                $this->assertContains('need to configure a proxy_client', $e->getMessage());
+                $this->assertStringContainsString('need to configure a proxy_client', $e->getMessage());
             }
         }
     }
@@ -477,7 +476,7 @@ public function testTagsNoCacheManager()
                 $this->assertProcessedConfigurationEquals([], [$format]);
                 $this->fail('No exception thrown on invalid configuration');
             } catch (InvalidConfigurationException $e) {
-                $this->assertContains('cache_manager needed for tag handling', $e->getMessage());
+                $this->assertStringContainsString('cache_manager needed for tag handling', $e->getMessage());
             }
         }
     }
@@ -599,7 +598,7 @@ public function testInvalidationNoCacheManager()
                 $this->assertProcessedConfigurationEquals([], [$format]);
                 $this->fail('No exception thrown on invalid configuration');
             } catch (InvalidConfigurationException $e) {
-                $this->assertContains('cache_manager needed for invalidation handling', $e->getMessage());
+                $this->assertStringContainsString('cache_manager needed for invalidation handling', $e->getMessage());
             }
         }
     }
@@ -627,7 +626,7 @@ public function testUserContextLogoutHandler(string $configFile, $expected, $cac
                 $this->assertProcessedConfigurationEquals([], [$configFile]);
                 $this->fail('No exception thrown on invalid configuration');
             } catch (InvalidConfigurationException $e) {
-                $this->assertContains($exception, $e->getMessage());
+                $this->assertStringContainsString($exception, $e->getMessage());
             }
 
             return;
@@ -667,7 +666,7 @@ public function testInvalidDate()
                 $this->assertProcessedConfigurationEquals([], [$format]);
                 $this->fail('No exception thrown on invalid configuration');
             } catch (InvalidConfigurationException $e) {
-                $this->assertContains('Failed to parse time string', $e->getMessage());
+                $this->assertStringContainsString('Failed to parse time string', $e->getMessage());
             }
         }
     }