Permalink
Browse files

[HttpKernel] tweaked previous merge

  • Loading branch information...
1 parent 171aa1d commit 12b7073607cb413a1e4cf7ee9bc7180f09fe96f7 @fabpot fabpot committed Apr 7, 2013
@@ -34,7 +34,7 @@ class FileLocator extends BaseFileLocator
public function __construct(KernelInterface $kernel, $path = null, array $paths = array())
{
$this->kernel = $kernel;
- if(null !== $path) {
+ if (null !== $path) {
$this->path = $path;
$paths[] = $path;
}
@@ -12,35 +12,21 @@
namespace Symfony\Component\HttpKernel\Tests\Config;
use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\HttpKernel\KernelInterface;
class FileLocatorTest extends \PHPUnit_Framework_TestCase
{
-
- /** @var KernelInterface */
- private $kernel;
-
- public function setUp()
- {
- $this->kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
- }
-
- public function tearDown()
- {
- $this->kernel = null;
- }
-
public function testLocate()
{
- $this->kernel
+ $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel
->expects($this->atLeastOnce())
->method('locateResource')
->with('@BundleName/some/path', null, true)
->will($this->returnValue('/bundle-name/some/path'));
- $locator = new FileLocator($this->kernel);
+ $locator = new FileLocator($kernel);
$this->assertEquals('/bundle-name/some/path', $locator->locate('@BundleName/some/path'));
- $this->kernel
+ $kernel
->expects($this->never())
->method('locateResource');
$this->setExpectedException('LogicException');
@@ -49,13 +35,13 @@ public function testLocate()
public function testLocateWithGlobalResourcePath()
{
- $this->kernel
+ $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel
->expects($this->atLeastOnce())
->method('locateResource')
->with('@BundleName/some/path', '/global/resource/path', false);
- $locator = new FileLocator($this->kernel, '/global/resource/path');
+ $locator = new FileLocator($kernel, '/global/resource/path');
$locator->locate('@BundleName/some/path', null, false);
}
-
}

0 comments on commit 12b7073

Please sign in to comment.