Skip to content

Commit fed0e5c

Browse files
committed
Merge pull request #169 from ojhaujjwal/hotfix/159
Fix for #159
2 parents edb7b42 + 803a67e commit fed0e5c

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/AssetManager/Resolver/AliasPathStackResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function resolve($name)
142142
continue;
143143
}
144144

145-
$name = substr_replace($name, '', 0, strlen($alias) - 1);
145+
$name = substr_replace($name, '', 0, strlen($alias));
146146

147147
$file = new SplFileInfo($path . $name);
148148

tests/AssetManagerTest/Resolver/AliasPathStackResolverTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,21 @@ public function testResolve()
216216
$this->assertNull($resolver->resolve('i-do-not-exist.php'));
217217
}
218218

219+
/**
220+
* Test Resolve returns valid asset
221+
*
222+
* @covers \AssetManager\Resolver\AliasPathStackResolver::resolve
223+
*/
224+
public function testResolveWhenAliasStringDoesnotContainTrailingSlash()
225+
{
226+
$resolver = new AliasPathStackResolver(array('my/alias' => __DIR__));
227+
$mimeResolver = new MimeResolver();
228+
$resolver->setMimeResolver($mimeResolver);
229+
$fileAsset = new Asset\FileAsset(__FILE__);
230+
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
231+
$this->assertEquals($fileAsset, $resolver->resolve('my/alias/' . basename(__FILE__)));
232+
}
233+
219234
/**
220235
* @covers \AssetManager\Resolver\AliasPathStackResolver::resolve
221236
*/

0 commit comments

Comments
 (0)