diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php index d22315515a4bfe905027b0bb94bdd87b3aad44d3..22c524c3ff73bed9da6cb50dc87d00e1d5682c68 100644 --- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php +++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php @@ -38,7 +38,7 @@ class Website extends \Magento\Eav\Model\Entity\Attribute\Source\Table public function getAllOptions() { if (!$this->_options) { - $this->_options = $this->_store->getWebsiteValuesForForm(true, true); + $this->_options = $this->_store->getWebsiteValuesForForm(false, true); } return $this->_options; diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Factory.php b/app/code/Magento/Integration/Model/Oauth/Token/Factory.php deleted file mode 100644 index 0ef69a3d4e154bcb3b8144d48b1b8c696d85789b..0000000000000000000000000000000000000000 --- a/app/code/Magento/Integration/Model/Oauth/Token/Factory.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) - */ -namespace Magento\Integration\Model\Oauth\Token; - -/** - * Token builder factory - */ -class Factory -{ - /** - * @var \Magento\Framework\ObjectManagerInterface - */ - protected $_objectManager; - - /** - * @param \Magento\Framework\ObjectManagerInterface $objectManager - */ - public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager) - { - $this->_objectManager = $objectManager; - } - - /** - * Create token model. - * - * @param array $arguments - * @return \Magento\Integration\Model\Oauth\Token - */ - public function create($arguments = []) - { - return $this->_objectManager->create('Magento\Integration\Model\Oauth\Token', $arguments); - } -} diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php index e4a0d7134d7de936066f12849dc7fc472c58f2cd..54938d57a21c6c1fa203423baff6945dbf0bc763 100644 --- a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php +++ b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php @@ -17,7 +17,7 @@ class Provider implements TokenProviderInterface protected $_consumerFactory; /** - * @var \Magento\Integration\Model\Oauth\Token\Factory + * @var \Magento\Integration\Model\Oauth\TokenFactory */ protected $_tokenFactory; @@ -31,30 +31,22 @@ class Provider implements TokenProviderInterface */ protected $_date; - /** - * @var Token - */ - protected $token; - /** * @param \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory - * @param \Magento\Integration\Model\Oauth\Token\Factory $tokenFactory + * @param \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory * @param \Magento\Integration\Helper\Oauth\Data $dataHelper * @param \Magento\Framework\Stdlib\DateTime\DateTime $date - * @param Token $token */ public function __construct( \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory, - \Magento\Integration\Model\Oauth\Token\Factory $tokenFactory, + \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory, \Magento\Integration\Helper\Oauth\Data $dataHelper, - \Magento\Framework\Stdlib\DateTime\DateTime $date, - Token $token + \Magento\Framework\Stdlib\DateTime\DateTime $date ) { $this->_consumerFactory = $consumerFactory; $this->_tokenFactory = $tokenFactory; $this->_dataHelper = $dataHelper; $this->_date = $date; - $this->token = $token; } /** @@ -293,7 +285,9 @@ class Provider implements TokenProviderInterface */ public function getIntegrationTokenByConsumerId($consumerId) { - $token = $this->token->loadByConsumerIdAndUserType($consumerId, UserContextInterface::USER_TYPE_INTEGRATION); + /** @var \Magento\Integration\Model\Oauth\Token $token */ + $token = $this->_tokenFactory->create(); + $token->loadByConsumerIdAndUserType($consumerId, UserContextInterface::USER_TYPE_INTEGRATION); if (!$token->getId()) { throw new \Magento\Framework\Oauth\Exception( diff --git a/app/code/Magento/Integration/Service/V1/AdminTokenService.php b/app/code/Magento/Integration/Service/V1/AdminTokenService.php index 06d08c2995dbca6cd5bdc9f850ca6f92e6e3f62a..4629800f46fdefac551322ff5d8908abb1c059b1 100644 --- a/app/code/Magento/Integration/Service/V1/AdminTokenService.php +++ b/app/code/Magento/Integration/Service/V1/AdminTokenService.php @@ -9,7 +9,7 @@ use Magento\Framework\Exception\AuthenticationException; use Magento\Framework\Exception\LocalizedException; use Magento\Integration\Helper\Validator; use Magento\Integration\Model\Oauth\Token as Token; -use Magento\Integration\Model\Oauth\Token\Factory as TokenModelFactory; +use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory; use Magento\Integration\Model\Resource\Oauth\Token\CollectionFactory as TokenCollectionFactory; use Magento\User\Model\User as UserModel; diff --git a/app/code/Magento/Integration/Service/V1/CustomerTokenService.php b/app/code/Magento/Integration/Service/V1/CustomerTokenService.php index 6d1c08cefd3c65d46588bb2d4be485f7aa5c4392..d37e29101417ba0aa8d8138303dd9992a75eea6f 100644 --- a/app/code/Magento/Integration/Service/V1/CustomerTokenService.php +++ b/app/code/Magento/Integration/Service/V1/CustomerTokenService.php @@ -9,7 +9,7 @@ use Magento\Customer\Api\AccountManagementInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Integration\Helper\Validator; use Magento\Integration\Model\Oauth\Token as Token; -use Magento\Integration\Model\Oauth\Token\Factory as TokenModelFactory; +use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory; use Magento\Integration\Model\Resource\Oauth\Token\CollectionFactory as TokenCollectionFactory; class CustomerTokenService implements CustomerTokenServiceInterface diff --git a/app/code/Magento/Integration/Service/V1/Oauth.php b/app/code/Magento/Integration/Service/V1/Oauth.php index 85f72fca0d09b1fff68bb39966b48980e0a0057c..d4bbe6fd4cef27643a66be967088a10f252bb2df 100644 --- a/app/code/Magento/Integration/Service/V1/Oauth.php +++ b/app/code/Magento/Integration/Service/V1/Oauth.php @@ -9,7 +9,7 @@ use Magento\Integration\Helper\Oauth\Data as IntegrationOauthHelper; use Magento\Integration\Model\Oauth\Consumer as ConsumerModel; use Magento\Integration\Model\Oauth\Consumer\Factory as ConsumerFactory; use Magento\Integration\Model\Oauth\Token as OauthTokenModel; -use Magento\Integration\Model\Oauth\Token\Factory as TokenFactory; +use Magento\Integration\Model\Oauth\TokenFactory as TokenFactory; use Magento\Integration\Model\Oauth\Token\Provider as TokenProvider; /** diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php index 41a4916f5928b40190b4b25f864c5402ee1f36d0..20d37aecdcc94dbf2f66d7b2321a436afae74d29 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php @@ -39,7 +39,7 @@ class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax if ($section) { try { $path = 'tax/notification/ignore_' . $section; - $this->_objectManager->get('\Magento\Core\Model\Resource\Config') + $this->_objectManager->get('Magento\Core\Model\Resource\Config') ->saveConfig($path, 1, \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT, 0); } catch (\Exception $e) { $this->messageManager->addError($e->getMessage()); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php index 2fd4c02fffbb593a11905460e3e11f4128388e79..392d87a98f0b7c247fe198aee670b0aba8d2203e 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php @@ -18,7 +18,7 @@ class InvalidateToken extends \Magento\User\Controller\Adminhtml\User { if ($userId = $this->getRequest()->getParam('user_id')) { /** @var \Magento\Integration\Service\V1\AdminTokenService $tokenService */ - $tokenService = $this->_objectManager->get('\Magento\Integration\Service\V1\AdminTokenService'); + $tokenService = $this->_objectManager->get('Magento\Integration\Service\V1\AdminTokenService'); try { $tokenService->revokeAdminAccessToken($userId); $this->messageManager->addSuccess(__('You have revoked the user\'s tokens.')); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role.php b/app/code/Magento/User/Controller/Adminhtml/User/Role.php index dcd17cc7111e835448d3072679f108862c4e90e0..0cf36ec618e91ae844de3324b98e0ac1697f821e 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role.php @@ -43,6 +43,11 @@ class Role extends \Magento\Backend\App\AbstractAction */ protected $_authSession; + /** + * @var \Magento\Framework\Filter\FilterManager + */ + protected $_filterManager; + /** * @param \Magento\Backend\App\Action\Context $context * @param \Magento\Framework\Registry $coreRegistry @@ -50,6 +55,7 @@ class Role extends \Magento\Backend\App\AbstractAction * @param \Magento\User\Model\UserFactory $userFactory * @param \Magento\Authorization\Model\RulesFactory $rulesFactory * @param \Magento\Backend\Model\Auth\Session $authSession + * @param \Magento\Framework\Filter\FilterManager $filterManager */ public function __construct( \Magento\Backend\App\Action\Context $context, @@ -57,7 +63,8 @@ class Role extends \Magento\Backend\App\AbstractAction \Magento\Authorization\Model\RoleFactory $roleFactory, \Magento\User\Model\UserFactory $userFactory, \Magento\Authorization\Model\RulesFactory $rulesFactory, - \Magento\Backend\Model\Auth\Session $authSession + \Magento\Backend\Model\Auth\Session $authSession, + \Magento\Framework\Filter\FilterManager $filterManager ) { parent::__construct($context); $this->_coreRegistry = $coreRegistry; @@ -65,6 +72,7 @@ class Role extends \Magento\Backend\App\AbstractAction $this->_userFactory = $userFactory; $this->_rulesFactory = $rulesFactory; $this->_authSession = $authSession; + $this->_filterManager = $filterManager; } /** diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php index 773e39cebef90c872270fe2e6c9763a89ec8bf8e..7041aab2fa6b6f162f95d81fc4ad90bf76455a71 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php @@ -78,7 +78,7 @@ class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role } try { - $roleName = $this->getRequest()->getParam('rolename', false); + $roleName = $this->_filterManager->removeTags($this->getRequest()->getParam('rolename', false)); $role->setName($roleName) ->setPid($this->getRequest()->getParam('parent_id', false)) diff --git a/app/code/Magento/Webapi/Model/Config/ClassReflector.php b/app/code/Magento/Webapi/Model/Config/ClassReflector.php index 51878ad2d0940a8b991908c5e79457ee20a84972..e734ff1ef40ca4bc098f03d9525be3fad63f6cd8 100644 --- a/app/code/Magento/Webapi/Model/Config/ClassReflector.php +++ b/app/code/Magento/Webapi/Model/Config/ClassReflector.php @@ -6,6 +6,7 @@ namespace Magento\Webapi\Model\Config; use Zend\Server\Reflection; use Zend\Server\Reflection\ReflectionMethod; +use Zend\Code\Reflection\MethodReflection; /** * Class reflector. @@ -84,7 +85,7 @@ class ClassReflector */ public function extractMethodData(ReflectionMethod $method) { - $methodData = ['documentation' => $method->getDescription(), 'interface' => []]; + $methodData = ['documentation' => $this->extractMethodDescription($method), 'interface' => []]; $prototypes = $method->getPrototypes(); /** Take the fullest interface that also includes optional parameters. */ /** @var \Zend\Server\Reflection\Prototype $prototype */ @@ -111,4 +112,22 @@ class ClassReflector return $methodData; } + + /** + * Retrieve method full documentation description. + * + * @param ReflectionMethod $method + * @return string + */ + protected function extractMethodDescription(ReflectionMethod $method) + { + $methodReflection = new MethodReflection( + $method->getDeclaringClass()->getName(), + $method->getName() + ); + + $docBlock = $methodReflection->getDocBlock(); + + return $this->_typeProcessor->getDescription($docBlock); + } } diff --git a/dev/tests/functional/lib/Mtf/App/State/AbstractState.php b/dev/tests/functional/lib/Mtf/App/State/AbstractState.php index f83a0102f950401ce9618f91b5e9c20c52d3a8c7..dacaadb572424a58b489b9a550657796e073bf5c 100644 --- a/dev/tests/functional/lib/Mtf/App/State/AbstractState.php +++ b/dev/tests/functional/lib/Mtf/App/State/AbstractState.php @@ -38,7 +38,7 @@ abstract class AbstractState implements StateInterface */ public function clearInstance() { - $dirList = \Mtf\ObjectManagerFactory::getObjectManager()->get('\Magento\Framework\Filesystem\DirectoryList'); + $dirList = \Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList'); $deploymentConfig = new \Magento\Framework\App\DeploymentConfig( new \Magento\Framework\App\DeploymentConfig\Reader($dirList), [] diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php index 6effc32b6bfd9d4a0a7616dcf35a5429bfe9819f..17773f76ef7bce33e6e51a1de7326a9d9fb057ad 100644 --- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php +++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php @@ -26,7 +26,7 @@ class StoreTest extends Functional public function testCreateNewLocalizedStoreView() { $objectManager = Factory::getObjectManager(); - $storeFixture = $objectManager->create('\Magento\Store\Test\Fixture\Store', ['dataSet' => 'german']); + $storeFixture = $objectManager->create('Magento\Store\Test\Fixture\Store', ['dataSet' => 'german']); $storeListPage = Factory::getPageFactory()->getAdminSystemStore(); $storeListPage->open(); diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php index 0dc49a4adda17fd50ff6466b118e2a72246d8517..8bb7c9f9fdf0a7bcc6a0716a7d82e3209b0bedf5 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php @@ -179,7 +179,7 @@ abstract class AbstractAssertTaxWithCrossBorderApplying extends AbstractConstrai protected function loginCustomer($customer) { $this->objectManager->create( - '\Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', ['customer' => $customer] )->run(); } diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php index a3673f47e29a83f08cf5666adb50ef8cb71ced21..8f6c77c43c62ae4de32f25730078a6fdbce14cbe 100644 --- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php +++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php @@ -27,7 +27,7 @@ class TaxRuleTest extends Functional { //Data $objectManager = Factory::getObjectManager(); - $fixture = $objectManager->create('\Magento\Tax\Test\Fixture\TaxRule', ['dataSet' => 'us_ca_ny_rule']); + $fixture = $objectManager->create('Magento\Tax\Test\Fixture\TaxRule', ['dataSet' => 'us_ca_ny_rule']); //Pages $taxGridPage = Factory::getPageFactory()->getTaxRuleIndex(); $newTaxRulePage = Factory::getPageFactory()->getTaxRuleNew(); diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php index 9a51c6c64c063a8113ea490105deecc0750f98d0..9706eb58e3354c69e5c8f19afc7cc5d7b9de3735 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php @@ -133,7 +133,7 @@ abstract class AbstractConfigFiles extends \PHPUnit_Framework_TestCase $directory = $objectManager->get('Magento\Framework\Filesystem') ->getDirectoryRead(DirectoryList::MODULES); - return $objectManager->get('\Magento\Framework\Config\FileIteratorFactory') + return $objectManager->get('Magento\Framework\Config\FileIteratorFactory') ->create($directory, $directory->search($this->_getConfigFilePathGlob())); } diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/GridTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/GridTest.php index 2accd8b009eba2c53e8d4ce9eddbe28ec1a61f3e..76152ca7b91c29573c2612dccec38f5de48846fb 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/GridTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/GridTest.php @@ -106,7 +106,7 @@ class GridTest extends \PHPUnit_Framework_TestCase 'Magento\Framework\View\Element\Template\Context', [ 'filesystem' => $objectManager->create( - '\Magento\Framework\Filesystem', + 'Magento\Framework\Filesystem', ['directoryList' => $directoryList] ) ] diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php index c0d6f56d0a91d3596bf252670450bb7a6b27a7cb..9583306450bf923d3b8fbdab930429cc15ad58d2 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php @@ -80,7 +80,7 @@ class AuthTest extends \PHPUnit_Framework_TestCase \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD ); $this->assertNotEmpty($this->_model->getAuthStorage()->getData()); - $cookie = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('\Magento\Framework\Stdlib\Cookie'); + $cookie = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Stdlib\Cookie'); $cookie->set($this->_model->getAuthStorage()->getName(), 'session_id'); $this->_model->logout(); $this->assertEmpty($this->_model->getAuthStorage()->getData()); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php index c12895d67ecc6ec8faed0455264f885ea3f655c3..9cc35b8ea03aee464ef9048b41847cc0c263c2ef 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php @@ -22,7 +22,7 @@ class NewTest extends \PHPUnit_Framework_TestCase * @var \Magento\Customer\Api\GroupManagementInterface $groupManagement */ $groupManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get('\Magento\Customer\Api\GroupManagementInterface'); + ->get('Magento\Customer\Api\GroupManagementInterface'); $notLoggedInId = $groupManagement->getNotLoggedInGroup()->getId(); \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/FlatTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/FlatTest.php index 410c81020ce82cc6df11f1698b9152c6977a7e7e..948a96da436a9f1f755baf7d1a40d5e80707bff0 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/FlatTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/FlatTest.php @@ -22,7 +22,7 @@ class FlatTest extends \PHPUnit_Framework_TestCase 'Magento\Catalog\Helper\Product\Flat\Indexer' ); $this->_state = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\Indexer\Product\Flat\State' + 'Magento\Catalog\Model\Indexer\Product\Flat\State' ); } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php index c0e46ec17ba07dcc8d4322a73485808e26cd9218..73e8cfc246098baef4b16b509b085b8dffe969cf 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php @@ -38,11 +38,11 @@ class FullTest extends \PHPUnit_Framework_TestCase $this->_processor->reindexAll(); $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */ $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $category = $categoryFactory->create()->load(2); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowTest.php index cf8a2af24f0f57dbe4cd918399efae276213e268..9b2f7a5ff760e4833015fd1cf70dc11ecadbb8d7 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowTest.php @@ -33,11 +33,11 @@ class RowTest extends \PHPUnit_Framework_TestCase $product->save(); $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */ $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $category = $categoryFactory->create()->load(2); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowsTest.php index ebddf8185232d9935019050f7c18d86458027a2b..d6e7a0c6e247a84db9c6daea77a75478e27b2dd7 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowsTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowsTest.php @@ -42,11 +42,11 @@ class RowsTest extends \PHPUnit_Framework_TestCase ); $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */ $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $category = $categoryFactory->create()->load(2); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/FullTest.php index 91b50ef48503d9468716175f14e953ec9c99b38e..679611aa5ec2ee56c650ed30573b7326cf43574e 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/FullTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/FullTest.php @@ -31,10 +31,10 @@ class FullTest extends \PHPUnit_Framework_TestCase $this->_processor->reindexAll(); $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $category = $categoryFactory->create()->load(2); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowTest.php index 6fc0d65ccb008c32ac1afeb94a1ab996b845c98c..05e8cc116fb64b8a856d56bd96c71314cadda01e 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowTest.php @@ -37,10 +37,10 @@ class RowTest extends \PHPUnit_Framework_TestCase public function testProductUpdate() { $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $this->_processor->getIndexer()->setScheduled(false); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowsTest.php index 85a40e054b255178c210767b94d1202e12285c77..949334c2aabba312a5f779da8c6f5903c4233f92 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowsTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowsTest.php @@ -41,10 +41,10 @@ class RowsTest extends \PHPUnit_Framework_TestCase $this->_processor->reindexList([$this->_product->getId()]); $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $category = $categoryFactory->create()->load(9); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php index c98c982ae7d3313943f48c44595fe0df928a6306..4d0272067cc3b42475b641d41512d8097c2a96e1 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php @@ -24,7 +24,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase ); $category->load(4); $layer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get('\Magento\Catalog\Model\Layer\Category'); + ->get('Magento\Catalog\Model\Layer\Category'); $layer->setCurrentCategory($category); $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() ->create('Magento\Catalog\Model\Layer\Filter\DataProvider\Price', ['layer' => $layer]); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php index e1ff64c14b70198cdd71e00a8ccbde10d01410b9..5161866043959227fb72f7e14005fcc71e880f7d 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php @@ -28,12 +28,12 @@ class PriceTest extends \PHPUnit_Framework_TestCase ); $category->load(4); $layer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get('\Magento\Catalog\Model\Layer\Category'); + ->get('Magento\Catalog\Model\Layer\Category'); $layer->setCurrentCategory($category); $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() ->create('Magento\Catalog\Model\Layer\Filter\Price', ['layer' => $layer]); $this->groupManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get('\Magento\Customer\Api\GroupManagementInterface'); + ->get('Magento\Customer\Api\GroupManagementInterface'); } public function testApplyNothing() diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php index f95746c869f4a393cd17321205ffc11620c09548..06ee8df098b93ff260e7f6c3b85ba62d5ed6229a 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php @@ -28,7 +28,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase public function testAddLinkAttributeToFilterWithResults() { $om = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $link = $om->get('\Magento\Catalog\Model\Product\Link')->useCrossSellLinks(); + $link = $om->get('Magento\Catalog\Model\Product\Link')->useCrossSellLinks(); $this->collection->setLinkModel($link); $this->collection->addLinkAttributeToFilter('position', ['from' => 0, 'to' => 2]); $product = $om->get('Magento\Catalog\Model\Product')->load(2); @@ -47,7 +47,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase public function testAddLinkAttributeToFilterNoResults() { $om = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $link = $om->get('\Magento\Catalog\Model\Product\Link')->useCrossSellLinks(); + $link = $om->get('Magento\Catalog\Model\Product\Link')->useCrossSellLinks(); $this->collection->setLinkModel($link); $this->collection->addLinkAttributeToFilter('position', ['from' => 2, 'to' => 3]); $product = $om->get('Magento\Catalog\Model\Product')->load(2); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php index 38116e3a2ab0ae3c5eb9163bfeeeeb91ae73732a..c0b5b823179667f0ab7666a9a4877a078a68ac8e 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php @@ -101,7 +101,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase $title = $options[0]['values'][0]['title']; $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Model\Product' + 'Magento\Catalog\Model\Product' ); $product->load($productId); $product->setStoreIds([$storeId]); @@ -152,7 +152,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase $price = $options[0]['values'][0]['price']; $priceType = $options[0]['values'][0]['price_type']; $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Model\Product' + 'Magento\Catalog\Model\Product' ); $product->load($productId); $product->setStoreIds([$storeId]); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute.php index 7b1ac48421d9f50fb4dee713cef1acb8f4540150..bdd5d6924e97b4e6b52af44901edcd19c299a42c 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute.php @@ -7,10 +7,10 @@ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */ -$attributeSet = $objectManager->create('\Magento\Eav\Model\Entity\Attribute\Set'); +$attributeSet = $objectManager->create('Magento\Eav\Model\Entity\Attribute\Set'); $entityType = $objectManager->create('Magento\Eav\Model\Entity\Type')->loadByCode('catalog_product'); -$defaultSetId = $objectManager->create('\Magento\Catalog\Model\Product')->getDefaultAttributeSetid(); +$defaultSetId = $objectManager->create('Magento\Catalog\Model\Product')->getDefaultAttributeSetid(); $data = [ 'attribute_set_name' => 'attribute_set_with_media_attribute', @@ -37,6 +37,6 @@ $attributeData = [ ]; /** @var \Magento\Catalog\Model\Entity\Attribute $attribute */ -$attribute = $objectManager->create('\Magento\Catalog\Model\Entity\Attribute'); +$attribute = $objectManager->create('Magento\Catalog\Model\Entity\Attribute'); $attribute->setData($attributeData); $attribute->save(); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php index 645c78057865fd93f8e60478f783314870a7d321..117e9c4d0dace7107330a8fca8d16bdcfe31cc9d 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php @@ -11,7 +11,7 @@ $entityType = $objectManager->create('Magento\Eav\Model\Entity\Type')->loadByCod // remove attribute /** @var \Magento\Catalog\Model\Resource\Product\Attribute\Collection $attributeCollection */ -$attributeCollection = $objectManager->create('\Magento\Catalog\Model\Resource\Product\Attribute\Collection'); +$attributeCollection = $objectManager->create('Magento\Catalog\Model\Resource\Product\Attribute\Collection'); $attributeCollection->setFrontendInputTypeFilter('media_image'); $attributeCollection->setCodeFilter('funny_image'); $attributeCollection->setEntityTypeFilter($entityType->getId()); @@ -23,7 +23,7 @@ $attribute->delete(); // remove attribute set /** @var \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attributeSetCollection */ -$attributeSetCollection = $objectManager->create('\Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection'); +$attributeSetCollection = $objectManager->create('Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection'); $attributeSetCollection->addFilter('attribute_set_name', 'attribute_set_with_media_attribute'); $attributeSetCollection->addFilter('entity_type_id', $entityType->getId()); $attributeSetCollection->setOrder('attribute_set_id'); // descending is default value diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group.php index 28966589455c87fdca93df327a7e5c194b8df6f3..7a94a52af2d06db391162f3be7048438f4263655 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group.php @@ -4,7 +4,7 @@ */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */ -$attributeGroup = $objectManager->create('\Magento\Eav\Model\Entity\Attribute\Group'); +$attributeGroup = $objectManager->create('Magento\Eav\Model\Entity\Attribute\Group'); $entityTypeId = $objectManager->create('Magento\Eav\Model\Entity\Type')->loadByCode('catalog_product')->getId(); $attributeGroup->setData([ 'attribute_group_name' => 'empty_attribute_group', diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group_rollback.php index 2fd90f66832e3def02413727d3b8f4b8e3d1f8c7..64a41828d2d27f543dac8a8418d8b6de373ce058 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/empty_attribute_group_rollback.php @@ -4,13 +4,13 @@ */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\Eav\Model\Entity\Attribute\Group $attributeSet */ -$attributeGroup = $objectManager->create('\Magento\Eav\Model\Entity\Attribute\Group') +$attributeGroup = $objectManager->create('Magento\Eav\Model\Entity\Attribute\Group') ->load('empty_attribute_group', 'attribute_group_name'); if ($attributeGroup->getId()) { $attributeGroup->delete(); } -$attributeGroupUpdated = $objectManager->create('\Magento\Eav\Model\Entity\Attribute\Group') +$attributeGroupUpdated = $objectManager->create('Magento\Eav\Model\Entity\Attribute\Group') ->load('empty_attribute_group_updated', 'attribute_group_name'); if ($attributeGroupUpdated->getId()) { $attributeGroupUpdated->delete(); diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Config/Backend/ManagestockTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Config/Backend/ManagestockTest.php index f4143ddb9cdc23fadba85c1554da9fe90957cbdb..2c475a9f3e57f1852cab72c46af88a44d7512769 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Config/Backend/ManagestockTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Config/Backend/ManagestockTest.php @@ -50,9 +50,9 @@ class ManagestockTest extends \PHPUnit_Framework_TestCase ->method('rebuild'); $manageStock = new Managestock( - Bootstrap::getObjectManager()->get('\Magento\Framework\Model\Context'), - Bootstrap::getObjectManager()->get('\Magento\Framework\Registry'), - Bootstrap::getObjectManager()->get('\Magento\Framework\App\Config\ScopeConfigInterface'), + Bootstrap::getObjectManager()->get('Magento\Framework\Model\Context'), + Bootstrap::getObjectManager()->get('Magento\Framework\Registry'), + Bootstrap::getObjectManager()->get('Magento\Framework\App\Config\ScopeConfigInterface'), $stockManagement, Bootstrap::getObjectManager()->get('Magento\CatalogInventory\Model\Indexer\Stock\Processor'), Bootstrap::getObjectManager()->get('Magento\Core\Model\Resource\Config') diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php index d4fd95a045306371131a8fa2c14847a711022dbb..89cf2b837cf4a8973ae0aced19ccb120eac9e362 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php @@ -31,11 +31,11 @@ class FullTest extends \PHPUnit_Framework_TestCase $this->_processor->reindexAll(); $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */ $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); $category = $categoryFactory->create()->load(2); diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowTest.php index 026b38f891041cf4bb815a3c868c2a6a9ad72274..473cc73fee4d6c7409706f2043e8bea4f8763b7e 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowTest.php @@ -27,16 +27,16 @@ class RowTest extends \PHPUnit_Framework_TestCase public function testProductUpdate() { $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */ $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); /** @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceBuilder $stockItemBuilder */ $stockItemBuilder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\CatalogInventory\Api\Data\StockItemInterfaceBuilder' + 'Magento\CatalogInventory\Api\Data\StockItemInterfaceBuilder' ); /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */ @@ -45,7 +45,7 @@ class RowTest extends \PHPUnit_Framework_TestCase ); /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */ $stockItemRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\CatalogInventory\Api\StockItemRepositoryInterface' + 'Magento\CatalogInventory\Api\StockItemRepositoryInterface' ); $this->_processor->getIndexer()->setScheduled(false); diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowsTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowsTest.php index 2d018b6e00c657bd2eb15e67157b569f741e1a8c..402488cac91b714ef99fb7f9d8c3f2ca683c5395 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowsTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowsTest.php @@ -27,16 +27,16 @@ class RowsTest extends \PHPUnit_Framework_TestCase public function testProductUpdate() { $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Model\CategoryFactory' + 'Magento\Catalog\Model\CategoryFactory' ); /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */ $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Catalog\Block\Product\ListProduct' + 'Magento\Catalog\Block\Product\ListProduct' ); /** @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceBuilder $stockRegistry */ $stockItemBuilder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\CatalogInventory\Api\Data\StockItemInterfaceBuilder' + 'Magento\CatalogInventory\Api\Data\StockItemInterfaceBuilder' ); /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */ @@ -45,12 +45,12 @@ class RowsTest extends \PHPUnit_Framework_TestCase ); /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */ $stockItemRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\CatalogInventory\Api\StockItemRepositoryInterface' + 'Magento\CatalogInventory\Api\StockItemRepositoryInterface' ); /** @var \Magento\CatalogInventory\Model\Resource\Stock\Item $stockItemResource */ $stockItemResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\CatalogInventory\Model\Resource\Stock\Item' + 'Magento\CatalogInventory\Model\Resource\Stock\Item' ); $stockItem = $stockRegistry->getStockItem(1, 1); diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/Advanced/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/Advanced/ResultTest.php index 7148428c9ac5b174c800ed792c38c134c8969413..f0e200b636270559be01bac431d474508a88217f 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/Advanced/ResultTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/Advanced/ResultTest.php @@ -48,7 +48,7 @@ class ResultTest extends \PHPUnit_Framework_TestCase $category->setId(100500); // Any id - just for layer navigation /** @var \Magento\Catalog\Model\Layer\Resolver $resolver */ $resolver = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get('\Magento\Catalog\Model\Layer\Resolver'); + ->get('Magento\Catalog\Model\Layer\Resolver'); $resolver->get()->setCurrentCategory($category); $childBlock = $this->_layout->addBlock('Magento\Framework\View\Element\Text', 'search_result_list', 'block'); diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php index ae968cbb819555950238a6375828c0cef1b9d2f9..00ab87d893695e65f7425ae0a78eeb7b28182e33 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Helper/DataTest.php @@ -16,7 +16,7 @@ class DataTest extends \PHPUnit_Framework_TestCase /** @var \Magento\TestFramework\ObjectManager $objectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\Framework\App\Request\Http $request */ - $request = $objectManager->get('\Magento\Framework\App\RequestInterface'); + $request = $objectManager->get('Magento\Framework\App\RequestInterface'); $request->setParam('q', 'five <words> here <being> tested'); $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( 'Magento\CatalogSearch\Helper\Data' diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php index 2537014e94b418b5388d5fb19f142309839c0bf3..4fbd3a84f093b21e040ebd6736b826b56c5326be 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php @@ -23,7 +23,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase ); $category->load(4); $layer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get('\Magento\Catalog\Model\Layer\Category'); + ->get('Magento\Catalog\Model\Layer\Category'); $layer->setCurrentCategory($category); $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() ->create('Magento\CatalogSearch\Model\Layer\Filter\Price', ['layer' => $layer]); diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/CatalogTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/CatalogTest.php index b55a860c1f788ab68525a4d724d124d523dda3d0..0f0b6b748cc014c79aabf5998ea164b338824328 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/CatalogTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/CatalogTest.php @@ -16,7 +16,7 @@ class CatalogTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->catalogSearch = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('\Magento\CatalogSearch\Model\Search\Catalog'); + ->create('Magento\CatalogSearch\Model\Search\Catalog'); } /** diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Block/Onepage/BillingTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Block/Onepage/BillingTest.php index b97f1d0667c0bb66c79a521c5bb9a04ffa92361d..ec857c1bde0ad41df2009a297c1d77c5ec7ca63f 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Block/Onepage/BillingTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Block/Onepage/BillingTest.php @@ -43,7 +43,7 @@ class BillingTest extends \PHPUnit_Framework_TestCase $this->_customerRepository = $objectManager->create('Magento\Customer\Api\CustomerRepositoryInterface'); $customer = $this->_customerRepository->getById(self::FIXTURE_CUSTOMER_ID); - $customerSession = $objectManager->get('\Magento\Customer\Model\Session'); + $customerSession = $objectManager->get('Magento\Customer\Model\Session'); $customerSession->setCustomerData($customer); $this->_addressRepository = $objectManager->get('Magento\Customer\Api\AddressRepositoryInterface'); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php index cde2a86b1051878650b5b2c3b2b63152d80ed014..228ed3b174f8c98dd85c19691a1f481d76c1c44e 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php @@ -56,7 +56,7 @@ class OnepageTest extends \Magento\TestFramework\TestCase\AbstractController public function testSaveOrderActionWithFormKey() { - $formKey = $this->_objectManager->get('\Magento\Framework\Data\Form\FormKey'); + $formKey = $this->_objectManager->get('Magento\Framework\Data\Form\FormKey'); $this->getRequest()->setParam('form_key', $formKey->getFormKey()); $this->dispatch('checkout/onepage/saveOrder'); $html = $this->getResponse()->getBody(); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved_rollback.php index 72299fe0f47474366f34b5ba1db0370c3942c0b0..de7d649c73c233bee7db2cf25e3acb67ac2f3070 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved_rollback.php @@ -7,5 +7,5 @@ /** @var $objectManager \Magento\TestFramework\ObjectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$quote = $objectManager->create('\Magento\Sales\Model\Quote'); +$quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_1', 'reserved_order_id')->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_coupon_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_coupon_saved_rollback.php index 3ab5c1e99b403d7c523867f25cd4dced0e3eca2c..1cd90ff860e2abbd19f261bf7883e55e96d99a6a 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_coupon_saved_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_coupon_saved_rollback.php @@ -7,5 +7,5 @@ /** @var $objectManager \Magento\TestFramework\ObjectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$quote = $objectManager->create('\Magento\Sales\Model\Quote'); +$quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_1', 'reserved_order_id')->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_payment_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_payment_saved_rollback.php index 86ddf3132a32b3e55d89cd2c8bf3549484ac9ab3..9e17789926a3f509c67e2db060f3633a35c62751 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_payment_saved_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_payment_saved_rollback.php @@ -7,5 +7,5 @@ /** @var $objectManager \Magento\TestFramework\ObjectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$quote = $objectManager->create('\Magento\Sales\Model\Quote'); +$quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_1_with_payment', 'reserved_order_id')->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php index 89f9c1904bc743b3b892a66cf8dc4db2b17d2c5b..b10d221b9c7e799dae4a3ed894a9da5800890ca1 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php @@ -7,5 +7,5 @@ /** @var $objectManager \Magento\TestFramework\ObjectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$quote = $objectManager->create('\Magento\Sales\Model\Quote'); +$quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_with_simple_product_without_address', 'reserved_order_id')->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php index 23b3ce94d602a0ef772dbee44e3e301035a5e7a0..4a8529c87fb9a41af9448d3af46002bb21fdf0ad 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php @@ -6,5 +6,5 @@ */ /** @var $objectManager \Magento\TestFramework\ObjectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$quote = $objectManager->create('\Magento\Sales\Model\Quote'); +$quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_with_virtual_product', 'reserved_order_id')->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php index 4b569f046133f9acdfad33e118ca7fe5d1d7dc35..95e6b8af75f29ee3c46e00be0c953df9dfd89be2 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php @@ -7,5 +7,5 @@ /** @var $objectManager \Magento\TestFramework\ObjectManager */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$quote = $objectManager->create('\Magento\Sales\Model\Quote'); +$quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_with_virtual_product_without_address', 'reserved_order_id')->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php index 4f7d447b7b0abdde9db34230770bcba9fc272d4c..ec1aeb73a48a05d8de1890026f8fbb14f6dde9a2 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php @@ -34,7 +34,7 @@ class AddressRepositoryTest extends \PHPUnit_Framework_TestCase $this->repository = $this->_objectManager->create('Magento\Customer\Api\AddressRepositoryInterface'); $this->_addressBuilder = $this->_objectManager->create('Magento\Customer\Api\Data\AddressDataBuilder'); - $builder = $this->_objectManager->create('\Magento\Customer\Api\Data\RegionDataBuilder'); + $builder = $this->_objectManager->create('Magento\Customer\Api\Data\RegionDataBuilder'); $region = $builder ->setRegionCode('AL') ->setRegion('Alabama') diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/EditTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/EditTest.php index 9ce8d04c04a8c70b53ba787a74cfca2c763c140f..5f75bfa8f19552cd205d7e814dbeaff607593662 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/EditTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/EditTest.php @@ -25,7 +25,7 @@ class EditTest extends \PHPUnit_Framework_TestCase { $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $this->_customerSession = $objectManager->get('\Magento\Customer\Model\Session'); + $this->_customerSession = $objectManager->get('Magento\Customer\Model\Session'); $this->_customerSession->setCustomerId(1); $this->_context = $objectManager->get('Magento\Backend\Block\Template\Context'); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php index 910039c9d8b17cc4867de7f8eaf29b0dd952df87..c66adba030c3cc9448f3edcbf4d19c924c093c4e 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php @@ -167,7 +167,7 @@ class AccountTest extends \PHPUnit_Framework_TestCase public function testNewCustomer() { /** @var \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder */ - $customerBuilder = $this->objectManager->get('\Magento\Customer\Api\Data\CustomerDataBuilder'); + $customerBuilder = $this->objectManager->get('Magento\Customer\Api\Data\CustomerDataBuilder'); $customerData = $this->dataObjectProcessor ->buildOutputDataArray($customerBuilder->create(), '\Magento\Customer\Api\Data\CustomerInterface'); $this->backendSession->setCustomerData( diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php index 8f771f5dfd6cd867840e22c5f900e7e458ca803c..e67b270c5698dcb99f0578edbc7dda2533bf7526 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php @@ -65,7 +65,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase $this->_dataObjectProcessor = $this->_objectManager->get('Magento\Framework\Reflection\DataObjectProcessor'); $this->_groupRepository = $this->_objectManager->get('Magento\Customer\Api\GroupRepositoryInterface'); - $this->dateTime = $this->_objectManager->get('\Magento\Framework\Stdlib\DateTime'); + $this->dateTime = $this->_objectManager->get('Magento\Framework\Stdlib\DateTime'); $this->_block = $this->_objectManager->get( 'Magento\Framework\View\LayoutInterface' diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/EditTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/EditTest.php index f0ab8217eb8812a2bdcfe7849c5230d55d7fe27a..9fe6f349d506734e09c6f17dc5e899c153dcd106 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/EditTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Group/EditTest.php @@ -80,7 +80,7 @@ class EditTest extends AbstractController */ public function testDeleteButtonExistInCustomGroup() { - $builder = Bootstrap::getObjectManager()->create('\Magento\Framework\Api\FilterBuilder'); + $builder = Bootstrap::getObjectManager()->create('Magento\Framework\Api\FilterBuilder'); /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteria */ $searchCriteria = Bootstrap::getObjectManager() ->create('Magento\Framework\Api\SearchCriteriaBuilder') diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php index 4bf13eed6fc348ace9c091014a9551dcf1b4a480..426b24433e22f59e5f62e1e44b233a10c06abfec 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php @@ -18,7 +18,7 @@ class CartTest extends \Magento\Backend\Utility\Controller { parent::setUp(); $this->quoteItemCollectionFactory = $this->_objectManager->get( - '\Magento\Sales\Model\Resource\Quote\Item\CollectionFactory' + 'Magento\Sales\Model\Resource\Quote\Item\CollectionFactory' ); } diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/AddressRepositoryTest.php index ebdd0e357273e185b948088241206a1e541b6852..113c9eb6d6924d1572b599bbfa8fb721cd348f69 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/AddressRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/AddressRepositoryTest.php @@ -35,7 +35,7 @@ class AddressRepositoryTest extends \PHPUnit_Framework_TestCase $this->repository = $this->_objectManager->create('Magento\Customer\Api\AddressRepositoryInterface'); $this->_addressBuilder = $this->_objectManager->create('Magento\Customer\Api\Data\AddressDataBuilder'); - $builder = $this->_objectManager->create('\Magento\Customer\Api\Data\RegionDataBuilder'); + $builder = $this->_objectManager->create('Magento\Customer\Api\Data\RegionDataBuilder'); $region = $builder ->setRegionCode('AL') ->setRegion('Alabama') diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php index 103fe685bdebdc1b22047bd59bda52a7c9d597bd..24210493d4d8e1d2c2f25f2f0cf8b9fc3f874c80 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php @@ -271,7 +271,7 @@ class CustomerRepositoryTest extends \PHPUnit_Framework_TestCase public function searchCustomersDataProvider() { - $builder = Bootstrap::getObjectManager()->create('\Magento\Framework\Api\FilterBuilder'); + $builder = Bootstrap::getObjectManager()->create('Magento\Framework\Api\FilterBuilder'); return [ 'Customer with specific email' => [ [$builder->setField('email')->setValue('customer@search.example.com')->create()], @@ -321,14 +321,14 @@ class CustomerRepositoryTest extends \PHPUnit_Framework_TestCase $searchBuilder = $objectManager->create('Magento\Framework\Api\SearchCriteriaDataBuilder'); // Filter for 'firstname' like 'First' - $filterBuilder = $objectManager->create('\Magento\Framework\Api\FilterBuilder'); + $filterBuilder = $objectManager->create('Magento\Framework\Api\FilterBuilder'); $firstnameFilter = $filterBuilder->setField('firstname') ->setConditionType('like') ->setValue('First%') ->create(); $searchBuilder->addFilter([$firstnameFilter]); // Search ascending order - $sortOrderBuilder = $objectManager->create('\Magento\Framework\Api\SortOrderBuilder'); + $sortOrderBuilder = $objectManager->create('Magento\Framework\Api\SortOrderBuilder'); $sortOrder = $sortOrderBuilder ->setField('lastname') ->setDirection(SearchCriteriaInterface::SORT_ASC) diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer.php index 5d196d0bb0868282e07b36309647ed987b3fa1e1..aa4af34c98fb6d7d254fbba5f3ea1b88e7892e2d 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer.php +++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer.php @@ -5,7 +5,7 @@ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var $repository \Magento\Customer\Api\CustomerRepositoryInterface */ -$repository = $objectManager->create('\Magento\Customer\Api\CustomerRepositoryInterface'); +$repository = $objectManager->create('Magento\Customer\Api\CustomerRepositoryInterface'); $customer = $objectManager->create('Magento\Customer\Model\Customer'); /** @var Magento\Customer\Model\Customer $customer */ diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php index 65ed2f489ee247d63aff68366e5ec341587a23b4..0628f7d67efe4fe1ea3434fe84b116fe9cfde85e 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php @@ -24,7 +24,7 @@ class DateTest extends \PHPUnit_Framework_TestCase { $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); $this->_elementFactory = $objectManager->create('Magento\Framework\Data\Form\ElementFactory'); - $this->_localeDate = $objectManager->get('\Magento\Framework\Stdlib\DateTime\Timezone'); + $this->_localeDate = $objectManager->get('Magento\Framework\Stdlib\DateTime\Timezone'); } /** diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/DataSetupTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/DataSetupTest.php index 1186ce0262e347a10214e1da34bc36e1391e99c0..23adfd0278521b5b5ce97c6f010b0e15c2fdaa7c 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Module/DataSetupTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Module/DataSetupTest.php @@ -23,7 +23,7 @@ class DataSetupTest extends \PHPUnit_Framework_TestCase { /* reset data version */ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - '\Magento\Framework\Module\ResourceInterface' + 'Magento\Framework\Module\ResourceInterface' )->setDataVersion( 'adminnotification_setup', false diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php index c4fad76c42d8ebaf047b25072a8f4bf2389c4e1a..fa8fe5f9b6d1f4c0f2fea7245e93d566e4c4224d 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php @@ -24,7 +24,7 @@ class DbStatusValidatorTest extends \Magento\TestFramework\TestCase\AbstractCont $moduleList = $objectManager->get('Magento\Framework\Module\ModuleListInterface'); /** @var \Magento\Framework\Module\ResourceResolverInterface $resourceResolver */ - $resourceResolver = $objectManager->get('\Magento\Framework\Module\ResourceResolverInterface'); + $resourceResolver = $objectManager->get('Magento\Framework\Module\ResourceResolverInterface'); // get first resource, we don't care which one it is. foreach ($moduleList->getNames() as $moduleName) { diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index 394581ba4bd2fb28a42283738f72f7a8a378c439..0a3f75362d96b35d2883695d162d114eb52621f5 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -83,7 +83,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase private function reindexAll() { /** @var \Magento\Indexer\Model\Indexer[] $indexerList */ - $indexerList = $this->objectManager->get('\Magento\Indexer\Model\Indexer\CollectionFactory') + $indexerList = $this->objectManager->get('Magento\Indexer\Model\Indexer\CollectionFactory') ->create() ->getItems(); diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message.php b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message.php index 02c9732fd2d68dd98a63c8b174634e35c6d2a009..7327f57113af592ecfab1160c0347fbebccc0272 100644 --- a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message.php +++ b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message.php @@ -37,7 +37,7 @@ $quote->setReservedOrderId('test_order_item_with_message') $quote->collectTotals()->save(); /** @var \Magento\GiftMessage\Model\Message $message */ -$message = $objectManager->create('\Magento\GiftMessage\Model\Message'); +$message = $objectManager->create('Magento\GiftMessage\Model\Message'); $message->setSender('John Doe'); $message->setRecipient('Jane Roe'); $message->setMessage('Gift Message Text'); diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php index c71266ff03aa80c2f0c0767897974d0ed5d5cdd0..3e591550b0f564c02e1f5c1b3e22c1bf3dd98b8d 100644 --- a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php +++ b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php @@ -9,7 +9,7 @@ $registry->register('isSecureArea', true); $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); $quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('test_order_item_with_message', 'reserved_order_id'); -$message = $objectManager->create('\Magento\GiftMessage\Model\Message'); +$message = $objectManager->create('Magento\GiftMessage\Model\Message'); $product = $objectManager->create('Magento\Catalog\Model\Product'); foreach ($quote->getAllItems() as $item) { $message->load($item->getGiftMessageId()); diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message.php b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message.php index ac79d7407e5844d7e2cb86c11e3c8b983b3e4db3..3cdc3632d358d11112b687e97a8d961969f4acf7 100644 --- a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message.php +++ b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message.php @@ -6,7 +6,7 @@ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\GiftMessage\Model\Message $message */ -$message = $objectManager->create('\Magento\GiftMessage\Model\Message'); +$message = $objectManager->create('Magento\GiftMessage\Model\Message'); $message->setSender('Romeo'); $message->setRecipient('Mercutio'); $message->setMessage('I thought all for the best.'); diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message_rollback.php b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message_rollback.php index 020bd49302f6b6805d0b4a7ddf4ba6043eaca557..d812b302dd6d87f5e99b7777dc77aed1aa7c5738 100644 --- a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message_rollback.php +++ b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_message_rollback.php @@ -10,7 +10,7 @@ $quote = $objectManager->create('Magento\Sales\Model\Quote'); $quote->load('message_order_21', 'reserved_order_id'); /** @var \Magento\GiftMessage\Model\Message $message */ -$message = $objectManager->create('\Magento\GiftMessage\Model\Message'); +$message = $objectManager->create('Magento\GiftMessage\Model\Message'); $message->load($quote->getGiftMessageId()); $message->delete(); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php index 9f4f37ead612ad8b175b5f4f3e421341f79852e5..ba1ea5ac55ff112e6bae5786b53f9d6116b8c5a9 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php @@ -31,7 +31,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase { /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */ $addressRepository = Bootstrap::getObjectManager()->create( - '\Magento\Customer\Api\AddressRepositoryInterface' + 'Magento\Customer\Api\AddressRepositoryInterface' ); $fixtureAddressId = 1; $address = $addressRepository->getById($fixtureAddressId); diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php index 6849d9ffd8965be04deff2a635a9765848203e11..aeee37329dfb3f633e16e2193b41b8359b295691 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php @@ -18,7 +18,7 @@ class FormTest extends \PHPUnit_Framework_TestCase $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); $queue = $objectManager->get('Magento\Newsletter\Model\Queue'); /** @var \Magento\Framework\Registry $registry */ - $registry = $objectManager->get('\Magento\Framework\Registry'); + $registry = $objectManager->get('Magento\Framework\Registry'); $registry->register('current_queue', $queue); $objectManager->get( diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php index b442c5669963d20c20dc12956d04d71fec5b0957..8c81582f654724e2e2ebf08a42f8016b1fa72ebe 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php @@ -86,8 +86,8 @@ ORDER_DATA_JSON; private function setUpMockAddress() { - $regionBuilder1 = $this->_objectManager->create('\Magento\Customer\Api\Data\RegionDataBuilder'); - $regionBuilder2 = $this->_objectManager->create('\Magento\Customer\Api\Data\RegionDataBuilder'); + $regionBuilder1 = $this->_objectManager->create('Magento\Customer\Api\Data\RegionDataBuilder'); + $regionBuilder2 = $this->_objectManager->create('Magento\Customer\Api\Data\RegionDataBuilder'); /** @var \Magento\Customer\Api\Data\AddressDataBuilder $addressBuilder */ $addressBuilder = $this->_objectManager->create('Magento\Customer\Api\Data\AddressDataBuilder'); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php index 5c50ad08fc109fb2b4ce3ea07f5cab3b5cb879cb..9750f9707bee9a4d8919c80b439d233342625979 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php @@ -108,7 +108,7 @@ class CreateTest extends \Magento\Backend\Utility\Controller public function testGetAclResource($actionName, $reordered, $expectedResult) { $this->_objectManager->get('Magento\Backend\Model\Session\Quote')->setReordered($reordered); - $orderController = $this->_objectManager->get('\Magento\Sales\Controller\Adminhtml\Order\Create'); + $orderController = $this->_objectManager->get('Magento\Sales\Controller\Adminhtml\Order\Create'); $this->getRequest()->setActionName($actionName); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/QuoteTest.php index 2bfff2ec25567d55f12de8c8c0f8da164c439435..356f1b8d0166c62d3a43f5d428ebaa94b0f2c30a 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/QuoteTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/QuoteTest.php @@ -68,7 +68,7 @@ class QuoteTest extends \PHPUnit_Framework_TestCase * @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */ $customerRepository = Bootstrap::getObjectManager() - ->create('\Magento\Customer\Api\CustomerRepositoryInterface'); + ->create('Magento\Customer\Api\CustomerRepositoryInterface'); $customerRepository->save($customerDataSet); $quote->setCustomer($customerDataSet); $expected = $this->_getCustomerDataArray(); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php index f9da905c795cc8efb651cd2c8c7002ad0f202f24..9d10fd0bb2734fb762ae1e053b6cfa53ab6ae72c 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php @@ -24,7 +24,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $this->resourceModel = $this->objectManager->create('\Magento\Sales\Model\Resource\Order'); + $this->resourceModel = $this->objectManager->create('Magento\Sales\Model\Resource\Order'); $this->orderIncrementId = '100000001'; } diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/creditmemo_for_get.php b/dev/tests/integration/testsuite/Magento/Sales/_files/creditmemo_for_get.php index 53494019e75e0ebb188d9f57b67fa065a4650d19..e61b820234045e2b750d5900331c61fa096ee175 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/creditmemo_for_get.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/creditmemo_for_get.php @@ -20,7 +20,7 @@ $creditmemo->setIncrementId('100000001'); $creditmemo->save(); /** @var \Magento\Sales\Model\Order\Item $orderItem */ -$orderItem = $objectManager->get('\Magento\Sales\Model\Order\Item'); +$orderItem = $objectManager->get('Magento\Sales\Model\Order\Item'); $orderItem->setName('Test item') ->setQtyRefunded(1) ->setQtyInvoiced(10) diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php index fbe320324299906da720bf66a72c16b90eccc854..6f24cee659703a707ff04dfa328cc8444234e53e 100644 --- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php +++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php @@ -106,11 +106,11 @@ class SubtotalTest extends \PHPUnit_Framework_TestCase $address = $quote->getShippingAddress(); /** @var \Magento\Sales\Model\Quote\Address\Total\Subtotal $addressSubtotalCollector */ - $addressSubtotalCollector = $this->objectManager->create('\Magento\Sales\Model\Quote\Address\Total\Subtotal'); + $addressSubtotalCollector = $this->objectManager->create('Magento\Sales\Model\Quote\Address\Total\Subtotal'); $addressSubtotalCollector->collect($address); /** @var \Magento\Tax\Model\Sales\Total\Quote\Subtotal $subtotalCollector */ - $subtotalCollector = $this->objectManager->create('\Magento\Tax\Model\Sales\Total\Quote\Subtotal'); + $subtotalCollector = $this->objectManager->create('Magento\Tax\Model\Sales\Total\Quote\Subtotal'); $subtotalCollector->collect($address); $this->assertEquals($expected['subtotal'], $address->getSubtotal()); @@ -221,11 +221,11 @@ class SubtotalTest extends \PHPUnit_Framework_TestCase $address = $quote->getShippingAddress(); /** @var \Magento\Sales\Model\Quote\Address\Total\Subtotal $addressSubtotalCollector */ - $addressSubtotalCollector = $this->objectManager->create('\Magento\Sales\Model\Quote\Address\Total\Subtotal'); + $addressSubtotalCollector = $this->objectManager->create('Magento\Sales\Model\Quote\Address\Total\Subtotal'); $addressSubtotalCollector->collect($address); /** @var \Magento\Tax\Model\Sales\Total\Quote\Subtotal $subtotalCollector */ - $subtotalCollector = $this->objectManager->create('\Magento\Tax\Model\Sales\Total\Quote\Subtotal'); + $subtotalCollector = $this->objectManager->create('Magento\Tax\Model\Sales\Total\Quote\Subtotal'); $subtotalCollector->collect($address); $this->assertEquals($expected['subtotal'], $address->getSubtotal()); diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php index 9d67c1a1ba1f32452e3a551b12619ae0e3eeb080..57d6eec4bbc59c6741a420bcc9a7aad3cc9b4474 100644 --- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php @@ -310,7 +310,7 @@ class TaxRuleRepositoryTest extends \PHPUnit_Framework_TestCase public function searchTaxRulesDataProvider() { - $filterBuilder = Bootstrap::getObjectManager()->create('\Magento\Framework\Api\FilterBuilder'); + $filterBuilder = Bootstrap::getObjectManager()->create('Magento\Framework\Api\FilterBuilder'); return [ 'code eq "Default Rule"' => [ diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php index 0f881df4bc9fc6ea1e82ca48a9555f6f2c2b30d1..3b159bc71b4fef4f79706512e9fd4f3b4e3970cf 100644 --- a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php @@ -21,7 +21,7 @@ class PathProcessorTest extends \PHPUnit_Framework_TestCase { $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); $this->storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface'); - $this->pathProcessor = $objectManager->get('\Magento\Webapi\Model\PathProcessor'); + $this->pathProcessor = $objectManager->get('Magento\Webapi\Model\PathProcessor'); } /** diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index e95ec93ee08ebea8de2e2745d80a585686ca4a21..e145ee1a92be2c4687e228f04f015b6fde9ab3a0 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -2329,6 +2329,7 @@ return [ ['Magento\TranslateInterface', 'Magento\Framework\TranslateInterface'], ['Magento\Locale', 'Magento\Framework\Locale'], ['Magento\LocaleFactory', 'Magento\Framework\LocaleFactory'], + ['Magento\Integration\Model\Oauth\Token\Factory', 'Magento\Integration\Model\Oauth\TokenFactory'], ['Magento\LocaleInterface', 'Magento\Framework\LocaleInterface'], ['Magento\Logger', 'Psr\Log\LoggerInterface'], ['Magento\Phrase', 'Magento\Framework\Phrase'], diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php index 8178a8f98b8ff0ada61286bbfeca5ca9e2a51519..6796ff7b20e60efc5fb2880b6864fca1a512992e 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php @@ -21,7 +21,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase ); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $config = $objectManager->getObject( - '\Magento\Backend\Model\Translate\Inline\Config', + 'Magento\Backend\Model\Translate\Inline\Config', ['config' => $backendConfig] ); $this->assertEquals($result, $config->isActive('any')); diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/PriceBackendTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/PriceBackendTest.php index 169b42dce907373118eb08564a46f4516c171cef..531e403b2b1636079bdf0c6eb34d618f1023d69b 100644 --- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/PriceBackendTest.php +++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/PriceBackendTest.php @@ -24,7 +24,7 @@ class PriceBackendTest extends \PHPUnit_Framework_TestCase protected function setUp() { $objectManager = new ObjectManager($this); - $this->priceBackendPlugin = $objectManager->getObject('\Magento\Bundle\Model\Plugin\PriceBackend'); + $this->priceBackendPlugin = $objectManager->getObject('Magento\Bundle\Model\Plugin\PriceBackend'); $this->closure = function () { return static::CLOSURE_VALUE; diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/ProductTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/ProductTest.php index aacd23afdc77ce14c2c9e2124c9f979f4ec351a0..5751d3ce99625bc8d957aa0b6ecd71570d06eb22 100644 --- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/ProductTest.php +++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Plugin/ProductTest.php @@ -34,7 +34,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase ->getMock(); $this->plugin = $objectManager->getObject( - '\Magento\Bundle\Model\Plugin\Product', + 'Magento\Bundle\Model\Plugin\Product', [ 'type' => $this->type, ] diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/OptionListTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/OptionListTest.php index 4a6e8fdea8d32e60445ca017b3a476fb19a6aaa9..e8cdedd266eb91116dd328f8588742cdae38e70b 100644 --- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/OptionListTest.php +++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/OptionListTest.php @@ -63,7 +63,7 @@ class OptionListTest extends \PHPUnit_Framework_TestCase ); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $optionsCollMock = $objectManager->getCollectionMock( - '\Magento\Bundle\Model\Resource\Option\Collection', + 'Magento\Bundle\Model\Resource\Option\Collection', [$optionMock] ); $this->typeMock->expects($this->once()) diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php index 416050c0d71b41bbc1ae09468d4c0edf9b717fd3..9c43306184791e5c5c5f5360e36009cb23034cfc 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php @@ -34,7 +34,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase ->method('isAllowed') ->will($this->returnValue($isAllowed)); $model = $this->objectManager->getObject( - '\Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category', + 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category', ['authorization' => $this->authorization] ); switch ($isAllowed) { @@ -60,7 +60,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase public function testGetAfterElementHtml() { $model = $this->objectManager->getObject( - '\Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category', + 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category', ['authorization' => $this->authorization] ); $this->authorization->expects($this->any()) diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php index e4c9298ab9351276bb90552e41b983ff1119ad8d..02d63ad6b976785cf3c58c5c9ce56a5e9d7f0e5c 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php @@ -84,7 +84,7 @@ class WeightTest extends \PHPUnit_Framework_TestCase ); $this->_model = $objectManager->getObject( - '\Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight', + 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight', ['factoryElement' => $factory, 'factoryCollection' => $collectionFactory, 'helper' => $helper] ); diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php index 4760cbfea680d6820bdd3123a6e9d98e20265c87..06236231c14928e8f0e2063850f481e5cf32e823 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php @@ -22,7 +22,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase ); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $model = $objectManager->getObject( - '\Magento\Catalog\Model\Config', + 'Magento\Catalog\Model\Config', ['setCollectionFactory' => $setCollectionFactory] ); $setItem = $this->getMock( @@ -81,7 +81,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase ); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $model = $objectManager->getObject( - '\Magento\Catalog\Model\Config', + 'Magento\Catalog\Model\Config', ['groupCollectionFactory' => $groupCollectionFactory] ); $setItem = $this->getMock( @@ -137,7 +137,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase $productTypeFactory = $this->getMock('\Magento\Catalog\Model\Product\TypeFactory', ['create'], [], '', false); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $model = $objectManager->getObject( - '\Magento\Catalog\Model\Config', + 'Magento\Catalog\Model\Config', ['productTypeFactory' => $productTypeFactory] ); $typeCollection = $this->getMock('\Magento\Catalog\Model\Product\Type', ['getOptionArray'], [], '', false); @@ -183,7 +183,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase $object = $this->getMock('\Magento\Framework\Object', ['getAllOptions'], [], '', false); $object->expects($this->once())->method('getAllOptions')->will($this->returnValue($data)); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - $model = $objectManager->getObject('\Magento\Catalog\Model\Config'); + $model = $objectManager->getObject('Magento\Catalog\Model\Config'); $this->assertEquals($expected, $model->getSourceOptionId($object, $search)); } @@ -254,7 +254,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $model = $objectManager->getObject( - '\Magento\Catalog\Model\Config', + 'Magento\Catalog\Model\Config', ['configFactory' => $configFactory, 'storeManager' => $storeManager, 'eavConfig' => $eavConfig] ); @@ -314,7 +314,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase $scopeConfig->expects($this->once())->method('getValue') ->with('catalog/frontend/default_sort_by', 'store', null)->will($this->returnValue(1)); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - $model = $objectManager->getObject('\Magento\Catalog\Model\Config', ['scopeConfig' => $scopeConfig]); + $model = $objectManager->getObject('Magento\Catalog\Model\Config', ['scopeConfig' => $scopeConfig]); $this->assertEquals(1, $model->getProductListDefaultSortBy()); } } diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php index cd70ab51464d4d8e7bf02fe63d9b5ac1ca048158..7fe4c17e397fc5f9896ccbb0e79547d9dce05ba3 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php @@ -70,7 +70,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase ); $this->_model = $this->_objectManager->getObject( - '\Magento\Catalog\Model\Indexer\Product\Price\Observer', + 'Magento\Catalog\Model\Indexer\Product\Price\Observer', [ 'storeManager' => $this->_storeManagerMock, 'resource' => $this->_resourceMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php index d2d7da59dd89e27748344b03f84763b83a7b8a24..52b3b6a1fc88368a3db105e74db9dfba3520ed2e 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php @@ -49,7 +49,7 @@ class CustomerGroupTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($indexerMock)); $this->_model = $this->_objectManager->getObject( - '\Magento\Catalog\Model\Indexer\Product\Price\Plugin\CustomerGroup', + 'Magento\Catalog\Model\Indexer\Product\Price\Plugin\CustomerGroup', ['indexerRegistry' => $this->indexerRegistryMock] ); } diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/WebsiteTest.php index 182203e835eae33015d7a2ad90980ddfe79b31df..3dcc701027f6c3c0deadc9f68560149052e11bbe 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/WebsiteTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/WebsiteTest.php @@ -34,7 +34,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase ); $this->_model = $this->_objectManager->getObject( - '\Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website', + 'Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website', ['processor' => $this->_priceProcessorMock] ); } diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php index cf4d702fa656f49e3ff6a999f2520f0e89bf7bab..f3125755230cc95bb9daf7655acf5f10748492b1 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php @@ -46,7 +46,7 @@ class PriceScopeTest extends \PHPUnit_Framework_TestCase $this->_model = $this->_objectManager->getObject( - '\Magento\Catalog\Model\Indexer\Product\Price\System\Config\PriceScope', + 'Magento\Catalog\Model\Indexer\Product\Price\System\Config\PriceScope', [ 'context' => $contextMock, 'registry' => $registryMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php index 8000b58eaa29cdcb6ebcccf1dc0034be3401b3de..dbb81426dd21c2848da5f50029b40acec7c33b5e 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php @@ -61,7 +61,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); - $this->_observer = (new ObjectManager($this))->getObject('\Magento\Catalog\Model\Observer', [ + $this->_observer = (new ObjectManager($this))->getObject('Magento\Catalog\Model\Observer', [ 'urlFactory' => $this->_getCleanMock('\Magento\Catalog\Model\UrlFactory'), 'categoryResource' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Category'), 'catalogProduct' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Product'), diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ActionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ActionTest.php index 2f1cb376bc792c576b71a8431160cb12fa820891..731eef5fb6cfe4613fb2f8a2924d5ce35b144864 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ActionTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ActionTest.php @@ -99,7 +99,7 @@ class ActionTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\Catalog\Model\Product\Action', + 'Magento\Catalog\Model\Product\Action', [ 'eventDispatcher' => $eventManagerMock, 'resource' => $this->resource, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ConditionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ConditionTest.php index 217ab2d9ea209cff1c838abde89371e61622f4a6..963ae068f265537679ba80d04b5d9d38ef50defc 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ConditionTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ConditionTest.php @@ -36,7 +36,7 @@ class ConditionTest extends \PHPUnit_Framework_TestCase protected function setUp() { $helper = new ObjectManager($this); - $this->model = $helper->getObject('\Magento\Catalog\Model\Product\Condition'); + $this->model = $helper->getObject('Magento\Catalog\Model\Product\Condition'); $this->model->setTable('testTable') ->setPkFieldName('testFieldName'); } diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinksTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinksTest.php index a4f97b33b60a05a4fd00b324ab58c717ba88dfb3..17c4d474b1d6096341841a698e35784993f7f320 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinksTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Initialization/Helper/ProductLinksTest.php @@ -26,7 +26,7 @@ class ProductLinksTest extends \PHPUnit_Framework_TestCase protected function setUp() { $helper = new ObjectManager($this); - $this->model = $helper->getObject('\Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks'); + $this->model = $helper->getObject('Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks'); } /** diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php index 0062cfe3a6fe5ce28648450ee0c7b036cefcc3a7..0638418b149b052173069167033b00af26636830 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php @@ -52,7 +52,7 @@ class LinkTypeProviderTest extends \PHPUnit_Framework_TestCase ]; $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\Catalog\Model\Product\LinkTypeProvider', + 'Magento\Catalog\Model\Product\LinkTypeProvider', [ 'linkTypeBuilder' => $this->linkTypeBuilderMock, 'linkAttributeBuilder' => $this->linkAttributeBuilderMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/OptionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/OptionTest.php index 5e91220127ed2167d2fdb5781476b40454c98b43..3be3f6ab782c1b9b72f0ae5fbdb03834e404082d 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/OptionTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/OptionTest.php @@ -22,7 +22,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase { $this->productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false); $objectManager = new ObjectManager($this); - $this->model = $objectManager->getObject('\Magento\Catalog\Model\Product\Option'); + $this->model = $objectManager->getObject('Magento\Catalog\Model\Product\Option'); $this->model->setProduct($this->productMock); } diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductAttributeGroupRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductAttributeGroupRepositoryTest.php index fa30c85ad16b6e0b19ed8472deb583897eeca5a8..db5ed390cdfb292747fd0275f7074727b25e553f 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductAttributeGroupRepositoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductAttributeGroupRepositoryTest.php @@ -46,7 +46,7 @@ class ProductAttributeGroupRepositoryTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\Catalog\Model\ProductAttributeGroupRepository', + 'Magento\Catalog\Model\ProductAttributeGroupRepository', [ 'groupRepository' => $this->groupRepositoryMock, 'groupResource' => $this->groupResourceMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/ManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/ManagementTest.php index eb38e54cfb983ddc9aade769fa9d43dc39856191..ec0193d5c188166b6392bfbd7bc91ea7d1414b01 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/ManagementTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/ManagementTest.php @@ -86,7 +86,7 @@ class ManagementTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\Catalog\Model\ProductLink\Management', + 'Magento\Catalog\Model\ProductLink\Management', [ 'productRepository' => $this->productRepositoryMock, 'collectionProvider' => $this->collectionProviderMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/RepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/RepositoryTest.php index fd9267a2d71bfe47ccebb6ef7ac232db8990c915..6635666e29c18efcc71b09cd0f1c7469bbfdf818 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/RepositoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/RepositoryTest.php @@ -47,7 +47,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase ); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\Catalog\Model\ProductLink\Repository', + 'Magento\Catalog\Model\ProductLink\Repository', [ 'productRepository' => $this->productRepositoryMock, 'entityCollectionProvider' => $this->entityCollectionProviderMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php index 3b1c80d319fc690a60917ea07269366c7b17af7e..363a40565064e132d4807036061955352534f1f2 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php @@ -91,7 +91,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->_model = $objectManager->getObject( - '\Magento\Catalog\Model\Resource\Eav\Attribute', + 'Magento\Catalog\Model\Resource\Eav\Attribute', [ 'context' => $this->contextMock, 'productFlatIndexerProcessor' => $this->_processor, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/ProductTest.php index 1410fc93c6ac22a03361c2255182d6de97a6995e..2ad45ca8b2a63f96ac49123ceffe17bbc033ae2d 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/ProductTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/ProductTest.php @@ -44,7 +44,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase ); $this->model = $objectManager->getObject( - '\Magento\Catalog\Model\Resource\Product', + 'Magento\Catalog\Model\Resource\Product', [ 'setFactory' => $this->setFactoryMock, 'typeFactory' => $this->typeFactoryMock, diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/System/Config/Source/InputtypeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/System/Config/Source/InputtypeTest.php index 4e0eb00d8c2bef11876a7f5ccdc7d271d74cc04d..40e37f28a1b443455aca2b38ee29f4d7892b1690 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Model/System/Config/Source/InputtypeTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/System/Config/Source/InputtypeTest.php @@ -19,7 +19,7 @@ class InputtypeTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->_helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->_model = $this->_helper->getObject('\Magento\Catalog\Model\System\Config\Source\Inputtype'); + $this->_model = $this->_helper->getObject('Magento\Catalog\Model\System\Config\Source\Inputtype'); } public function testToOptionArrayIsArray() diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php index f76f8f8f5907b5bf7076516705a58a62de186b5c..577b8abf638e09f47c66bab42a84ec16744e7df7 100644 --- a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php +++ b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php @@ -72,7 +72,7 @@ class BasePriceTest extends \PHPUnit_Framework_TestCase ]; $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->basePrice = $helper->getObject('\Magento\Catalog\Pricing\Price\BasePrice', + $this->basePrice = $helper->getObject('Magento\Catalog\Pricing\Price\BasePrice', [ 'saleableItem' => $this->saleableItemMock, 'quantity' => $qty, diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php index a425a07ea6191e20c0bc4f8c7de22de355efae7f..5914ed6ce0290faa4aca586bf520d48891bf65d6 100644 --- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php +++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php @@ -267,7 +267,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->_model = $objectManager->getObject( - '\Magento\CatalogImportExport\Model\Import\Product', + 'Magento\CatalogImportExport\Model\Import\Product', [ 'config' => $this->_eavConfig, 'optionFactory' => $this->_optionFactory, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/ShippingTest.php index 2bb94676cfc5525112f659bb3c31c9d51f23a586..0d4c5653a305791457a167a40dbb17e183354f63 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/ShippingTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/ShippingTest.php @@ -57,7 +57,7 @@ class ShippingTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Checkout\Block\Cart\Shipping $shippingBlock */ $shippingBlock = $this->objectManager->getObject( - '\Magento\Checkout\Block\Cart\Shipping', + 'Magento\Checkout\Block\Cart\Shipping', ['context' => $contextMock] ); diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/Sidebar/TotalsTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/Sidebar/TotalsTest.php index d9afed82a88d2980d34ed45ccdf23d9a691e7b26..555b4b496cd7620a170f4bbbcdc8eefcbe064a52 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/Sidebar/TotalsTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/Sidebar/TotalsTest.php @@ -40,7 +40,7 @@ class TotalsTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->quote)); $this->totalsObj = $objectManager->getObject( - '\Magento\Checkout\Block\Cart\Sidebar\Totals', + 'Magento\Checkout\Block\Cart\Sidebar\Totals', ['checkoutSession' => $checkoutSession] ); } diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php index 0c7f3897adf3d617eff429297044b2b33c602ae4..7bd683816b79c4d8d86c75fe37fd78c5d1ec77b7 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php @@ -143,7 +143,7 @@ class SidebarTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Checkout\Block\Cart\SideBar $sidebarBlock */ $sidebarBlock = $this->_objectManager->getObject( - '\Magento\Checkout\Block\Cart\SideBar', + 'Magento\Checkout\Block\Cart\SideBar', ['context' => $contextMock] ); diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Onepage/AbstractOnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Onepage/AbstractOnepageTest.php index 04fa9ed514658c18eeb7d3e3289533cf4a1ebbae..e0eed207ba009127189d7aa80c208b8f9c9145e8 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Onepage/AbstractOnepageTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Onepage/AbstractOnepageTest.php @@ -57,7 +57,7 @@ class AbstractOnepageTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Checkout\Block\Onepage\AbstractOnepage $onepage */ $onepage = $this->objectManager->getObject( - '\Magento\Checkout\Block\Cart\Shipping', + 'Magento\Checkout\Block\Cart\Shipping', ['context' => $contextMock] ); diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Shipping/PriceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Shipping/PriceTest.php index 3aecb126e51225f95a4119a4e600e0eaf3fcd28b..9194999d94bfcb6383e8d82ee0e0292bc61beb53 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Shipping/PriceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Shipping/PriceTest.php @@ -36,7 +36,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock(); $this->priceObj = $objectManager->getObject( - '\Magento\Checkout\Block\Shipping\Price', + 'Magento\Checkout\Block\Shipping\Price', ['priceCurrency' => $this->priceCurrency] ); } diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php index 6a015a401c4b5602ae389a3277b3c44661a8f347..662d082c6fb3e6d2b161205259cfddac79f9622a 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php @@ -144,7 +144,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase // SUT $this->model = $this->objectManager->getObject( - '\Magento\Checkout\Controller\Onepage\Index', + 'Magento\Checkout\Controller\Onepage\Index', [ 'context' => $this->contextMock, 'customerSession' => $this->sessionMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php index 54ee170aa571c30eb3e640ea6520d6432eadf37d..d5bb6fe1b0ff19c8c18201c4e085f35856f0de08 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php @@ -344,7 +344,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase public function testResetCheckout() { /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_helper->getObject('\Magento\Checkout\Model\Session', [ + $session = $this->_helper->getObject('Magento\Checkout\Model\Session', [ 'storage' => new \Magento\Framework\Session\Storage() ]); $session->resetCheckout(); @@ -360,7 +360,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase ], ]; /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_helper->getObject('\Magento\Checkout\Model\Session', [ + $session = $this->_helper->getObject('Magento\Checkout\Model\Session', [ 'storage' => new \Magento\Framework\Session\Storage() ]); $session->setSteps($stepData); @@ -379,7 +379,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase ], ]; /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_helper->getObject('\Magento\Checkout\Model\Session', [ + $session = $this->_helper->getObject('Magento\Checkout\Model\Session', [ 'storage' => new \Magento\Framework\Session\Storage() ]); $session->setSteps($stepData); diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php index 282fb0ba66efa9ab143d07c4dccfb76c480ed597..d8ba19ff325567bbf844d919667fa8d235aea9b0 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php @@ -71,7 +71,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase ); $this->service = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Address\Shipping\WriteService', + 'Magento\Checkout\Service\V1\Address\Shipping\WriteService', [ 'quoteRepository' => $this->quoteRepositoryMock, 'quoteAddressFactory' => $this->addressFactoryMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php index 5c3a5952ef2556491041faca6c5cc318c98a2ad4..52fe4ee058964122bc171a89b05019f99faebaa0 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php @@ -68,12 +68,12 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase ); $this->addressDataBuilder = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Data\Cart\AddressBuilder', + 'Magento\Checkout\Service\V1\Data\Cart\AddressBuilder', ['regionBuilder' => $builder] ); $this->model = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Address\Validator', + 'Magento\Checkout\Service\V1\Address\Validator', [ 'quoteAddressFactory' => $this->addressFactoryMock, 'customerFactory' => $this->customerFactoryMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php index daccd8b4144bb2c7e88fa876ad517b69f3dd37de..04324909f396da348ba73728804ba6cc87a3b9bc 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php @@ -21,7 +21,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase { $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->builder = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Data\Cart\PaymentMethod\Builder' + 'Magento\Checkout\Service\V1\Data\Cart\PaymentMethod\Builder' ); } diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php index 296b8aaf8a04628d368070cc3768397c55048551..9e2c0ea62add40f4d886d29e562b7fd28e303409 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php @@ -36,7 +36,7 @@ class ConverterTest extends \PHPUnit_Framework_TestCase ); $this->converter = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Data\Cart\PaymentMethod\Converter', + 'Magento\Checkout\Service\V1\Data\Cart\PaymentMethod\Converter', [ 'builder' => $this->paymentMethodBuilderMock, ] diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php index 190ed00f085713fce540907fe820ec7fd98dd390..da0cdc677b33c9a8c1247465b2f2620954726e85 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php @@ -60,7 +60,7 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase ]; $this->quoteMock = $this->getMock('\Magento\Sales\Model\Quote', $methods, [], '', false); $this->quoteCollectionMock = $objectManager->getCollectionMock( - '\Magento\Sales\Model\Resource\Quote\Collection', [$this->quoteMock]); + 'Magento\Sales\Model\Resource\Quote\Collection', [$this->quoteMock]); $this->searchResultsBuilderMock = $this->getMock('\Magento\Checkout\Service\V1\Data\CartSearchResultsBuilder', [], [], '', false); $this->cartMapperMock = $this->getMock('\Magento\Checkout\Service\V1\Data\CartMapper', ['map'], [], '', false); diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php index edee9277ac423f4386e1d7a414c372f3f1a16ddf..5e683c744345a52339481e3838acf3b865ea7c2a 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php @@ -104,7 +104,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase false ); $this->service = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Cart\WriteService', + 'Magento\Checkout\Service\V1\Cart\WriteService', [ 'storeManager' => $this->storeManagerMock, 'customerRepository' => $this->customerRepositoryMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php index 86ea3f35499b69217bab5ccf160a87a72da699e5..18f1afad761b9b02c3060ced5545651b5d06bc9e 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php @@ -33,7 +33,7 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase '\Magento\Checkout\Service\V1\Data\Cart\CouponBuilder', [], [], '', false ); $this->service = $objectManager->getObject( - '\Magento\Checkout\Service\V1\Coupon\ReadService', + 'Magento\Checkout\Service\V1\Coupon\ReadService', [ 'quoteRepository' => $this->quoteRepositoryMock, 'couponBuilder' => $this->couponBuilderMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php index 7069ba299ea581fdc2cb12e3f761e22fd0ca796f..58f49fce1290ebe463662f5bfaf0905b61d182c8 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php @@ -32,7 +32,7 @@ class ConverterTest extends \PHPUnit_Framework_TestCase ); $this->converter = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\Data\PaymentMethod\Converter', + 'Magento\Checkout\Service\V1\Data\PaymentMethod\Converter', [ 'builder' => $this->paymentMethodBuilderMock, ] diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php index 7fb960654ef25cddc47fa9a11e48bb9c56cf2cac..7bfdd2524ba758f2bfd0efb09f6edc390b9168cf 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php @@ -50,7 +50,7 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase $this->methodListMock = $this->getMock('\Magento\Payment\Model\MethodList', [], [], '', false); $this->service = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\PaymentMethod\ReadService', + 'Magento\Checkout\Service\V1\PaymentMethod\ReadService', [ 'quoteRepository' => $this->quoteRepositoryMock, 'quoteMethodConverter' => $this->quoteMethodConverterMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php index 7a07b8c8aad863f34a9d712a81899de567406642..918124800a2b4b43c099c87ca42cdad1b731b87a 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php @@ -49,7 +49,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase $this->validatorMock = $this->getMock('\Magento\Payment\Model\Checks\ZeroTotal', [], [], '', false); $this->service = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\PaymentMethod\WriteService', + 'Magento\Checkout\Service\V1\PaymentMethod\WriteService', [ 'quoteRepository' => $this->quoteRepositoryMock, 'paymentMethodBuilder' => $this->paymentMethodBuilderMock, diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php index cfae35ef94aaf51676a03d6a369bcb0309746e11..d48c14f27b7d3f02286270ee84360e5a553de0fa 100644 --- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php @@ -96,7 +96,7 @@ class ReadServiceTest extends \PHPUnit_Framework_TestCase ); $this->service = $this->objectManager->getObject( - '\Magento\Checkout\Service\V1\ShippingMethod\ReadService', + 'Magento\Checkout\Service\V1\ShippingMethod\ReadService', [ 'quoteRepository' => $this->quoteRepositoryMock, 'methodBuilder' => $this->methodBuilderMock, diff --git a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/AgreementTest.php b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/AgreementTest.php index a775fd23cf4c1828b95bbb44dfc780b9f7d80529..c7b36ca7edad0c5ffe8fcc91a6a9d4bd7ef252b6 100644 --- a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/AgreementTest.php +++ b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/AgreementTest.php @@ -14,7 +14,7 @@ class AgreementTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->model = $this->objectManager->getObject('\Magento\CheckoutAgreements\Model\Agreement'); + $this->model = $this->objectManager->getObject('Magento\CheckoutAgreements\Model\Agreement'); } /** diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php index 3ff772d19f703994eb1b506eead8faa825c7beac..0cce2cb3e3fc55a7112d7fd7cf03b7e4cc9ad4ab 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php @@ -100,7 +100,7 @@ class AccountTest extends \PHPUnit_Framework_TestCase $layoutMock->expects($this->at(0))->method('createBlock') ->with('Magento\Customer\Block\Adminhtml\Edit\Renderer\Attribute\Group') ->will($this->returnValue( - $this->objectManagerHelper->getObject('\Magento\Customer\Block\Adminhtml\Edit\Renderer\Attribute\Group') + $this->objectManagerHelper->getObject('Magento\Customer\Block\Adminhtml\Edit\Renderer\Attribute\Group') )); $layoutMock->expects($this->at(1))->method('createBlock') ->with('Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element') diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php index 4ddb6f8c5c7ba7bef9991f560f25dd2d88d13009..728853623ad04664ee775eb141f95ef78605b5dd 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php @@ -20,7 +20,7 @@ class NewsletterTest extends \PHPUnit_Framework_TestCase { $this->urlBuilder = $this->getMock('\Magento\Framework\UrlInterface'); $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->block = $helper->getObject('\Magento\Customer\Block\Newsletter', ['urlBuilder' => $this->urlBuilder]); + $this->block = $helper->getObject('Magento\Customer\Block\Newsletter', ['urlBuilder' => $this->urlBuilder]); } public function testGetAction() diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php index 5e1faeb65fc3c7d5cebe817002fbf234cbffcd3f..63e82abc9ee48eec3836690159f88c7df1dc6d8d 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php @@ -62,13 +62,13 @@ class DobTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $locale = $objectManager->getObject( - '\Magento\Framework\Locale', + 'Magento\Framework\Locale', ['locale' => \Magento\Framework\Locale\ResolverInterface::DEFAULT_LOCALE] ); $localeResolver = $this->getMock('\Magento\Framework\Locale\ResolverInterface'); $localeResolver->expects($this->any())->method('getLocale')->will($this->returnValue($locale)); $timezone = $objectManager->getObject( - '\Magento\Framework\Stdlib\DateTime\Timezone', + 'Magento\Framework\Stdlib\DateTime\Timezone', ['localeResolver' => $localeResolver] ); diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/Group/Grid/ServiceCollectionTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/Group/Grid/ServiceCollectionTest.php index 71e1db6d481d05da539b3ad0f4f7198136a6ce20..f3ed61dc74af352f36e45ef43a58175a8ae722df 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/Group/Grid/ServiceCollectionTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/Group/Grid/ServiceCollectionTest.php @@ -36,7 +36,7 @@ class ServiceCollectionTest extends \PHPUnit_Framework_TestCase public function setUp() { $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->filterBuilder = $this->objectManager->getObject('\Magento\Framework\Api\FilterBuilder'); + $this->filterBuilder = $this->objectManager->getObject('Magento\Framework\Api\FilterBuilder'); $filterGroupBuilder = $this->objectManager ->getObject('Magento\Framework\Api\Search\FilterGroupBuilder'); /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */ @@ -45,7 +45,7 @@ class ServiceCollectionTest extends \PHPUnit_Framework_TestCase ['filterGroupBuilder' => $filterGroupBuilder] ); $this->sortOrderBuilder = $this->objectManager->getObject( - '\Magento\Framework\Api\SortOrderBuilder' + 'Magento\Framework\Api\SortOrderBuilder' ); $this->groupRepositoryMock = $this->getMockBuilder('\Magento\Customer\Api\GroupRepositoryInterface') ->getMock(); diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/GroupRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/GroupRepositoryTest.php index 49c27d38b7581d3a08a1bba2a424909be81ab8e6..b177b478a5f0dfee59daa01479877b14829a4a78 100644 --- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/GroupRepositoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/GroupRepositoryTest.php @@ -70,7 +70,7 @@ class GroupRepositoryTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\Eav\Model\Attribute\GroupRepository', + 'Magento\Eav\Model\Attribute\GroupRepository', [ 'groupResource' => $this->groupResourceMock, 'groupListFactory' => $this->groupListFactoryMock, diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php index f71b2d4fd7174b86741407c2cd82e6aa29410ab8..b7bfd64d583a7891caba721e9b891c1690cb4228 100644 --- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php +++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php @@ -164,7 +164,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase public function testInitSelect($column, $value, $expected) { $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->model = $helper->getObject('\Magento\Customer\Model\Resource\Attribute\Collection', + $this->model = $helper->getObject('Magento\Customer\Model\Resource\Attribute\Collection', [ 'entityFactory' => $this->entityFactoryMock, 'logger' => $this->loggerMock, diff --git a/dev/tests/unit/testsuite/Magento/Framework/Api/Data/AttributeValueTest.php b/dev/tests/unit/testsuite/Magento/Framework/Api/Data/AttributeValueTest.php index f9639ea5425262002b29cd5fe6e5b83f06e3314f..fd20df2184fb527711ede7a342e8a9bf337228f4 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Api/Data/AttributeValueTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Api/Data/AttributeValueTest.php @@ -21,7 +21,7 @@ class AttributeValueTest extends \PHPUnit_Framework_TestCase public function testConstructorAndGettersWithString() { $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $attributeBuilder = $helper->getObject('\Magento\Framework\Api\AttributeDataBuilder') + $attributeBuilder = $helper->getObject('Magento\Framework\Api\AttributeDataBuilder') ->setAttributeCode(self::ATTRIBUTE_CODE) ->setValue(self::STRING_VALUE); $attribute = new AttributeValue($attributeBuilder); @@ -33,7 +33,7 @@ class AttributeValueTest extends \PHPUnit_Framework_TestCase public function testConstructorAndGettersWithInteger() { $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $attributeBuilder = $helper->getObject('\Magento\Framework\Api\AttributeDataBuilder') + $attributeBuilder = $helper->getObject('Magento\Framework\Api\AttributeDataBuilder') ->setAttributeCode(self::ATTRIBUTE_CODE) ->setValue(self::INTEGER_VALUE); $attribute = new AttributeValue($attributeBuilder); @@ -45,7 +45,7 @@ class AttributeValueTest extends \PHPUnit_Framework_TestCase public function testConstructorAndGettersWithFloat() { $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $attributeBuilder = $helper->getObject('\Magento\Framework\Api\AttributeDataBuilder') + $attributeBuilder = $helper->getObject('Magento\Framework\Api\AttributeDataBuilder') ->setAttributeCode(self::ATTRIBUTE_CODE) ->setValue(self::FLOAT_VALUE); $attribute = new AttributeValue($attributeBuilder); @@ -57,7 +57,7 @@ class AttributeValueTest extends \PHPUnit_Framework_TestCase public function testConstructorAndGettersWithBoolean() { $helper = new \Magento\TestFramework\Helper\ObjectManager($this); - $attributeBuilder = $helper->getObject('\Magento\Framework\Api\AttributeDataBuilder') + $attributeBuilder = $helper->getObject('Magento\Framework\Api\AttributeDataBuilder') ->setAttributeCode(self::ATTRIBUTE_CODE) ->setValue(self::BOOLEAN_VALUE); $attribute = new AttributeValue($attributeBuilder); diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/AbstractCriteriaTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/AbstractCriteriaTest.php index 4751c65c29d2b763c3a55e7d10295fab129957b0..55b3d94536d1f97b9b7efd4264eaac7fc3f1c7fc 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Data/AbstractCriteriaTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Data/AbstractCriteriaTest.php @@ -24,7 +24,7 @@ class AbstractCriteriaTest extends \PHPUnit_Framework_TestCase protected function setUp() { $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); - $this->criteria = $objectManager->getObject('\Magento\Framework\Data\Criteria\Sample'); + $this->criteria = $objectManager->getObject('Magento\Framework\Data\Criteria\Sample'); } /** diff --git a/dev/tests/unit/testsuite/Magento/Framework/HTTP/HeaderTest.php b/dev/tests/unit/testsuite/Magento/Framework/HTTP/HeaderTest.php index 21079262a0fd9b52e255720ccf311ced7461434d..05efc158f0a99165d5879362dc478f7fd407725c 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/HTTP/HeaderTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/HTTP/HeaderTest.php @@ -56,7 +56,7 @@ class HeaderTest extends \PHPUnit_Framework_TestCase $this->_prepareCleanString($clean); $headerObject = $this->_objectManager->getObject( - '\Magento\Framework\HTTP\Header', + 'Magento\Framework\HTTP\Header', ['httpRequest' => $this->_request, 'converter' => $this->_converter] ); @@ -138,7 +138,7 @@ class HeaderTest extends \PHPUnit_Framework_TestCase $this->_prepareCleanString($clean); $headerObject = $this->_objectManager->getObject( - '\Magento\Framework\HTTP\Header', + 'Magento\Framework\HTTP\Header', ['httpRequest' => $this->_request, 'converter' => $this->_converter] ); diff --git a/dev/tests/unit/testsuite/Magento/Framework/Image/Adapter/Gd2Test.php b/dev/tests/unit/testsuite/Magento/Framework/Image/Adapter/Gd2Test.php index 4ac70fbf71dd7775ce52f4081a6462de08f2aa59..9136cc70df5b474b533e8f840b07712a8cd2628f 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Image/Adapter/Gd2Test.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Image/Adapter/Gd2Test.php @@ -89,7 +89,7 @@ class Gd2Test extends \PHPUnit_Framework_TestCase public function setUp() { $this->objectManager = new ObjectManager($this); - $this->adapter = $this->objectManager->getObject('\Magento\Framework\Image\Adapter\Gd2'); + $this->adapter = $this->objectManager->getObject('Magento\Framework\Image\Adapter\Gd2'); } /** diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php index 9c1416a06c7aba4ffee55f9fde8e5aff9fdf4831..5a1eb47f3ecb3ee94874ae6b674feed3a979eafd 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php @@ -394,6 +394,6 @@ class ObjectManagerTest extends \PHPUnit_Framework_TestCase public function testGetIgnoresFirstSlash() { - $this->assertSame($this->_object->get('Magento\Test\Di\Child'), $this->_object->get('\Magento\Test\Di\Child')); + $this->assertSame($this->_object->get('Magento\Test\Di\Child'), $this->_object->get('Magento\Test\Di\Child')); } } diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index cfd0209b33addbd652d21af589b18f25ea5bf40f..fea8b17efa8d586a54ff49febc041f1dde5cab83 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -107,7 +107,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase ->getMockForAbstractClass(); $this->adapter = $this->objectManager->getObject( - '\Magento\Framework\Search\Adapter\Mysql\Adapter', + 'Magento\Framework\Search\Adapter\Mysql\Adapter', [ 'mapper' => $this->mapper, 'responseFactory' => $this->responseFactory, diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ConditionManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ConditionManagerTest.php index 29a3e1c776025b854450c2239b95e5246e6616d4..f340d258baa76b96df82d85c1652dfe6f9186245 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ConditionManagerTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ConditionManagerTest.php @@ -57,7 +57,7 @@ class ConditionManagerTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->adapter)); $this->conditionManager = $objectManager->getObject( - '\Magento\Framework\Search\Adapter\Mysql\ConditionManager', + 'Magento\Framework\Search\Adapter\Mysql\ConditionManager', [ 'resource' => $this->resource ] diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/DimensionsTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/DimensionsTest.php index 729aa46274a2c22234db90f15fcb87edec714c05..72ebd5c70b190a12152a1e3539a06bb9c8d46c06 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/DimensionsTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/DimensionsTest.php @@ -62,7 +62,7 @@ class DimensionsTest extends \PHPUnit_Framework_TestCase ); $this->builder = $this->objectManager->getObject( - '\Magento\Framework\Search\Adapter\Mysql\Dimensions', + 'Magento\Framework\Search\Adapter\Mysql\Dimensions', [ 'conditionManager' => $this->conditionManager, 'scopeResolver' => $this->scopeResolver diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php index cc410bea0bf89034e21f2fbbce75c0d723edd381..fbf01248758dd9bb2db05c149eefd14dbef6f6d7 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/ResponseFactoryTest.php @@ -72,7 +72,7 @@ class ResponseFactoryTest extends \PHPUnit_Framework_TestCase $this->objectManager->expects($this->once())->method('create') ->with( - $this->equalTo('\Magento\Framework\Search\Response\QueryResponse'), + $this->equalTo('Magento\Framework\Search\Response\QueryResponse'), $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => null]) ) ->will($this->returnValue('QueryResponseObject')); diff --git a/dev/tests/unit/testsuite/Magento/Framework/Validator/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Validator/ConfigTest.php index 3ee92e5be9001876b5c817ae81d01e5271976579..5e223a9015f4444afd2ceadfff263c3695df746a 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Validator/ConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Validator/ConfigTest.php @@ -52,7 +52,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase $factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config); $realObjectManager = new \Magento\Framework\ObjectManager\ObjectManager($factory, $config); $factory->setObjectManager($realObjectManager); - $universalFactory = $realObjectManager->get('\Magento\Framework\Validator\UniversalFactory'); + $universalFactory = $realObjectManager->get('Magento\Framework\Validator\UniversalFactory'); $this->_config = $this->_objectManager->getObject( 'Magento\Framework\Validator\Config', ['configFiles' => $configFiles, 'builderFactory' => $universalFactory] diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Element/Html/Link/CurrentTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Element/Html/Link/CurrentTest.php index d914dc86f1f10f93845b90697a47d65b45ac5b7e..accdfcbff9a21cf29a67d39f02e2924db34d5377 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/View/Element/Html/Link/CurrentTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/View/Element/Html/Link/CurrentTest.php @@ -43,7 +43,7 @@ class CurrentTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Framework\View\Element\Html\Link\Current $link */ $link = $this->_objectManager->getObject( - '\Magento\Framework\View\Element\Html\Link\Current', + 'Magento\Framework\View\Element\Html\Link\Current', ['urlBuilder' => $this->_urlBuilderMock] ); @@ -54,7 +54,7 @@ class CurrentTest extends \PHPUnit_Framework_TestCase public function testIsCurrentIfIsset() { /** @var \Magento\Framework\View\Element\Html\Link\Current $link */ - $link = $this->_objectManager->getObject('\Magento\Framework\View\Element\Html\Link\Current'); + $link = $this->_objectManager->getObject('Magento\Framework\View\Element\Html\Link\Current'); $link->setCurrent(true); $this->assertTrue($link->IsCurrent()); } @@ -75,7 +75,7 @@ class CurrentTest extends \PHPUnit_Framework_TestCase $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b')); /** @var \Magento\Framework\View\Element\Html\Link\Current $link */ $link = $this->_objectManager->getObject( - '\Magento\Framework\View\Element\Html\Link\Current', + 'Magento\Framework\View\Element\Html\Link\Current', [ 'urlBuilder' => $this->_urlBuilderMock, 'request' => $this->_requestMock, @@ -93,7 +93,7 @@ class CurrentTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Framework\View\Element\Html\Link\Current $link */ $link = $this->_objectManager->getObject( - '\Magento\Framework\View\Element\Html\Link\Current', + 'Magento\Framework\View\Element\Html\Link\Current', ['urlBuilder' => $this->_urlBuilderMock, 'request' => $this->_requestMock] ); $this->assertFalse($link->isCurrent()); diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Helper/MessageTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Helper/MessageTest.php index e6058c1fe9e4208527f4b85c1c719e6eeab565a2..2ade264a0dcaf3fee7700e3bf6fd88dda1f9e445 100644 --- a/dev/tests/unit/testsuite/Magento/GiftMessage/Helper/MessageTest.php +++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Helper/MessageTest.php @@ -21,7 +21,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->layoutFactoryMock = $this->getMock('\Magento\Framework\View\LayoutFactory', [], [], '', false); - $this->helper = $objectManager->getObject('\Magento\GiftMessage\Helper\Message', [ + $this->helper = $objectManager->getObject('Magento\GiftMessage\Helper\Message', [ 'layoutFactory' => $this->layoutFactoryMock, 'skipMessageCheck' => ['onepage_checkout'], ]); diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php index d7b77c400c1db1e5c16593dab84e83ce89a0344c..bce6d2cca4a7d8e9781a341ca0e8c33a2ca4762f 100644 --- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php +++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php @@ -15,7 +15,7 @@ class SalePriceEffectiveDateTest extends \PHPUnit_Framework_TestCase { /** @var \Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate $model */ $model = (new \Magento\TestFramework\Helper\ObjectManager($this)) - ->getObject('\Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate'); + ->getObject('Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate'); $product = $this->getMock('\Magento\Catalog\Model\Product', ['__wakeup'], [], '', false); $effectiveDateFrom = $this->getMock( '\Magento\GoogleShopping\Model\Attribute\DefaultAttribute', diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php index 1aef8d8808af3a846411ef42018b4788e41482d0..d0bf24668cb5cee2ff4739edbbab9da960e2f873 100644 --- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php +++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php @@ -62,7 +62,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase { $this->flag->expects($this->once())->method('loadSelf')->will($this->returnSelf()); $this->flag->expects($this->once())->method('isExpired')->will($this->returnValue(true)); - $observer = $this->objectManagerHelper->getObject('\Magento\Framework\Event\Observer'); + $observer = $this->objectManagerHelper->getObject('Magento\Framework\Event\Observer'); $this->notificationInterface->expects($this->once())->method('addMajor') ->with( 'Google Shopping operation has expired.', diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ServiceTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ServiceTest.php index 42971cf8a13c694ee96c592189743abf5bb44bba..b4097daf20adf58e5cffca9e135222bb43937bf6 100644 --- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ServiceTest.php @@ -43,7 +43,7 @@ class ServiceTest extends \PHPUnit_Framework_TestCase $coreRegistryMock->expects($this->any())->method('registry')->will($this->returnValue(1)); $arguments = ['contentFactory' => $contentFactoryMock, 'coreRegistry' => $coreRegistryMock]; - $this->_model = $this->_helper->getObject('\Magento\GoogleShopping\Model\Service', $arguments); + $this->_model = $this->_helper->getObject('Magento\GoogleShopping\Model\Service', $arguments); } public function testGetService() diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Controller/Adminhtml/Edit/PopupTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Controller/Adminhtml/Edit/PopupTest.php index 9473104ee5d03d322fe2008aaf709cdbbf5b8fd2..cc11f721b5dffaff38f21456f12997f4dc7660b7 100644 --- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Controller/Adminhtml/Edit/PopupTest.php +++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Controller/Adminhtml/Edit/PopupTest.php @@ -45,7 +45,7 @@ class PopupTest extends \PHPUnit_Framework_TestCase $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->action = $this->objectManager->getObject( - '\Magento\GroupedProduct\Controller\Adminhtml\Edit\Popup', + 'Magento\GroupedProduct\Controller\Adminhtml\Edit\Popup', [ 'request' => $this->request, 'factory' => $this->factory, diff --git a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php index 075e79d14d0d808ad55fef52e211ca78d80a66b8..570c7c0db3259713599bd8a7a9b9a858216ad8e4 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php @@ -18,7 +18,7 @@ class ConsumerTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Framework\HTTP\ZendClient */ protected $_httpClientMock; - /** @var \Magento\Integration\Model\Oauth\Token\Factory */ + /** @var \Magento\Integration\Model\Oauth\TokenFactory */ protected $_tokenFactory; /** @var \Magento\Integration\Model\Oauth\Token */ @@ -53,8 +53,8 @@ class ConsumerTest extends \PHPUnit_Framework_TestCase ); $this->_tokenFactory = $this->getMockBuilder( - 'Magento\Integration\Model\Oauth\Token\Factory' - )->disableOriginalConstructor()->getMock(); + 'Magento\Integration\Model\Oauth\TokenFactory' + )->disableOriginalConstructor()->setMethods(['create'])->getMock(); $this->_tokenMock = $this->getMockBuilder( 'Magento\Integration\Model\Oauth\Token' )->disableOriginalConstructor()->getMock(); diff --git a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php index b510a867cd1dfb7ec41d877260bce2ed1d9e16c5..9daf41a124f02c23b61eec6aba6d88e9aebd4590 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php @@ -15,7 +15,7 @@ class OauthTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Integration\Model\Oauth\Nonce\Factory */ private $_nonceFactory; - /** @var \Magento\Integration\Model\Oauth\Token\Factory */ + /** @var \Magento\Integration\Model\Oauth\TokenFactory */ private $_tokenFactory; /** @var \Magento\Integration\Model\Oauth\Consumer */ @@ -76,8 +76,8 @@ class OauthTest extends \PHPUnit_Framework_TestCase 'Magento\Integration\Model\Oauth\Nonce\Factory' )->disableOriginalConstructor()->getMock(); $this->_tokenFactory = $this->getMockBuilder( - 'Magento\Integration\Model\Oauth\Token\Factory' - )->disableOriginalConstructor()->getMock(); + 'Magento\Integration\Model\Oauth\TokenFactory' + )->disableOriginalConstructor()->setMethods(['create'])->getMock(); $this->_tokenMock = $this->getMockBuilder('Magento\Integration\Model\Oauth\Token') ->disableOriginalConstructor() ->setMethods( @@ -122,8 +122,7 @@ class OauthTest extends \PHPUnit_Framework_TestCase $this->_consumerFactory, $this->_tokenFactory, $this->_dataHelperMock, - $this->_dateMock, - $this->_tokenMock + $this->_dateMock ); $this->_oauth = new \Magento\Framework\Oauth\Oauth( $this->_oauthHelperMock, diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php index fd528c328f05bb91b9d299cfb4da014274d45d94..e69c373d7913aef09ca38f785ea8c3ceebd03df1 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php @@ -15,8 +15,8 @@ class AdminTokenServiceTest extends \PHPUnit_Framework_TestCase /** \Magento\Integration\Service\V1\AdminTokenService */ protected $_tokenService; - /** \Magento\Integration\Model\Oauth\Token\Factory|\PHPUnit_Framework_MockObject_MockObject */ - protected $_tokenModelFactoryMock; + /** \Magento\Integration\Model\Oauth\TokenFactory|\PHPUnit_Framework_MockObject_MockObject */ + protected $_tokenFactoryMock; /** \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject */ protected $_userModelMock; @@ -35,10 +35,11 @@ class AdminTokenServiceTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->_tokenModelFactoryMock = $this->getMockBuilder('Magento\Integration\Model\Oauth\Token\Factory') + $this->_tokenFactoryMock = $this->getMockBuilder('Magento\Integration\Model\Oauth\TokenFactory') ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); + $this->_tokenFactoryMock->expects($this->any())->method('create')->will($this->returnValue($this->_tokenMock)); $this->_userModelMock = $this->getMockBuilder('Magento\User\Model\User') ->disableOriginalConstructor() @@ -67,7 +68,7 @@ class AdminTokenServiceTest extends \PHPUnit_Framework_TestCase )->disableOriginalConstructor()->getMock(); $this->_tokenService = new \Magento\Integration\Service\V1\AdminTokenService( - $this->_tokenModelFactoryMock, + $this->_tokenFactoryMock, $this->_userModelMock, $this->_tokenModelCollectionFactoryMock, $this->validatorHelperMock diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php index 5e4581da4527a52cdd266ea432cbdc0be2ce75b3..43704ebb9e04e4930c41fffffe0e5014df174079 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php @@ -15,8 +15,8 @@ class CustomerTokenServiceTest extends \PHPUnit_Framework_TestCase /** \Magento\Integration\Service\V1\CustomerTokenService */ protected $_tokenService; - /** \Magento\Integration\Model\Oauth\Token\Factory|\PHPUnit_Framework_MockObject_MockObject */ - protected $_tokenModelFactoryMock; + /** \Magento\Integration\Model\Oauth\TokenFactory|\PHPUnit_Framework_MockObject_MockObject */ + protected $_tokenFactoryMock; /** \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $_accountManagementMock; @@ -35,10 +35,11 @@ class CustomerTokenServiceTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->_tokenModelFactoryMock = $this->getMockBuilder('Magento\Integration\Model\Oauth\Token\Factory') + $this->_tokenFactoryMock = $this->getMockBuilder('Magento\Integration\Model\Oauth\TokenFactory') ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); + $this->_tokenFactoryMock->expects($this->any())->method('create')->will($this->returnValue($this->_tokenMock)); $this->_accountManagementMock = $this ->getMockBuilder('Magento\Customer\Api\AccountManagementInterface') @@ -68,7 +69,7 @@ class CustomerTokenServiceTest extends \PHPUnit_Framework_TestCase )->disableOriginalConstructor()->getMock(); $this->_tokenService = new \Magento\Integration\Service\V1\CustomerTokenService( - $this->_tokenModelFactoryMock, + $this->_tokenFactoryMock, $this->_accountManagementMock, $this->_tokenModelCollectionFactoryMock, $this->validatorHelperMock diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php index 01ab337946ea3b3bb18beefe1445050c745ff941..ed6d24237386dc6c76a007e874f4b5555074f3b0 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php @@ -41,7 +41,7 @@ class OauthTest extends \PHPUnit_Framework_TestCase private $_consumerData; /** - * @var \Magento\Integration\Model\Oauth\Token\Factory|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Integration\Model\Oauth\TokenFactory|\PHPUnit_Framework_MockObject_MockObject */ private $_tokenFactoryMock; @@ -60,12 +60,13 @@ class OauthTest extends \PHPUnit_Framework_TestCase )->getMock(); $this->_tokenFactoryMock = $this->getMock( - 'Magento\Integration\Model\Oauth\Token\Factory', - [], + 'Magento\Integration\Model\Oauth\TokenFactory', + ['create'], [], '', false ); + $this->_tokenFactoryMock->expects($this->any())->method('create')->will($this->returnValue($this->_tokenMock)); $this->_consumerMock = $this->getMockBuilder( 'Magento\Integration\Model\Oauth\Consumer' )->disableOriginalConstructor()->setMethods( diff --git a/dev/tests/unit/testsuite/Magento/LayeredNavigation/Block/NavigationTest.php b/dev/tests/unit/testsuite/Magento/LayeredNavigation/Block/NavigationTest.php index 20cc60ccd344ad5a59a086ec3e5f9e824b2e7075..4acd06a43f9266237f14c87e04008fc2d2cddc22 100644 --- a/dev/tests/unit/testsuite/Magento/LayeredNavigation/Block/NavigationTest.php +++ b/dev/tests/unit/testsuite/Magento/LayeredNavigation/Block/NavigationTest.php @@ -55,7 +55,7 @@ class NavigationTest extends \PHPUnit_Framework_TestCase $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->model = $objectManager->getObject( - '\Magento\LayeredNavigation\Block\Navigation', + 'Magento\LayeredNavigation\Block\Navigation', [ 'layerResolver' => $layerResolver, 'filterList' => $this->filterListMock, diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php index a16266fae67fb4504886cbe2019dd8f1cb28f505..458b6a186d1a22d73ae01e58835fa48d2371c328 100644 --- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php +++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php @@ -88,7 +88,7 @@ class EditAddressTest extends \PHPUnit_Framework_TestCase $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock); $this->configMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock); $this->viewMock->expects($this->any())->method('getPage')->willReturn($this->pageMock); - $this->controller = $objectManager->getObject('\Magento\Multishipping\Controller\Checkout\Address\EditAddress', + $this->controller = $objectManager->getObject('Magento\Multishipping\Controller\Checkout\Address\EditAddress', ['context' => $contextMock]); } diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php index a6f181262c94c335a14e867e13a624b9efeaafaa..c4dc8081188e5f089f6605145935bfd99bce0600 100644 --- a/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php +++ b/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php @@ -35,7 +35,7 @@ class MethodListTest extends \PHPUnit_Framework_TestCase '\Magento\Payment\Model\Checks\SpecificationFactory', [], [], '', false ); $this->methodList = $this->objectManager->getObject( - '\Magento\Payment\Model\MethodList', + 'Magento\Payment\Model\MethodList', [ 'paymentHelper' => $this->paymentHelperMock, 'specificationFactory' => $this->specificationFactoryMock diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Helper/DataTest.php index 0dee70ce932df811c867b2ebae3126eaec78b1e3..313b4830bb091e73b6118ac1fd874965ec79d02b 100644 --- a/dev/tests/unit/testsuite/Magento/Persistent/Helper/DataTest.php +++ b/dev/tests/unit/testsuite/Magento/Persistent/Helper/DataTest.php @@ -21,7 +21,7 @@ class DataTest extends \PHPUnit_Framework_TestCase $this->_modulesReader = $this->getMock('\Magento\Framework\Module\Dir\Reader', [], [], '', false); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $this->_helper = $objectManager->getObject( - '\Magento\Persistent\Helper\Data', + 'Magento\Persistent\Helper\Data', ['modulesReader' => $this->_modulesReader] ); } diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/Address/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/Address/ValidatorTest.php index d73cf5246be7226c0d2007c5dfcbbb5882824db2..5f65333e6460d09f7c02b14ebdb07d17c940389b 100644 --- a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/Address/ValidatorTest.php +++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/Address/ValidatorTest.php @@ -46,7 +46,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase ->method('create') ->will($this->returnValue($this->countryMock)); $this->model = $objectManager->getObject( - '\Magento\Sales\Model\Quote\Address\Validator', + 'Magento\Sales\Model\Quote\Address\Validator', [ 'countryFactory' => $this->countryFactoryMock, ] diff --git a/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php b/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php index 402783398b25db23bc57a75560326940c8ce81ee..e5293d8bc0174e6548de2005798154c2df90cbc7 100644 --- a/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php +++ b/dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php @@ -24,14 +24,14 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Search\Model\QueryInterface|\PHPUnit_Framework_MockObject_MockObject $searchQuery */ $searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface')->getMockForAbstractClass(); /** @var \Magento\Search\Model\SearchDataProvider $dataProvider */ - $dataProvider = $this->objectManager->getObject('\Magento\Search\Model\SearchDataProvider'); + $dataProvider = $this->objectManager->getObject('Magento\Search\Model\SearchDataProvider'); $this->assertEquals([], $dataProvider->getSearchData($searchQuery)); } public function testIsCountResultsEnabled() { /** @var \Magento\Search\Model\SearchDataProvider $dataProvider */ - $dataProvider = $this->objectManager->getObject('\Magento\Search\Model\SearchDataProvider'); + $dataProvider = $this->objectManager->getObject('Magento\Search\Model\SearchDataProvider'); $this->assertFalse($dataProvider->isCountResultsEnabled()); } } diff --git a/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php b/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php index d9f3f429ca503a86b586e9bba7ee60326b1f950e..16c75ce01c82edecfc83e0992fedcfacba174dc3 100644 --- a/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php +++ b/dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php @@ -26,7 +26,7 @@ class QueryResultTest extends \PHPUnit_Framework_TestCase { /** @var \Magento\Search\Model\QueryResult $queryResult */ $queryResult = $this->objectManager->getObject( - '\Magento\Search\Model\QueryResult', + 'Magento\Search\Model\QueryResult', [ 'queryText' => $queryText, 'resultsCount' => $resultsCount, diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php index ea82acf99e2a3bd683226af3df1de6a2f7619602..636081c0a109cde433cb320f8b1a291812eece7c 100644 --- a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php +++ b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php @@ -134,7 +134,7 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'); $this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false); - $this->_model = $this->helper->getObject('\Magento\Store\Model\StorageFactory', [ + $this->_model = $this->helper->getObject('Magento\Store\Model\StorageFactory', [ 'objectManager' => $this->_objectManagerMock, 'eventManager' => $this->_eventManagerMock, 'sidResolver' => $this->_sidResolverMock, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Block/Adminhtml/Items/Price/RendererTest.php b/dev/tests/unit/testsuite/Magento/Tax/Block/Adminhtml/Items/Price/RendererTest.php index 18c10bb1d60bd4b5d61012cede09632e400415d6..5b3d9405babc3dd864adc053dfd7f0b344547ae5 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Block/Adminhtml/Items/Price/RendererTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Block/Adminhtml/Items/Price/RendererTest.php @@ -46,7 +46,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase ->getMock(); $this->renderer = $objectManager->getObject( - '\Magento\Tax\Block\Adminhtml\Items\Price\Renderer', + 'Magento\Tax\Block\Adminhtml\Items\Price\Renderer', [ 'itemPriceRenderer' => $this->itemPriceRenderer, 'defaultColumnRenderer' => $this->defaultColumnRenderer, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php b/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php index 6ffa098284da3da80c5cab36dc1e7251ebfec193..ae4eb2b7d0e88b7bfddb62b7fd36b927acbdbef9 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php @@ -62,7 +62,7 @@ class TotalsTest extends \PHPUnit_Framework_TestCase ->getMock(); $this->totalsObj = $objectManager->getObject( - '\Magento\Tax\Block\Checkout\Cart\Sidebar\Totals', + 'Magento\Tax\Block\Checkout\Cart\Sidebar\Totals', [ 'checkoutSession' => $checkoutSession, 'taxHelper' => $this->taxHelper, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Shipping/PriceTest.php b/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Shipping/PriceTest.php index 7015ba9a35ed1b9175b5b348d88ce7f2093b4619..c40596a3f0446310d3e0a4f09dc5c7dd74c5710c 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Shipping/PriceTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Shipping/PriceTest.php @@ -68,7 +68,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase ->getMock(); $this->priceObj = $objectManager->getObject( - '\Magento\Tax\Block\Checkout\Shipping\Price', + 'Magento\Tax\Block\Checkout\Shipping\Price', [ 'checkoutSession' => $checkoutSession, 'taxHelper' => $this->taxHelper, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Block/Item/Price/RendererTest.php b/dev/tests/unit/testsuite/Magento/Tax/Block/Item/Price/RendererTest.php index 71da91647762815d31396bacd95e973d0b025960..c209104ed090bace5e5d2acfd37edee8215b3e6b 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Block/Item/Price/RendererTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Block/Item/Price/RendererTest.php @@ -41,7 +41,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase ->getMock(); $this->renderer = $objectManager->getObject( - '\Magento\Tax\Block\Item\Price\Renderer', + 'Magento\Tax\Block\Item\Price\Renderer', [ 'taxHelper' => $this->taxHelper, 'priceCurrency' => $this->priceCurrency, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php index 90f95e6e632c7f4ccd6947647551f0762d6af6c4..4e6228bacccf730e0fa22c3e539637aa3b82d37a 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php @@ -97,7 +97,7 @@ class SubtotalTest extends \PHPUnit_Framework_TestCase $customerAddressRegionBuilderMock->expects($this->any())->method('setRegionId')->willReturnSelf(); $this->model = $this->objectManager->getObject( - '\Magento\Tax\Model\Sales\Total\Quote\Subtotal', + 'Magento\Tax\Model\Sales\Total\Quote\Subtotal', [ 'taxConfig' => $this->taxConfigMock, 'taxCalculationService' => $this->taxCalculationMock, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php index ae53fc86aff0f26875972cf36e422895efba5548..cc67af4a7cf0a00c8e2a8eb8f873779fdef5b768 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php @@ -415,7 +415,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase $objectManager = new ObjectManager($this); $taxTotalsCalcModel = $objectManager->getObject( - '\Magento\Tax\Model\Sales\Total\Quote\Tax', + 'Magento\Tax\Model\Sales\Total\Quote\Tax', ['taxData' => $taxData] ); $array = $taxTotalsCalcModel->processConfigArray([], null); @@ -448,7 +448,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase public function testMapQuoteExtraTaxables($itemData, $addressData) { $objectManager = new ObjectManager($this); - $taxTotalsCalcModel = $objectManager->getObject('\Magento\Tax\Model\Sales\Total\Quote\Tax'); + $taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax'); $taxClassKeyBuilder = $this->getMockBuilder('\Magento\Tax\Api\Data\TaxClassKeyDataBuilder') ->disableOriginalConstructor() @@ -606,7 +606,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase $objectManager = new ObjectManager($this); $taxTotalsCalcModel = $objectManager->getObject( - '\Magento\Tax\Model\Sales\Total\Quote\Tax', + 'Magento\Tax\Model\Sales\Total\Quote\Tax', ['taxConfig' => $taxConfig] ); @@ -695,7 +695,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase public function testGetLabel() { $objectManager = new ObjectManager($this); - $taxTotalsCalcModel = $objectManager->getObject('\Magento\Tax\Model\Sales\Total\Quote\Tax'); + $taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax'); $this->assertSame($taxTotalsCalcModel->getLabel(), __('Tax')); } diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php index 50084d96e69292ff5f8d9ee9881bc85aa15c55aa..3c1574c4186271eb37e60fb3366a3bee64150c80 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php @@ -79,7 +79,7 @@ class TaxCalculationTest extends \PHPUnit_Framework_TestCase $objectManager = new ObjectManager($this); $this->taxCalculationService = $objectManager->getObject( - '\Magento\Tax\Model\TaxCalculation', + 'Magento\Tax\Model\TaxCalculation', [ 'calculation' => $this->calculationTool, 'calculatorFactory' => $this->calculatorFactory, diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Type/CustomerTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Type/CustomerTest.php index ca34e808ece7877f08e80d7274415e7054fa0b7a..bf76b0be065eb1146aa345772996153cbd19a931 100644 --- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Type/CustomerTest.php +++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Type/CustomerTest.php @@ -19,9 +19,9 @@ class CustomerTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue(['randomValue'])); $filterBuilder = $objectManagerHelper - ->getObject('\Magento\Framework\Api\FilterBuilder'); + ->getObject('Magento\Framework\Api\FilterBuilder'); $filterGroupBuilder = $objectManagerHelper - ->getObject('\Magento\Framework\Api\Search\FilterGroupBuilder'); + ->getObject('Magento\Framework\Api\Search\FilterGroupBuilder'); $searchCriteriaBuilder = $objectManagerHelper->getObject( 'Magento\Framework\Api\SearchCriteriaBuilder', [ diff --git a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php index b4d125da73b928ceaf50b757ed8cfacd01099620..1dc15a6e778a90ea2434c1b01314ac7ece524213 100644 --- a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php @@ -49,7 +49,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase ); $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this); $config = $objectManager->getObject( - '\Magento\Translation\Model\Inline\Config', + 'Magento\Translation\Model\Inline\Config', ['scopeConfig' => $scopeConfig] ); $this->assertEquals($result, $config->isActive($store)); diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/RequestTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/RequestTest.php index 6d3700564690eca4a69d12296967efde359db04d..493a58994d7235b3cabea59989b806a1ee0f42f3 100644 --- a/dev/tests/unit/testsuite/Magento/Webapi/Controller/RequestTest.php +++ b/dev/tests/unit/testsuite/Magento/Webapi/Controller/RequestTest.php @@ -29,7 +29,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase $this->cookieReader = $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface'); $this->request = $objectManager->getObject( - '\Magento\Webapi\Controller\Request', + 'Magento\Webapi\Controller\Request', ['cookieReader' => $this->cookieReader] ); } @@ -46,4 +46,4 @@ class RequestTest extends \PHPUnit_Framework_TestCase $this->request->getCookie($key, $default); } -} +} diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/ClassReflectorTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/ClassReflectorTest.php index 30fdab7a8ccdc3841d89167a02f17f5838d08cff..498df37e372c3550fc957759b153d050ae2af8c0 100644 --- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/ClassReflectorTest.php +++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/ClassReflectorTest.php @@ -66,7 +66,9 @@ class ClassReflectorTest extends \PHPUnit_Framework_TestCase protected function _getSampleReflectionData() { return [ - 'documentation' => 'Basic random string generator', + 'documentation' => + 'Basic random string generator. This line is short description '. + 'This line is long description. This is still the long description.', 'interface' => [ 'in' => [ 'parameters' => [ diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/TestServiceForClassReflector.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/TestServiceForClassReflector.php index f3f25ccb5f4a0b586a75481da0acf7a6a43f5567..cce8322bdafeac9b3fb818537d96d7590ec096f2 100644 --- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/TestServiceForClassReflector.php +++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Config/TestServiceForClassReflector.php @@ -7,7 +7,10 @@ namespace Magento\Webapi\Model\Config; class TestServiceForClassReflector { /** - * Basic random string generator + * Basic random string generator. This line is short description + * This line is long description. + * + * This is still the long description. * * @param int $length length of the random string * @return string random string diff --git a/dev/tests/unit/testsuite/Magento/Weee/Block/Item/Price/RendererTest.php b/dev/tests/unit/testsuite/Magento/Weee/Block/Item/Price/RendererTest.php index af86ba438236e76645a6822fc4a3f15165716c98..b8facece366fca5254ea4fe3e20a5d4ca50e49dc 100644 --- a/dev/tests/unit/testsuite/Magento/Weee/Block/Item/Price/RendererTest.php +++ b/dev/tests/unit/testsuite/Magento/Weee/Block/Item/Price/RendererTest.php @@ -78,7 +78,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue(self::STORE_ID)); $this->renderer = $objectManager->getObject( - '\Magento\Weee\Block\Item\Price\Renderer', + 'Magento\Weee\Block\Item\Price\Renderer', [ 'weeeHelper' => $this->weeeHelper, 'priceCurrency' => $this->priceCurrency, diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/WishlistProviderTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/WishlistProviderTest.php index c90f955d1c4adf994ea925b86979d014f4e897e9..5899fd32805bb3ceb08a1269587d7b0bb8acde1b 100644 --- a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/WishlistProviderTest.php +++ b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/WishlistProviderTest.php @@ -73,7 +73,7 @@ class WishlistProviderTest extends \PHPUnit_Framework_TestCase ); $this->wishlistProvider = $objectManager->getObject( - '\Magento\Wishlist\Controller\WishlistProvider', + 'Magento\Wishlist\Controller\WishlistProvider', [ 'request' => $this->request, 'wishlistFactory' => $this->wishlistFactory, diff --git a/dev/tools/Magento/Tools/Migration/aliases_map/composite_modules_ce.php b/dev/tools/Magento/Tools/Migration/aliases_map/composite_modules_ce.php index 4ca5ea24754a9243bdbaa27e1a49ba5366396bce..87a7483bde923a3e87bd5f0479a927652d090489 100644 --- a/dev/tools/Magento/Tools/Migration/aliases_map/composite_modules_ce.php +++ b/dev/tools/Magento/Tools/Migration/aliases_map/composite_modules_ce.php @@ -18,4 +18,4 @@ require_once realpath( ) . '/app/code/Magento/Core/Model/Resource/Setup/Migration.php'; $objectManager = new \Magento\Framework\App\ObjectManager(); -return $objectManager->create('\Magento\Framework\Module\Setup\Migration')->getCompositeModules(); +return $objectManager->create('Magento\Framework\Module\Setup\Migration')->getCompositeModules(); diff --git a/dev/tools/performance-toolkit/fixtures/cart_price_rules.php b/dev/tools/performance-toolkit/fixtures/cart_price_rules.php index 66cd24c33ad5c354687e2c56e03164569748573d..64fe5341887dc938a113bb97599993facfac0083 100644 --- a/dev/tools/performance-toolkit/fixtures/cart_price_rules.php +++ b/dev/tools/performance-toolkit/fixtures/cart_price_rules.php @@ -8,7 +8,7 @@ $cartPriceRulesProductsFloor = \Magento\ToolkitFramework\Config::getInstance()-> $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); /** @var $model \Magento\SalesRule\Model\Rule*/ diff --git a/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php b/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php index 626946cef99646c5dbe67f66b8424a7e7f0a1528..ab5c33e6a078431506f81a74f74fb7edbbcdf4bc 100644 --- a/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php +++ b/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php @@ -7,7 +7,7 @@ $catalogPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getVa $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); /** @var $model \Magento\CatalogRule\Model\Rule*/ diff --git a/dev/tools/performance-toolkit/fixtures/categories.php b/dev/tools/performance-toolkit/fixtures/categories.php index f25a56829e44833bc8ccc8eed53a4261711b8578..c01e7090464c03d4df13f9696e148bcb58e55b33 100644 --- a/dev/tools/performance-toolkit/fixtures/categories.php +++ b/dev/tools/performance-toolkit/fixtures/categories.php @@ -8,7 +8,7 @@ $maxNestingLevel = \Magento\ToolkitFramework\Config::getInstance()->getValue('ca $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->create('Magento\Catalog\Model\Category'); diff --git a/dev/tools/performance-toolkit/fixtures/configurable_products.php b/dev/tools/performance-toolkit/fixtures/configurable_products.php index 657a94b58694bd95adac0344270df4fb3ee711fb..49a2f6574bd87217aeebe870e04a5fea180c6b3e 100644 --- a/dev/tools/performance-toolkit/fixtures/configurable_products.php +++ b/dev/tools/performance-toolkit/fixtures/configurable_products.php @@ -7,7 +7,7 @@ $configurablesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue( $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); diff --git a/dev/tools/performance-toolkit/fixtures/customers.php b/dev/tools/performance-toolkit/fixtures/customers.php index 195e7ff6b00d7b6c9b28d52d033d78d38dfda7ac..0932c543886d025a8c71e1a7fdc74c512a23f83b 100644 --- a/dev/tools/performance-toolkit/fixtures/customers.php +++ b/dev/tools/performance-toolkit/fixtures/customers.php @@ -7,7 +7,7 @@ $customersNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('cu $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); /** @var $defaultStoreView \Magento\Store\Model\Store */ diff --git a/dev/tools/performance-toolkit/fixtures/eav_variations.php b/dev/tools/performance-toolkit/fixtures/eav_variations.php index e3f307a2ec678ed8988aae3a18823b2309f84b05..76e30a453a832d27e4579bf6024f33694a49e2e0 100644 --- a/dev/tools/performance-toolkit/fixtures/eav_variations.php +++ b/dev/tools/performance-toolkit/fixtures/eav_variations.php @@ -11,7 +11,7 @@ $model = $this->getObjectManager()->create('Magento\Catalog\Model\Resource\Eav\A /* @var $helper \Magento\Catalog\Helper\Product */ $helper = $this->getObjectManager()->get('Magento\Catalog\Helper\Product'); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); $stores = $storeManager->getStores(); $storeViewsCount = count($stores); diff --git a/dev/tools/performance-toolkit/fixtures/simple_products.php b/dev/tools/performance-toolkit/fixtures/simple_products.php index 755623b780ccb3f8490fe49f1e186e21bffc0790..ea54c518c1c5dbce9c3cddb6141f28f38f728130 100644 --- a/dev/tools/performance-toolkit/fixtures/simple_products.php +++ b/dev/tools/performance-toolkit/fixtures/simple_products.php @@ -7,7 +7,7 @@ $simpleProductsCount = \Magento\ToolkitFramework\Config::getInstance()->getValue $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->get('Magento\Catalog\Model\Category'); diff --git a/dev/tools/performance-toolkit/fixtures/stores.php b/dev/tools/performance-toolkit/fixtures/stores.php index c2b932c846b5ac517ad06d07da89208f8247f02f..d58463ac2d9ad39169fb9960cee384bee0577d09 100644 --- a/dev/tools/performance-toolkit/fixtures/stores.php +++ b/dev/tools/performance-toolkit/fixtures/stores.php @@ -9,7 +9,7 @@ $storesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('store_ $this->resetObjectManager(); /** @var \Magento\Store\Model\StoreManager $storeManager */ -$storeManager = $this->getObjectManager()->create('\Magento\Store\Model\StoreManager'); +$storeManager = $this->getObjectManager()->create('Magento\Store\Model\StoreManager'); /** @var $category \Magento\Catalog\Model\Category */ $category = $this->getObjectManager()->create('Magento\Catalog\Model\Category'); diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php index 901eded854db02ecca7352a62281b0c2f523de00..8756180f16b5b1a3250bb04b7acce6f496380d25 100644 --- a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php +++ b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php @@ -157,7 +157,7 @@ class TypeProcessor } $reflection = new ClassReflection($class); $docBlock = $reflection->getDocBlock(); - $this->_types[$typeName]['documentation'] = $docBlock ? $this->_getDescription($docBlock) : ''; + $this->_types[$typeName]['documentation'] = $docBlock ? $this->getDescription($docBlock) : ''; /** @var \Zend\Code\Reflection\MethodReflection $methodReflection */ foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $methodReflection) { if ($methodReflection->class === "Magento\Framework\Model\AbstractModel") { @@ -200,7 +200,7 @@ class TypeProcessor * @param \Zend\Code\Reflection\DocBlockReflection $doc * @return string */ - protected function _getDescription(\Zend\Code\Reflection\DocBlockReflection $doc) + public function getDescription(\Zend\Code\Reflection\DocBlockReflection $doc) { $shortDescription = $doc->getShortDescription(); $longDescription = $doc->getLongDescription(); diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php index be11aaf87c0475008cdd5858154b1b2c1ce84e69..67737e0c191b48f5fb12ff8c4a6a95a8ad09540b 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php @@ -43,7 +43,7 @@ class AggregationFactory ] ); } - return $this->objectManager->create('\Magento\Framework\Search\Response\Aggregation', ['buckets' => $buckets]); + return $this->objectManager->create('Magento\Framework\Search\Response\Aggregation', ['buckets' => $buckets]); } /** diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php index 5088c01d6e5e5eed0c6975b4988f9ca9e2168250..0f96fb6a5aacadc84c0ed34236ab3ff8cfd916c0 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php @@ -49,11 +49,11 @@ class DocumentFactory if ($rawField['name'] == $entityId) { $documentId = $rawField['value']; } else { - $fields[] = $this->objectManager->create('\Magento\Framework\Search\DocumentField', $rawField); + $fields[] = $this->objectManager->create('Magento\Framework\Search\DocumentField', $rawField); } } return $this->objectManager->create( - '\Magento\Framework\Search\Document', + 'Magento\Framework\Search\Document', ['documentFields' => $fields, 'documentId' => $documentId] ); } diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php index dcc8e1b08f4ade78722f2ed2429715f7caf1afd1..7a79ca11e61ca4ef2bcbe620492b78c2f409b9e6 100644 --- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php +++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php @@ -62,7 +62,7 @@ class ResponseFactory /** @var \Magento\Framework\Search\Response\Aggregation $aggregations */ $aggregations = $this->aggregationFactory->create($rawResponse['aggregations']); return $this->objectManager->create( - '\Magento\Framework\Search\Response\QueryResponse', + 'Magento\Framework\Search\Response\QueryResponse', [ 'documents' => $documents, 'aggregations' => $aggregations diff --git a/pub/errors/processorFactory.php b/pub/errors/processorFactory.php index ba61ce6a9fa5b77f973d2a72b09d04f13810c269..62b5330f8052c7488db8acb2994119a1a760cefc 100644 --- a/pub/errors/processorFactory.php +++ b/pub/errors/processorFactory.php @@ -21,7 +21,7 @@ class ProcessorFactory { $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER); $objectManager = $objectManagerFactory->create($_SERVER); - $response = $objectManager->create('\Magento\Framework\App\Response\Http'); + $response = $objectManager->create('Magento\Framework\App\Response\Http'); return new Processor($response); } }