Skip to content

Commit 7b5deb9

Browse files
committed
CS fixes
1 parent 68043e5 commit 7b5deb9

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

tests/AssetManagerTest/Resolver/AliasPathStackResolverTest.php

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testConstructor()
2626
$resolver = new AliasPathStackResolver($aliases);
2727

2828
$reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
29-
$property = $reflectionClass->getProperty('aliases');
29+
$property = $reflectionClass->getProperty('aliases');
3030
$property->setAccessible(true);
3131

3232
$this->assertEquals(
@@ -53,20 +53,20 @@ public function testConstructorFail()
5353
*/
5454
public function testAddAlias()
5555
{
56-
$resolver = new AliasPathStackResolver(array());
57-
56+
$resolver = new AliasPathStackResolver(array());
5857
$reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
58+
$addAlias = $reflectionClass->getMethod('addAlias');
5959

60-
$addAlias = $reflectionClass->getMethod('addAlias');
6160
$addAlias->setAccessible(true);
6261

6362
$property = $reflectionClass->getProperty('aliases');
63+
6464
$property->setAccessible(true);
6565

6666
$addAlias->invoke($resolver, 'alias', 'path');
6767

6868
$this->assertEquals(
69-
array('alias' => 'path'.DIRECTORY_SEPARATOR),
69+
array('alias' => 'path' . DIRECTORY_SEPARATOR),
7070
$property->getValue($resolver)
7171
);
7272
}
@@ -79,11 +79,10 @@ public function testAddAlias()
7979
*/
8080
public function testAddAliasFailsWithBadKey()
8181
{
82-
$resolver = new AliasPathStackResolver(array());
83-
82+
$resolver = new AliasPathStackResolver(array());
8483
$reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
84+
$addAlias = $reflectionClass->getMethod('addAlias');
8585

86-
$addAlias = $reflectionClass->getMethod('addAlias');
8786
$addAlias->setAccessible(true);
8887

8988
$property = $reflectionClass->getProperty('aliases');
@@ -120,17 +119,16 @@ public function testAddAliasFailsWithBadPath()
120119
*/
121120
public function testNormalizePath()
122121
{
123-
$resolver = new AliasPathStackResolver(array());
124-
122+
$resolver = new AliasPathStackResolver(array());
125123
$reflectionClass = new \ReflectionClass('AssetManager\Resolver\AliasPathStackResolver');
124+
$addAlias = $reflectionClass->getMethod('normalizePath');
126125

127-
$addAlias = $reflectionClass->getMethod('normalizePath');
128126
$addAlias->setAccessible(true);
129127

130128
$result = $addAlias->invoke($resolver, 'somePath\/\/\/');
131129

132130
$this->assertEquals(
133-
'somePath'.DIRECTORY_SEPARATOR,
131+
'somePath' . DIRECTORY_SEPARATOR,
134132
$result
135133
);
136134
}
@@ -210,11 +208,11 @@ public function testResolve()
210208
{
211209
$resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
212210
$this->assertTrue($resolver instanceof AliasPathStackResolver);
213-
$mimeResolver = new MimeResolver;
211+
$mimeResolver = new MimeResolver();
214212
$resolver->setMimeResolver($mimeResolver);
215-
$fileAsset = new Asset\FileAsset(__FILE__);
213+
$fileAsset = new Asset\FileAsset(__FILE__);
216214
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
217-
$this->assertEquals($fileAsset, $resolver->resolve('my/alias/'.basename(__FILE__)));
215+
$this->assertEquals($fileAsset, $resolver->resolve('my/alias/' . basename(__FILE__)));
218216
$this->assertNull($resolver->resolve('i-do-not-exist.php'));
219217
}
220218

@@ -223,12 +221,12 @@ public function testResolve()
223221
*/
224222
public function testResolveWhenAliasExistsInPath()
225223
{
226-
$resolver = new AliasPathStackResolver(array('AliasPathStackResolverTest/' => __DIR__));
227-
$mimeResolver = new MimeResolver;
224+
$resolver = new AliasPathStackResolver(array('AliasPathStackResolverTest/' => __DIR__));
225+
$mimeResolver = new MimeResolver();
228226
$resolver->setMimeResolver($mimeResolver);
229-
$fileAsset = new Asset\FileAsset(__FILE__);
227+
$fileAsset = new Asset\FileAsset(__FILE__);
230228
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
231-
$this->assertEquals($fileAsset, $resolver->resolve('AliasPathStackResolverTest/'.basename(__FILE__)));
229+
$this->assertEquals($fileAsset, $resolver->resolve('AliasPathStackResolverTest/' . basename(__FILE__)));
232230
}
233231

234232
/**
@@ -239,7 +237,7 @@ public function testResolveWhenAliasExistsInPath()
239237
public function testWillNotResolveDirectories()
240238
{
241239
$resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__ . '/..'));
242-
$this->assertNull($resolver->resolve('my/alias/'.basename(__DIR__)));
240+
$this->assertNull($resolver->resolve('my/alias/' . basename(__DIR__)));
243241
}
244242

245243
/**
@@ -249,8 +247,8 @@ public function testWillNotResolveDirectories()
249247
*/
250248
public function testLfiProtection()
251249
{
252-
$mimeResolver = new MimeResolver;
253-
$resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
250+
$mimeResolver = new MimeResolver();
251+
$resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
254252
$resolver->setMimeResolver($mimeResolver);
255253

256254
// should be on by default
@@ -277,7 +275,7 @@ public function testLfiProtection()
277275
*/
278276
public function testCollect()
279277
{
280-
$alias = 'my/alias/';
278+
$alias = 'my/alias/';
281279
$resolver = new AliasPathStackResolver(array($alias => __DIR__));
282280

283281
$this->assertContains($alias . basename(__FILE__), $resolver->collect());
@@ -291,9 +289,9 @@ public function testCollect()
291289
*/
292290
public function testCollectDirectory()
293291
{
294-
$alias = 'my/alias/';
292+
$alias = 'my/alias/';
295293
$resolver = new AliasPathStackResolver(array($alias => realpath(__DIR__ . '/../')));
296-
$dir = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
294+
$dir = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
297295

298296
$this->assertContains($alias . $dir . DIRECTORY_SEPARATOR . basename(__FILE__), $resolver->collect());
299297
$this->assertNotContains($alias . $dir . DIRECTORY_SEPARATOR . 'i-do-not-exist.php', $resolver->collect());

0 commit comments

Comments
 (0)