- Code improvements, PSR2 fix

Author: matiasfuster

tests/AssetManagerTest/Service/AssetManagerTest.php

@@ -211,6 +211,23 @@ public function testSetExtensionFilters()
         $assetManager->setAssetOnResponse($response);
         $this->assertEquals($minified, $response->getBody());
     }
+    public function getCollectionResolver()
+    {
+        $aggregateResolver  = new AggregateResolver;
+        $mockedResolver     = $this->getResolver(__DIR__ . '/../../_files/require-jquery.js');
+        $collArr = array(
+            'blah.js' => array(
+                'asset-path'
+            )
+        );
+        $resolver = new CollectionResolver($collArr);
+        $resolver->setAggregateResolver($aggregateResolver);
+
+        $aggregateResolver->attach($mockedResolver, 500);
+        $aggregateResolver->attach($resolver, 1000);
+
+        return $resolver;
+    }
     public function testSetExtensionFiltersNotDuplicate()
     {
         $config = array(
@@ -222,33 +239,20 @@ public function testSetExtensionFiltersNotDuplicate()
                 ),
             ),
         );
-        
+
+        $resolver           = $this->getCollectionResolver();
         $assetFilterManager = new AssetFilterManager($config['filters']);
         $mimeResolver       = new MimeResolver;
         $assetFilterManager->setMimeResolver($mimeResolver);
-
-        $aggregateResolver  = new AggregateResolver;        
-        $mockedResolver     = $this->getResolver(__DIR__ . '/../../_files/require-jquery.js');
-        $collArr = array(
-            'blah.js' => array(
-                'asset-path'
-            )
-        );
-        $resolver = new CollectionResolver($collArr);
         $resolver->setAssetFilterManager($assetFilterManager);
-        $resolver->setAggregateResolver($aggregateResolver);
-
-        $aggregateResolver->attach($mockedResolver, 500);
-        $aggregateResolver->attach($resolver, 1000);
-
 
         $response     = new Response;
         $request      = $this->getRequest();
         // Have to change uri because asset-path would cause an infinite loop
         $request->setUri('http://localhost/base-path/blah.js');
 
         $assetCacheManager = $this->getAssetCacheManagerMock();
-        $assetManager      = new AssetManager($aggregateResolver, $config);
+        $assetManager      = new AssetManager($resolver->getAggregateResolver(), $config);
         $assetManager->setAssetCacheManager($assetCacheManager);
         $assetManager->setAssetFilterManager($assetFilterManager);