Assetic framework support

thomasvargiu · thomasvargiu · commit 7b80a88de4b4 · 2020-12-16T17:06:04.000+01:00
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "laminas/laminas-loader": "^2.5.1",
         "laminas/laminas-eventmanager": "^2.6.3 || ^3.0.1",
         "laminas/laminas-mvc": "^2.7.9 || ^3.0.2",
-        "kriswallsmith/assetic": "^1.4.0",
+        "assetic/framework": "^2.0",
         "laminas/laminas-dependency-plugin": "^2.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/AssetManager/Asset/AggregateAsset.php b/src/AssetManager/Asset/AggregateAsset.php
@@ -3,7 +3,7 @@
 namespace AssetManager\Asset;
 
 use Assetic\Asset\BaseAsset;
-use Assetic\Filter\FilterInterface;
+use Assetic\Contracts\Filter\FilterInterface;
 use AssetManager\Exception;
 
 /**
diff --git a/src/AssetManager/Cache/FilePathCache.php b/src/AssetManager/Cache/FilePathCache.php
@@ -2,7 +2,7 @@
 
 namespace AssetManager\Cache;
 
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use AssetManager\Exception\RuntimeException;
 use Laminas\Stdlib\ErrorHandler;
 
diff --git a/src/AssetManager/Cache/LaminasCacheAdapter.php b/src/AssetManager/Cache/LaminasCacheAdapter.php
@@ -2,7 +2,7 @@
 
 namespace AssetManager\Cache;
 
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use Laminas\Cache\Storage\StorageInterface;
 
 /**
diff --git a/src/AssetManager/Cache/PsrSimpleCacheAdapter.php b/src/AssetManager/Cache/PsrSimpleCacheAdapter.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AssetManager\Cache;
+
+use Assetic\Contracts\Cache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as SimpleCache;
+
+/**
+ * PSR SimpleCache Adapter for Assetic
+ */
+class PsrSimpleCacheAdapter implements CacheInterface
+{
+
+    /** @var SimpleCache */
+    protected $cache;
+
+    /** @var int|null */
+    protected $ttl;
+
+    /**
+     * Constructor
+     *
+     * @param SimpleCache $cache Laminas Configured Cache Storage
+     * @param int|null $ttl
+     */
+    public function __construct(SimpleCache $cache, ?int $ttl = null)
+    {
+        $this->cache = $cache;
+        $this->ttl = $ttl;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function has($key)
+    {
+        return $this->cache->has($key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get($key)
+    {
+        return $this->cache->get($key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function set($key, $value)
+    {
+        return $this->cache->set($key, $value, $this->ttl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function remove($key)
+    {
+        return $this->cache->delete($key);
+    }
+}
diff --git a/src/AssetManager/Resolver/CollectionResolver.php b/src/AssetManager/Resolver/CollectionResolver.php
@@ -3,7 +3,7 @@
 namespace AssetManager\Resolver;
 
 use Assetic\Asset\AssetCollection;
-use Assetic\Asset\AssetInterface;
+use Assetic\Contracts\Asset\AssetInterface;
 use AssetManager\Exception;
 use AssetManager\Service\AssetFilterManager;
 use AssetManager\Service\AssetFilterManagerAwareInterface;
diff --git a/src/AssetManager/Resolver/ConcatResolver.php b/src/AssetManager/Resolver/ConcatResolver.php
@@ -2,7 +2,7 @@
 
 namespace AssetManager\Resolver;
 
-use Assetic\Asset\AssetInterface;
+use Assetic\Contracts\Asset\AssetInterface;
 use AssetManager\Asset\AggregateAsset;
 use AssetManager\Exception;
 use AssetManager\Service\AssetFilterManager;
@@ -135,7 +135,7 @@ public function resolve($name)
                 throw new Exception\RuntimeException(
                     sprintf(
                         'Asset "%s" from collection "%s" can\'t be resolved '
-                        .'to an Asset implementing Assetic\Asset\AssetInterface.',
+                        .'to an Asset implementing Assetic\Contracts\Asset\AssetInterface.',
                         $assetName,
                         $name
                     )
diff --git a/src/AssetManager/Resolver/ResolverInterface.php b/src/AssetManager/Resolver/ResolverInterface.php
@@ -9,7 +9,7 @@ interface ResolverInterface
      *
      * @param   string  $path   The path to resolve.
      *
-     * @return  \Assetic\Asset\AssetInterface|null Asset instance when found, null when not.
+     * @return  \Assetic\Contracts\Asset\AssetInterface|null Asset instance when found, null when not.
      */
     public function resolve($path);
 }
diff --git a/src/AssetManager/Service/AssetCacheManager.php b/src/AssetManager/Service/AssetCacheManager.php
@@ -3,8 +3,8 @@
 namespace AssetManager\Service;
 
 use Assetic\Asset\AssetCache;
-use Assetic\Asset\AssetInterface;
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Asset\AssetInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
@@ -138,9 +138,6 @@ private function classMapper($class)
         $classToCheck .= (substr($class, -5) === 'Cache') ? '' : 'Cache';
 
         switch ($classToCheck) {
-            case 'ApcCache':
-                $class = 'Assetic\Cache\ApcCache';
-                break;
             case 'FilesystemCache':
                 $class = 'Assetic\Cache\FilesystemCache';
                 break;
diff --git a/src/AssetManager/Service/AssetFilterManager.php b/src/AssetManager/Service/AssetFilterManager.php
@@ -2,8 +2,8 @@
 
 namespace AssetManager\Service;
 
-use Assetic\Asset\AssetInterface;
-use Assetic\Filter\FilterInterface;
+use Assetic\Contracts\Asset\AssetInterface;
+use Assetic\Contracts\Filter\FilterInterface;
 use AssetManager\Exception;
 use AssetManager\Resolver\MimeResolverAwareInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
@@ -138,7 +138,7 @@ protected function ensureByFilter(AssetInterface $asset, $filter)
 
         $filterClass = $filter;
 
-        if (!is_subclass_of($filterClass, 'Assetic\Filter\FilterInterface', true)) {
+        if (!is_subclass_of($filterClass, 'Assetic\Contracts\Filter\FilterInterface', true)) {
             $filterClass .= (substr($filterClass, -6) === 'Filter') ? '' : 'Filter';
             $filterClass  = 'Assetic\Filter\\' . $filterClass;
         }
diff --git a/src/AssetManager/Service/AssetManager.php b/src/AssetManager/Service/AssetManager.php
@@ -2,7 +2,7 @@
 
 namespace AssetManager\Service;
 
-use Assetic\Asset\AssetInterface;
+use Assetic\Contracts\Asset\AssetInterface;
 use AssetManager\Exception;
 use AssetManager\Resolver\ResolverInterface;
 use Laminas\Http\PhpEnvironment\Request;
diff --git a/tests/AssetManagerTest/Cache/FilePathCacheTest.php b/tests/AssetManagerTest/Cache/FilePathCacheTest.php
@@ -2,7 +2,7 @@
 
 namespace AssetManagerTest\Cache;
 
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use AssetManager\Cache\FilePathCache;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/AssetManagerTest/Cache/PsrSimpleCacheAdapterTest.php b/tests/AssetManagerTest/Cache/PsrSimpleCacheAdapterTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace AssetManagerTest\Cache;
+
+use AssetManager\Cache\PsrSimpleCacheAdapter;
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * Test file for Laminas Cache Adapter
+ *
+ * @package AssetManager\Cache
+ */
+class PsrSimpleCacheAdapterTest extends \PHPUnit\Framework\TestCase
+{
+    public function testConstructor()
+    {
+        $mockPsrCache = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $adapter = new PsrSimpleCacheAdapter($mockPsrCache);
+
+        $this->assertInstanceOf(PsrSimpleCacheAdapter::class, $adapter);
+    }
+
+    public function testHasMethodCallsPsrCacheHas()
+    {
+        $mockLaminasCache = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLaminasCache->expects($this->once())
+            ->method('has');
+
+        $adapter = new PsrSimpleCacheAdapter($mockLaminasCache);
+        $adapter->has('SomeKey');
+    }
+
+    public function testGetMethodCallsPsrCacheGet()
+    {
+        $mockLaminasCache = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLaminasCache->expects($this->once())
+            ->method('get')
+            ->with('SomeKey');
+
+        $adapter = new PsrSimpleCacheAdapter($mockLaminasCache);
+        $adapter->get('SomeKey');
+    }
+
+    public function testSetMethodCallsPsrCacheSet()
+    {
+        $mockLaminasCache = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLaminasCache->expects($this->once())
+            ->method('set')
+            ->with('SomeKey', [], null);
+
+        $adapter = new PsrSimpleCacheAdapter($mockLaminasCache);
+        $adapter->set('SomeKey', array());
+    }
+
+    public function testSetMethodCallsPsrCacheSetWithTTL()
+    {
+        $mockLaminasCache = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLaminasCache->expects($this->once())
+            ->method('set')
+            ->with('SomeKey', [], 10);
+
+        $adapter = new PsrSimpleCacheAdapter($mockLaminasCache, 10);
+        $adapter->set('SomeKey', array());
+    }
+
+    public function testRemoveMethodCallsPsrCacheRemove()
+    {
+        $mockLaminasCache = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLaminasCache->expects($this->once())
+            ->method('delete')
+            ->with('SomeKey');
+
+        $adapter = new PsrSimpleCacheAdapter($mockLaminasCache);
+        $adapter->remove('SomeKey');
+    }
+}
diff --git a/tests/AssetManagerTest/Resolver/CollectionResolverTest.php b/tests/AssetManagerTest/Resolver/CollectionResolverTest.php
@@ -4,7 +4,7 @@
 
 use Assetic\Asset;
 use Assetic\Asset\AssetCache;
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use AssetManager\Resolver\AggregateResolverAwareInterface;
 use AssetManager\Resolver\CollectionResolver;
 use AssetManager\Resolver\ResolverInterface;
diff --git a/tests/AssetManagerTest/Service/AssetCacheManagerTest.php b/tests/AssetManagerTest/Service/AssetCacheManagerTest.php
@@ -4,8 +4,7 @@
 
 use Assetic\Asset\AssetCache;
 use Assetic\Asset\FileAsset;
-use Assetic\Cache\ApcCache;
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use Assetic\Cache\FilesystemCache;
 use AssetManager\Cache\FilePathCache;
 use AssetManager\Service\AssetCacheManager;
@@ -28,7 +27,7 @@ public function testSetCache()
 
         $config = array(
             'my/path' => array(
-                'cache' => 'Apc',
+                'cache' => 'Filesystem',
             ),
         );
 
@@ -53,7 +52,7 @@ public function testSetCacheNoProviderFound()
         $serviceManager = new ServiceManager();
         $config = array(
             'my/path' => array(
-                'cache' => 'Apc',
+                'cache' => 'Filesystem',
             ),
         );
 
@@ -78,7 +77,7 @@ public function testGetProvider()
 
         $config = array(
             'my/path' => array(
-                'cache' => 'Apc',
+                'cache' => 'Filesystem',
             ),
         );
 
@@ -102,7 +101,7 @@ public function testGetProviderUsingDefaultConfiguration()
         $serviceManager = new ServiceManager();
         $config = array(
             'default' => array(
-                'cache' => 'Apc',
+                'cache' => 'Filesystem',
             ),
         );
 
@@ -215,7 +214,7 @@ public function testGetProviderWithMultipleDefinition()
             ),
 
             'my_bc_check.tmp' => array(
-                'cache' => 'Apc',
+                'cache' => 'Filesystem',
             ),
         );
 
@@ -324,24 +323,6 @@ public function testGetCacheProviderConfigReturnsDefaultCache()
         $this->assertEquals($expected, $providerConfig);
     }
 
-    /**
-     * @covers \AssetManager\Service\AssetCacheManager::classMapper
-     */
-    public function testClassMapperResolvesApcCache()
-    {
-        $serviceManager = new ServiceManager();
-
-        $assetManager = new AssetCacheManager($serviceManager, array());
-        $reflectionMethod = new \ReflectionMethod(
-            AssetCacheManager::class,
-            'classMapper'
-        );
-        $reflectionMethod->setAccessible(true);
-
-        $class = $reflectionMethod->invoke($assetManager, 'ApcCache');
-        $this->assertEquals(ApcCache::class, $class);
-    }
-
     /**
      * @covers \AssetManager\Service\AssetCacheManager::classMapper
      */
diff --git a/tests/AssetManagerTest/Service/AssetFilterManagerTest.php b/tests/AssetManagerTest/Service/AssetFilterManagerTest.php
@@ -2,9 +2,9 @@
 
 namespace AssetManagerTest\Service;
 
-use Assetic\Asset\AssetInterface;
+use Assetic\Contracts\Asset\AssetInterface;
 use Assetic\Asset\StringAsset;
-use Assetic\Filter\FilterInterface;
+use Assetic\Contracts\Filter\FilterInterface;
 use AssetManager\Service\AssetFilterManager;
 use PHPUnit\Framework\TestCase;
 use Laminas\ServiceManager\ServiceManager;
diff --git a/tests/_files/CustomFilter.php b/tests/_files/CustomFilter.php
diff --git a/tests/_files/ReverseFilter.php b/tests/_files/ReverseFilter.php

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ interface ResolverInterface`
`9`	`9`	`*`
`10`	`10`	`* @param string $path The path to resolve.`
`11`	`11`	`*`
`12`		`- * @return \Assetic\Asset\AssetInterface\|null Asset instance when found, null when not.`
	`12`	`+ * @return \Assetic\Contracts\Asset\AssetInterface\|null Asset instance when found, null when not.`
`13`	`13`	`*/`
`14`	`14`	`public function resolve($path);`
`15`	`15`	`}`