fix default cache

Author: jenschude

lib/commercetools-base/src/Client/CacheValidator.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Commercetools\Client;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+
+final class CacheValidator
+{
+    /**
+     * @psalm-param CacheItemPoolInterface|CacheInterface|null $cache
+     * @psalm-return CacheItemPoolInterface|CacheInterface
+     */
+    public static function validateCache($cache = null)
+    {
+        if ($cache instanceof CacheItemPoolInterface || $cache instanceof CacheInterface) {
+            return $cache;
+        }
+
+        if (class_exists('Symfony\Component\Cache\Simple\FilesystemCache')) {
+            /** @psalm-suppress all */
+            /** @var CacheItemPoolInterface $cache */
+            $cache = new FilesystemCache('', 0, getcwd() . "/cache");
+        } else {
+            /** @psalm-suppress all */
+            /** @var CacheItemPoolInterface $cache */
+            $cache = new FilesystemAdapter('', 0, getcwd() . "/cache");
+        }
+
+        return $cache;
+    }
+}

lib/commercetools-base/src/Client/OAuthHandlerFactory.php

@@ -9,53 +9,34 @@
 
 namespace Commercetools\Client;
 
-use Cache\Adapter\Filesystem\FilesystemCachePool;
 use Commercetools\Exception\InvalidArgumentException;
 use GuzzleHttp\Client;
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\Filesystem;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\Simple\FilesystemCache;
 
 class OAuthHandlerFactory
 {
-    /**
-     * @psalm-param CacheItemPoolInterface|CacheInterface|null $cache
-     * @psalm-return CacheItemPoolInterface|CacheInterface
-     */
-    private static function validateCache($cache = null)
-    {
-        if ($cache instanceof CacheItemPoolInterface || $cache instanceof CacheInterface) {
-            return $cache;
-        }
-
-        $filesystemAdapter = new Local(getcwd());
-        $filesystem = new Filesystem($filesystemAdapter);
-        $cache = new FilesystemCachePool($filesystem);
-        
-        return $cache;
-    }
-
     /**
      * @psalm-param CacheItemPoolInterface|CacheInterface|null $cache
      */
     public static function ofAuthConfig(AuthConfig $authConfig, $cache = null): OAuth2Handler
     {
-        $cache = self::validateCache($cache);
+        $cache = CacheValidator::validateCache($cache);
         switch (true) {
-           case $authConfig instanceof ClientCredentialsConfig:
-               $provider = new CachedTokenProvider(
-                   new ClientCredentialTokenProvider(
-                       new Client($authConfig->getOptions()),
-                       $authConfig->getAuthUri(),
-                       $authConfig->getCredentials()
-                   ),
-                   $cache,
-                   $authConfig->getCredentials()->getCacheKey()
-               );
-               break;
-           default:
-               throw new InvalidArgumentException('Unknown authorization configuration');
+            case $authConfig instanceof ClientCredentialsConfig:
+                $provider = new CachedTokenProvider(
+                    new ClientCredentialTokenProvider(
+                        new Client($authConfig->getOptions()),
+                        $authConfig->getAuthUri(),
+                        $authConfig->getCredentials()
+                    ),
+                    $cache,
+                    $authConfig->getCredentials()->getCacheKey()
+                );
+                break;
+            default:
+                throw new InvalidArgumentException('Unknown authorization configuration');
 
         }
         return self::ofProvider($provider);

test/unit/CacheValidatorTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Commercetools\UnitTest;
+
+use Commercetools\Client\CacheValidator;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Simple\FilesystemCache;
+
+class CacheValidatorTest extends TestCase
+{
+    public function testDefaultCache()
+    {
+        if (class_exists('Symfony\Component\Cache\Simple\FilesystemCache')) {
+            $this->assertInstanceOf(FilesystemCache::class, CacheValidator::validateCache());
+        } else {
+            $this->assertInstanceOf(FilesystemAdapter::class, CacheValidator::validateCache());
+        }
+    }
+}