Skip to content

Commit b068cde

Browse files
committed
fixed bug with AliasPathStackResolver when alias string exists in asset path
1 parent 865eebd commit b068cde

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
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 = str_replace($alias, '', $name);
145+
$name = substr_replace($name, '', 0, strlen($alias) - 1);
146146

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

tests/AssetManagerTest/Resolver/AliasPathStackResolverTest.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,19 @@ public function testGetAndSetOfLfiProtectionFlag()
208208
*/
209209
public function testResolve()
210210
{
211-
$resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
212-
$this->assertTrue($resolver instanceof AliasPathStackResolver);
213-
214211
$mimeResolver = new MimeResolver;
215-
$resolver->setMimeResolver($mimeResolver);
216212

217-
$fileAsset = new Asset\FileAsset(__FILE__);
218-
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
213+
foreach(['my/alias/', 'AliasPathStackResolverTest/'] as $alias) {
214+
$resolver = new AliasPathStackResolver(array($alias => __DIR__));
215+
$this->assertTrue($resolver instanceof AliasPathStackResolver);
216+
$resolver->setMimeResolver($mimeResolver);
217+
218+
$fileAsset = new Asset\FileAsset(__FILE__);
219+
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
219220

220-
$this->assertEquals($fileAsset, $resolver->resolve('my/alias/'.basename(__FILE__)));
221-
$this->assertNull($resolver->resolve('i-do-not-exist.php'));
221+
$this->assertEquals($fileAsset, $resolver->resolve($alias.basename(__FILE__)));
222+
$this->assertNull($resolver->resolve('i-do-not-exist.php'));
223+
}
222224
}
223225

224226
/**

0 commit comments

Comments
 (0)