Merge 7f14b17 into b9f1a0b

.github/workflows/static.yml

@@ -17,7 +17,10 @@ jobs:
 
       - name: Pull in optional dependencies
         run: |
-          composer require --no-update symfony/http-kernel:^5.0 symfony/event-dispatcher:^5.0 symfony/process:^5.0 phpunit/phpunit toflar/psr6-symfony-http-cache-store:^3.0
+          composer global require symfony/flex
+          composer config --no-plugins allow-plugins.symfony/flex true
+          composer config extra.symfony.require "^5.0"
+          composer require --no-update symfony/http-kernel symfony/event-dispatcher symfony/process phpunit/phpunit toflar/psr6-symfony-http-cache-store:^3.0
           composer update --no-dev --no-progress
 
       - name: PHPStan
@@ -37,6 +40,9 @@ jobs:
 
       - name: Pull in optional dependencies
         run: |
+          composer global require symfony/flex
+          composer config --no-plugins allow-plugins.symfony/flex true
+          composer config extra.symfony.require "^5.0"
           composer require --no-update phpunit/phpunit toflar/psr6-symfony-http-cache-store:^3.0
           composer update --no-progress
 

doc/requirements.txt

@@ -1,7 +1,8 @@
 sphinx==1.8.5
 git+https://github.com/fabpot/sphinx-php.git
-sphinx-rtd-theme
+sphinx-rtd-theme==1.0.0
 sphinxcontrib-spelling
 sphinxcontrib-phpdomain
 pyenchant
 docutils==0.17.1
+jinja2<3.1.0

src/Test/EventDispatchingHttpCacheTestCase.php

@@ -72,6 +72,10 @@ protected function getHttpCachePartialMock(array $mockedMethods = null)
         $refOptions->setAccessible(true);
         $refOptions->setValue($mock, $options);
 
+        $surrogate = $refHttpCache->getProperty('surrogate');
+        $surrogate->setAccessible(true);
+        $surrogate->setValue($mock, null);
+
         return $mock;
     }