Added missing doc blocks.

Removed unneeded doc blocks
Moved config to constructor + factory and updated unit tests for the asset cache manager.
Changed order for asset cache provider discovery and return from method as soon as resource is found.

Author: Westin Shafer

.gitignore

@@ -2,4 +2,5 @@ clover.xml
 php-cs-fixer.phar
 composer.json
 composer.lock
-vendor
+vendor
+.idea

src/AssetManager/Service/AssetCacheManager.php

@@ -9,12 +9,12 @@
 
 /**
  * Asset Cache Manager.  Sets asset cache based on configuration.
- *
- * @category   AssetManager
- * @package    AssetManager
  */
 class AssetCacheManager
 {
+    /**
+     * @var \Zend\ServiceManager\ServiceLocatorInterface
+     */
     protected $serviceLocator;
 
     /**
@@ -26,18 +26,16 @@ class AssetCacheManager
      * Construct the AssetCacheManager
      *
      * @param   ServiceLocatorInterface $serviceLocator
+     * @param   array                   $config
      *
      * @return  AssetCacheManager
      */
-    public function __construct(ServiceLocatorInterface $serviceLocator)
-    {
+    public function __construct(
+        ServiceLocatorInterface $serviceLocator,
+        $config
+    ) {
         $this->serviceLocator = $serviceLocator;
-
-        $globalConfig = $this->serviceLocator->get('config');
-
-        if (!empty($globalConfig['asset_manager']['caching'])) {
-            $this->config = $globalConfig['asset_manager']['caching'];
-        }
+        $this->config = $config;
     }
 
     /**
@@ -79,23 +77,24 @@ private function getProvider($path)
             return null;
         }
 
+        if ($this->serviceLocator->has($cacheProvider['cache'])) {
+            return $this->serviceLocator->get($cacheProvider['cache']);
+        }
+
+        // Left here for BC.  Please consider defining a ZF2 service instead.
         if (is_callable($cacheProvider['cache'])) {
-            $provider = call_user_func($cacheProvider['cache'], $path);
-        } elseif ($this->serviceLocator->has($cacheProvider['cache'])) {
-            $provider = $this->serviceLocator->get($cacheProvider['cache']);
-        } else {
-            $dir = '';
-            $class = $cacheProvider['cache'];
-
-            if (!empty($cacheProvider['options']['dir'])) {
-                $dir = $cacheProvider['options']['dir'];
-            }
-
-            $class = $this->classMapper($class);
-            $provider = new $class($dir, $path);
+            return call_user_func($cacheProvider['cache'], $path);
+        }
+
+        $dir = '';
+        $class = $cacheProvider['cache'];
+
+        if (!empty($cacheProvider['options']['dir'])) {
+            $dir = $cacheProvider['options']['dir'];
         }
 
-        return $provider;
+        $class = $this->classMapper($class);
+        return new $class($dir, $path);
     }
 
     /**

src/AssetManager/Service/AssetCacheManagerServiceFactory.php

@@ -19,6 +19,14 @@ class AssetCacheManagerServiceFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return new AssetCacheManager($serviceLocator);
+        $config = array();
+
+        $globalConfig = $serviceLocator->get('config');
+
+        if (!empty($globalConfig['asset_manager']['caching'])) {
+            $config = $globalConfig['asset_manager']['caching'];
+        }
+
+        return new AssetCacheManager($serviceLocator, $config);
     }
 }