Merge tag '2.1.1' into develop

no message

Author: Toflar

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 .php_cs.cache
+.phpunit.result.cache
 composer.lock

.travis.yml

@@ -17,9 +17,13 @@ matrix:
     - php: 7.3
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
     - php: 7.4snapshot
+    - php: 7.4snapshot
+      env: COMPOSER_DEV_STABILITY=true
     - php: 7.4snapshot
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
     - php: nightly
+    - php: nightly
+      env: COMPOSER_DEV_STABILITY=true
     - php: nightly
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
   allow_failures:
@@ -31,11 +35,13 @@ before_script:
     if [ "$TRAVIS_PHP_VERSION" = "nightly" ]; then
       COMPOSER_FLAGS="$COMPOSER_FLAGS --ignore-platform-reqs"
     fi;
+  - if [[ $COMPOSER_DEV_STABILITY = true ]]; then composer config minimum-stability dev ; fi
   - travis_wait composer update --no-interaction $COMPOSER_FLAGS
 
 script:
   - if [[ $COVERAGE ]]; then mkdir -p build/logs; fi
-  - php vendor/bin/phpunit $COVERAGE
+  - php bin/phpunit $COVERAGE
+  - php vendor/bin/php-cs-fixer fix
 
 after_script:
  - if [[ $COVERAGE ]]; then php vendor/bin/php-coveralls; fi

bin/phpunit

@@ -0,0 +1,13 @@
+#!/usr/bin/env php
+<?php
+
+if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+    echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+    exit(1);
+}
+
+if (false === getenv('SYMFONY_PHPUNIT_VERSION') && PHP_VERSION_ID >= 70100) {
+    putenv('SYMFONY_PHPUNIT_VERSION=7.5');
+}
+
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';

composer.json

@@ -11,15 +11,15 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/lock": "^3.4|^4.0",
-        "symfony/cache": "^3.4|^4.0",
-        "symfony/http-foundation": "^3.0|^4.0",
-        "symfony/http-kernel": "^3.0|^4.0",
-        "symfony/options-resolver": "^3.0|^4.0"
+        "symfony/lock": "^3.4|^4.0|^5.0",
+        "symfony/cache": "^3.4|^4.0|^5.0",
+        "symfony/http-foundation": "^3.0|^4.0|^5.0",
+        "symfony/http-kernel": "^3.0|^4.0|^5.0",
+        "symfony/options-resolver": "^3.0|^4.0|^5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.12",
-        "phpunit/phpunit": "^5.7.27",
+        "symfony/phpunit-bridge": "^4.3.5",
         "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {

phpunit.xml.dist

@@ -8,9 +8,11 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+    </php>
     <testsuites>
         <testsuite name="PSR-6 HttpCache Store Test Suite">
             <directory>./tests/</directory>

src/Psr6Store.php

@@ -23,8 +23,10 @@
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Lock\BlockingStoreInterface;
 use Symfony\Component\Lock\Exception\LockReleasingException;
 use Symfony\Component\Lock\Factory;
+use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Lock\LockInterface;
 use Symfony\Component\Lock\Store\FlockStore;
 use Symfony\Component\Lock\Store\SemaphoreStore;
@@ -56,7 +58,7 @@ class Psr6Store implements Psr6StoreInterface
     private $cache;
 
     /**
-     * @var Factory
+     * @var Factory|LockFactory
      */
     private $lockFactory;
 
@@ -141,10 +143,16 @@ public function __construct(array $options = [])
                 throw new MissingOptionsException('The cache_directory option is required unless you set the lock_factory explicitly as by default locks are also stored in the configured cache_directory.');
             }
 
-            return new Factory(
-                $this->getDefaultLockStore($options['cache_directory'])
-            );
-        })->setAllowedTypes('lock_factory', Factory::class);
+            $defaultLockStore = $this->getDefaultLockStore($options['cache_directory']);
+
+            if (class_exists(LockFactory::class)) {
+                // Symfony >= 4.4
+                return new LockFactory($defaultLockStore);
+            }
+
+            // Symfony < 4.4
+            return new Factory($defaultLockStore);
+        })->setAllowedTypes('lock_factory', [Factory::class, LockFactory::class]);
 
         $this->options = $resolver->resolve($options);
         $this->cache = $this->options['cache'];
@@ -248,7 +256,14 @@ public function write(Request $request, Response $response)
         // Tags
         $tags = [];
         if ($response->headers->has($this->options['cache_tags_header'])) {
-            foreach ($response->headers->get($this->options['cache_tags_header'], '', false) as $header) {
+            // Symfony < 4.4
+            $headers = $response->headers->get($this->options['cache_tags_header'], '', false);
+            if (\is_string($headers)) {
+                // Symfony >= 4.4
+                $headers = $response->headers->all($this->options['cache_tags_header']);
+            }
+
+            foreach ($headers as $header) {
                 foreach (explode(',', $header) as $tag) {
                     $tags[] = $tag;
                 }
@@ -583,7 +598,7 @@ private function restoreResponse(array $cacheData)
      *
      * @param string $cacheDir
      *
-     * @return LockStoreInterface
+     * @return LockStoreInterface|BlockingStoreInterface
      *
      * @codeCoverageIgnore Depends on your system.
      */

tests/Psr6StoreTest.php

@@ -25,6 +25,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Lock\Exception\LockReleasingException;
 use Symfony\Component\Lock\Factory;
+use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Lock\LockInterface;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
@@ -63,7 +64,7 @@ public function testCustomCacheAndLockFactory()
         $cache = $this->createMock(TagAwareAdapterInterface::class);
         $cache->expects($this->once())
             ->method('deleteItem');
-        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory = $this->createFactoryMock();
 
         $store = new Psr6Store([
             'cache' => $cache,
@@ -225,7 +226,7 @@ public function testWriteStoresEntries()
 
         $entries = $cacheItem->get();
 
-        $this->assertInternalType('array', $entries, 'Entries are stored in cache.');
+        $this->assertTrue(\is_array($entries), 'Entries are stored in cache.');
         $this->assertCount(1, $entries, 'One entry is stored.');
         $this->assertSame($entries[Psr6Store::NON_VARYING_KEY]['headers'], array_diff_key($response->headers->all(), ['age' => []]), 'Response headers are stored with no age header.');
     }
@@ -389,7 +390,7 @@ public function testLookupWithVaryOnCookies()
         // Cookies match
         $request = Request::create('https://foobar.com/', 'GET', [], ['Foo' => 'Bar'], [], ['HTTP_COOKIE' => 'Foo=Bar']);
         $response = new Response('hello world', 200, ['Vary' => 'Cookie']);
-        $response->headers->setCookie(new Cookie('Foo', 'Bar'));
+        $response->headers->setCookie(new Cookie('Foo', 'Bar', 0, '/', false, null, true, false, null));
 
         $this->store->write($request, $response);
 
@@ -553,7 +554,7 @@ public function testAutoPruneExpiredEntries()
             ->method('release')
             ->willReturn(true);
 
-        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory = $this->createFactoryMock();
         $lockFactory
             ->expects($this->any())
             ->method('createLock')
@@ -622,7 +623,7 @@ public function testAutoPruneIsSkippedIfPruningIsAlreadyInProgress()
             ->method('acquire')
             ->willReturn(false);
 
-        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory = $this->createFactoryMock();
         $lockFactory
             ->expects($this->any())
             ->method('createLock')
@@ -665,7 +666,7 @@ public function testUnlockReturnsFalseOnLockReleasingException()
             ->method('release')
             ->willThrowException(new LockReleasingException());
 
-        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory = $this->createFactoryMock();
         $lockFactory
             ->expects($this->once())
             ->method('createLock')
@@ -690,7 +691,7 @@ public function testLockReleasingExceptionIsIgnoredOnCleanup()
             ->method('release')
             ->willThrowException(new LockReleasingException());
 
-        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory = $this->createFactoryMock();
         $lockFactory
             ->expects($this->once())
             ->method('createLock')
@@ -727,4 +728,15 @@ private function getCache($store = null)
 
         return $cache->getValue($this->store);
     }
+
+    private function createFactoryMock()
+    {
+        if (class_exists(LockFactory::class)) {
+            // Symfony >= 4.4
+            return $this->createMock(LockFactory::class);
+        }
+
+        // Symfony < 4.4
+        return $this->createMock(Factory::class);
+    }
 }