Merge pull request #153 from ojhaujjwal/hotfix/152

fixes #152

Author: RWOverdijk

src/AssetManager/Resolver/AliasPathStackResolver.php

@@ -142,7 +142,7 @@ public function resolve($name)
                 continue;
             }
 
-            $name = str_replace($alias, '', $name);
+            $name = substr_replace($name, '', 0, strlen($alias) - 1);
 
             $file = new SplFileInfo($path . $name);
 

tests/AssetManagerTest/Resolver/AliasPathStackResolverTest.php

@@ -210,17 +210,27 @@ public function testResolve()
     {
         $resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
         $this->assertTrue($resolver instanceof AliasPathStackResolver);
-
         $mimeResolver = new MimeResolver;
         $resolver->setMimeResolver($mimeResolver);
-
         $fileAsset = new Asset\FileAsset(__FILE__);
         $fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
-
         $this->assertEquals($fileAsset, $resolver->resolve('my/alias/'.basename(__FILE__)));
         $this->assertNull($resolver->resolve('i-do-not-exist.php'));
     }
 
+    /**
+     * @covers \AssetManager\Resolver\AliasPathStackResolver::resolve
+     */
+    public function testResolveWhenAliasExistsInPath()
+    {
+        $resolver = new AliasPathStackResolver(array('AliasPathStackResolverTest/' => __DIR__));
+        $mimeResolver = new MimeResolver;
+        $resolver->setMimeResolver($mimeResolver);
+        $fileAsset = new Asset\FileAsset(__FILE__);
+        $fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
+        $this->assertEquals($fileAsset, $resolver->resolve('AliasPathStackResolverTest/'.basename(__FILE__)));
+    }
+
     /**
      * Test that resolver will not resolve directories
      *