From 8bb3208ab819bb414538245c334cd0e488784309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Fri, 7 Dec 2012 14:24:02 +0100 Subject: [PATCH] [Config] Loader::import must return imported data --- src/Symfony/Component/Config/Loader/Loader.php | 4 +++- .../Symfony/Tests/Component/Config/Loader/LoaderTest.php | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php index 125ec4e58c..6763f836c9 100644 --- a/src/Symfony/Component/Config/Loader/Loader.php +++ b/src/Symfony/Component/Config/Loader/Loader.php @@ -47,10 +47,12 @@ abstract class Loader implements LoaderInterface * * @param mixed $resource A Resource * @param string $type The resource type + * + * @return mixed */ public function import($resource, $type = null) { - $this->resolve($resource)->load($resource, $type); + return $this->resolve($resource)->load($resource, $type); } /** diff --git a/tests/Symfony/Tests/Component/Config/Loader/LoaderTest.php b/tests/Symfony/Tests/Component/Config/Loader/LoaderTest.php index cd2ace0095..cc997c0c4d 100644 --- a/tests/Symfony/Tests/Component/Config/Loader/LoaderTest.php +++ b/tests/Symfony/Tests/Component/Config/Loader/LoaderTest.php @@ -55,6 +55,15 @@ class LoaderTest extends \PHPUnit_Framework_TestCase $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderLoadException', $e, '->resolve() throws a FileLoaderLoadException if the resource cannot be loaded'); } } + + public function testImport() + { + $loader = $this->getMock('Symfony\Component\Config\Loader\Loader', array('supports', 'load')); + $loader->expects($this->once())->method('supports')->will($this->returnValue(true)); + $loader->expects($this->once())->method('load')->will($this->returnValue('yes')); + + $this->assertEquals('yes', $loader->import('foo')); + } } class ProjectLoader1 extends Loader