From d0169013fdf96e66a2b83d967f72ad392bbeac01 Mon Sep 17 00:00:00 2001 From: Dmytro Kvashnin <dkvashnin@ebay.com> Date: Mon, 16 Mar 2015 15:23:45 +0200 Subject: [PATCH] MAGETWO-33631: Advanced Developer Workflow - fixed tests namespaces --- .../View/Asset/PreProcessor/DeveloperChainFactory.php | 4 +--- .../Model/VIew/Asset/PreProcessor/DeveloperChainTest.php | 3 ++- .../Test/Unit/ObjectManager/Environment/CompiledTest.php | 2 +- .../Framework/View/Asset/PreProcessor/ChainFactory.php | 4 +--- .../View/Asset/PreProcessor/ChainFactoryInterface.php | 1 + .../View/Test/Unit/Asset/PreProcessor/ChainTest.php | 4 +++- .../Framework/View/Test/Unit/Page/Config/RendererTest.php | 8 +++++--- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php index db849f8b825..ee0e0af6733 100644 --- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php +++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php @@ -47,9 +47,7 @@ class DeveloperChainFactory implements ChainFactoryInterface } /** - * Creates chain of pre-processors - * - * @return Chain + * {inheritdoc} */ public function create(array $arguments = []) { diff --git a/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php b/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php index dd4676153de..f16153904e6 100644 --- a/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php +++ b/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php @@ -3,9 +3,10 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Developer\Model\View\Asset\PreProcessor; +namespace Magento\Developer\Test\View\Model\View\Asset\PreProcessor; use Magento\Framework\View\Asset\LocalInterface; +use Magento\Developer\Model\View\Asset\PreProcessor\DeveloperChain; class DeveloperChainTest extends \PHPUnit_Framework_TestCase { diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php index bc3cc380ffb..33e19db9849 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Framework\App\ObjectManager\Environment; +namespace Magento\Framework\Test\Unit\App\ObjectManager\Environment; use Magento\Framework\App\Test\Unit\ObjectManager\Environment\CompiledTesting; diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php index 47c97497bed..6dda0dfb1fe 100644 --- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php +++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php @@ -26,9 +26,7 @@ class ChainFactory implements ChainFactoryInterface } /** - * Creates chain of pre-processors - * - * @return Chain + * {inheritdoc} */ public function create(array $arguments = []) { diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php index c094ee574d1..737fced8777 100644 --- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php +++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php @@ -10,6 +10,7 @@ interface ChainFactoryInterface /** * Creates chain of pre-processors * + * @param array $arguments * @return Chain */ public function create(array $arguments = []); diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php index ca2ad5bc4b9..4752d354bc3 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/ChainTest.php @@ -4,7 +4,9 @@ * See COPYING.txt for license details. */ -namespace Magento\Framework\View\Asset\PreProcessor; +namespace Magento\Framework\View\Test\Unit\Asset\PreProcessor; + +use Magento\Framework\View\Asset\PreProcessor\Chain; /** * Class ChainTest diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php index 773742f2eea..9d4cc9ffb80 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php @@ -4,9 +4,11 @@ * See COPYING.txt for license details. */ -namespace Magento\Framework\View\Page\Config; +namespace Magento\Framework\View\Test\Unit\Page\Config; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Framework\View\Asset\GroupedCollection; +use Magento\Framework\View\Page\Config\Renderer; /** * Test for page config renderer model @@ -70,7 +72,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase */ protected $titleMock; - /** @var ObjectManagerHelper */ + /** @var ObjectManager */ protected $objectManagerHelper; protected function setUp() @@ -116,7 +118,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); - $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);; + $this->objectManagerHelper = new ObjectManager($this);; $this->renderer = $this->objectManagerHelper->getObject( 'Magento\Framework\View\Page\Config\Renderer', [ -- GitLab