Merge pull request #530 from FriendsOfSymfony/fix-build

fix builds

Author: dbu

.github/workflows/static.yml

@@ -16,9 +16,7 @@ jobs:
  uses: actions/checkout@v2
 
  - 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 update --no-dev --no-progress
+ run: composer require --no-update symfony/http-kernel symfony/event-dispatcher symfony/process phpunit/phpunit toflar/psr6-symfony-http-cache-store:^3.0
 
  - name: PHPStan
  uses: docker://oskarstark/phpstan-ga
@@ -36,9 +34,7 @@ jobs:
  uses: actions/checkout@v2
 
  - name: Pull in optional dependencies
- run: |
- composer require --no-update phpunit/phpunit toflar/psr6-symfony-http-cache-store:^3.0
- composer update --no-progress
+ run: composer require --no-update phpunit/phpunit toflar/psr6-symfony-http-cache-store:^3.0
 
  - name: PHPStan
  uses: docker://oskarstark/phpstan-ga

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;
  }