Merge pull request #158 from RWOverdijk/hotfix/cs

CS fixes

Author: RWOverdijk

tests/AssetManagerTest/Resolver/AliasPathStackResolverTest.php

@@ -26,7 +26,7 @@ public function testConstructor()
         $resolver = new AliasPathStackResolver($aliases);
 
         $reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
-        $property = $reflectionClass->getProperty('aliases');
+        $property        = $reflectionClass->getProperty('aliases');
         $property->setAccessible(true);
 
         $this->assertEquals(
@@ -53,20 +53,20 @@ public function testConstructorFail()
      */
     public function testAddAlias()
     {
-        $resolver = new AliasPathStackResolver(array());
-
+        $resolver        = new AliasPathStackResolver(array());
         $reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
+        $addAlias        = $reflectionClass->getMethod('addAlias');
 
-        $addAlias = $reflectionClass->getMethod('addAlias');
         $addAlias->setAccessible(true);
 
         $property = $reflectionClass->getProperty('aliases');
+
         $property->setAccessible(true);
 
         $addAlias->invoke($resolver, 'alias', 'path');
 
         $this->assertEquals(
-            array('alias' => 'path'.DIRECTORY_SEPARATOR),
+            array('alias' => 'path' . DIRECTORY_SEPARATOR),
             $property->getValue($resolver)
         );
     }
@@ -79,11 +79,10 @@ public function testAddAlias()
      */
     public function testAddAliasFailsWithBadKey()
     {
-        $resolver = new AliasPathStackResolver(array());
-
+        $resolver        = new AliasPathStackResolver(array());
         $reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
+        $addAlias        = $reflectionClass->getMethod('addAlias');
 
-        $addAlias = $reflectionClass->getMethod('addAlias');
         $addAlias->setAccessible(true);
 
         $property = $reflectionClass->getProperty('aliases');
@@ -120,17 +119,16 @@ public function testAddAliasFailsWithBadPath()
      */
     public function testNormalizePath()
     {
-        $resolver = new AliasPathStackResolver(array());
-
+        $resolver        = new AliasPathStackResolver(array());
         $reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
+        $addAlias        = $reflectionClass->getMethod('normalizePath');
 
-        $addAlias = $reflectionClass->getMethod('normalizePath');
         $addAlias->setAccessible(true);
 
         $result = $addAlias->invoke($resolver, 'somePath\/\/\/');
 
         $this->assertEquals(
-            'somePath'.DIRECTORY_SEPARATOR,
+            'somePath' . DIRECTORY_SEPARATOR,
             $result
         );
     }
@@ -210,11 +208,11 @@ public function testResolve()
     {
         $resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
         $this->assertTrue($resolver instanceof AliasPathStackResolver);
-        $mimeResolver = new MimeResolver;
+        $mimeResolver = new MimeResolver();
         $resolver->setMimeResolver($mimeResolver);
-        $fileAsset = new Asset\FileAsset(__FILE__);
+        $fileAsset           = new Asset\FileAsset(__FILE__);
         $fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
-        $this->assertEquals($fileAsset, $resolver->resolve('my/alias/'.basename(__FILE__)));
+        $this->assertEquals($fileAsset, $resolver->resolve('my/alias/' . basename(__FILE__)));
         $this->assertNull($resolver->resolve('i-do-not-exist.php'));
     }
 
@@ -223,12 +221,12 @@ public function testResolve()
      */
     public function testResolveWhenAliasExistsInPath()
     {
-        $resolver = new AliasPathStackResolver(array('AliasPathStackResolverTest/' => __DIR__));
-        $mimeResolver = new MimeResolver;
+        $resolver     = new AliasPathStackResolver(array('AliasPathStackResolverTest/' => __DIR__));
+        $mimeResolver = new MimeResolver();
         $resolver->setMimeResolver($mimeResolver);
-        $fileAsset = new Asset\FileAsset(__FILE__);
+        $fileAsset           = new Asset\FileAsset(__FILE__);
         $fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
-        $this->assertEquals($fileAsset, $resolver->resolve('AliasPathStackResolverTest/'.basename(__FILE__)));
+        $this->assertEquals($fileAsset, $resolver->resolve('AliasPathStackResolverTest/' . basename(__FILE__)));
     }
 
     /**
@@ -239,7 +237,7 @@ public function testResolveWhenAliasExistsInPath()
     public function testWillNotResolveDirectories()
     {
         $resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__ . '/..'));
-        $this->assertNull($resolver->resolve('my/alias/'.basename(__DIR__)));
+        $this->assertNull($resolver->resolve('my/alias/' . basename(__DIR__)));
     }
 
     /**
@@ -249,8 +247,8 @@ public function testWillNotResolveDirectories()
      */
     public function testLfiProtection()
     {
-        $mimeResolver = new MimeResolver;
-        $resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
+        $mimeResolver = new MimeResolver();
+        $resolver     = new AliasPathStackResolver(array('my/alias/' => __DIR__));
         $resolver->setMimeResolver($mimeResolver);
 
         // should be on by default
@@ -277,7 +275,7 @@ public function testLfiProtection()
      */
     public function testCollect()
     {
-        $alias = 'my/alias/';
+        $alias    = 'my/alias/';
         $resolver = new AliasPathStackResolver(array($alias => __DIR__));
 
         $this->assertContains($alias . basename(__FILE__), $resolver->collect());
@@ -291,9 +289,9 @@ public function testCollect()
      */
     public function testCollectDirectory()
     {
-        $alias = 'my/alias/';
+        $alias    = 'my/alias/';
         $resolver = new AliasPathStackResolver(array($alias => realpath(__DIR__ . '/../')));
-        $dir = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
+        $dir      = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
 
         $this->assertContains($alias . $dir . DIRECTORY_SEPARATOR . basename(__FILE__), $resolver->collect());
         $this->assertNotContains($alias . $dir . DIRECTORY_SEPARATOR . 'i-do-not-exist.php', $resolver->collect());