MAGETWO-51858: Convert literal class names to \Namespace\Classname::c…

…lass
magento · Apr 29, 2016 · e5df4bc · e5df4bc
1 parent 1dd0cde
commit e5df4bc
Show file tree

Hide file tree

Showing 396 changed files with 3,016 additions and 2,468 deletions.
diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
@@ -118,7 +118,7 @@ public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id
             $this->_configCacheType->save(serialize($options), $cacheKey);
         }
         $html = $this->getLayout()->createBlock(
-            'Magento\Framework\View\Element\Html\Select'
+            \Magento\Framework\View\Element\Html\Select::class
         )->setName(
             $name
         )->setId(
@@ -166,7 +166,7 @@ public function getRegionHtmlSelect()
             $this->_configCacheType->save(serialize($options), $cacheKey);
         }
         $html = $this->getLayout()->createBlock(
-            'Magento\Framework\View\Element\Html\Select'
+            \Magento\Framework\View\Element\Html\Select::class
         )->setName(
             'region'
         )->setTitle(

diff --git a/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php b/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php
@@ -20,7 +20,7 @@ public function execute()
         $countryId = $this->getRequest()->getParam('parent');
         if (!empty($countryId)) {
             $arrRegions = $this->_objectManager->create(
-                'Magento\Directory\Model\ResourceModel\Region\Collection'
+                \Magento\Directory\Model\ResourceModel\Region\Collection::class
             )->addCountryFilter(
                 $countryId
             )->load()->toOptionArray();
@@ -32,7 +32,7 @@ public function execute()
             }
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Framework\Json\Helper\Data')->jsonEncode($arrRes)
+            $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($arrRes)
         );
     }
 }
diff --git a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
@@ -14,7 +14,7 @@ class SwitchAction extends \Magento\Framework\App\Action\Action
     public function execute()
     {
         /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
-        $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+        $storeManager = $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
         $currency = (string)$this->getRequest()->getParam('currency');
         if ($currency) {
             $storeManager->getStore()->setCurrentCurrencyCode($currency);

diff --git a/app/code/Magento/Directory/Model/Country.php b/app/code/Magento/Directory/Model/Country.php
@@ -69,7 +69,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\ResourceModel\Country');
+        $this->_init(\Magento\Directory\Model\ResourceModel\Country::class);
     }
 
     /**

diff --git a/app/code/Magento/Directory/Model/Country/Format.php b/app/code/Magento/Directory/Model/Country/Format.php
@@ -26,6 +26,6 @@ class Format extends \Magento\Framework\Model\AbstractModel
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\ResourceModel\Country\Format');
+        $this->_init(\Magento\Directory\Model\ResourceModel\Country\Format::class);
     }
 }
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/Config/Reader.php b/app/code/Magento/Directory/Model/Country/Postcode/Config/Reader.php
@@ -26,7 +26,7 @@ public function __construct(
         \Magento\Framework\Config\ValidationStateInterface $validationState,
         $fileName = 'zip_codes.xml',
         $idAttributes = [],
-        $domDocumentClass = 'Magento\Framework\Config\Dom',
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
         $defaultScope = 'global'
     ) {
         parent::__construct(

diff --git a/app/code/Magento/Directory/Model/CountryFactory.php b/app/code/Magento/Directory/Model/CountryFactory.php
@@ -34,6 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      */
     public function create(array $arguments = [])
     {
-        return $this->_objectManager->create('Magento\Directory\Model\Country', $arguments, false);
+        return $this->_objectManager->create(\Magento\Directory\Model\Country::class, $arguments, false);
     }
 }
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
@@ -109,7 +109,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\ResourceModel\Currency');
+        $this->_init(\Magento\Directory\Model\ResourceModel\Currency::class);
     }
 
     /**

diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
@@ -97,7 +97,7 @@ private function getHttpClientFactory()
     {
         if ($this->httpClientFactory === null) {
             $this->httpClientFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get('Magento\Framework\HTTP\ZendClientFactory');
+                ->get(\Magento\Framework\HTTP\ZendClientFactory::class);
         }
         return $this->httpClientFactory;
     }

diff --git a/app/code/Magento/Directory/Model/Region.php b/app/code/Magento/Directory/Model/Region.php
@@ -28,7 +28,7 @@ class Region extends \Magento\Framework\Model\AbstractModel
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\ResourceModel\Region');
+        $this->_init(\Magento\Directory\Model\ResourceModel\Region::class);
     }
 
     /**

diff --git a/app/code/Magento/Directory/Model/RegionFactory.php b/app/code/Magento/Directory/Model/RegionFactory.php
@@ -34,6 +34,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      */
     public function create(array $arguments = [])
     {
-        return $this->_objectManager->create('Magento\Directory\Model\Region', $arguments);
+        return $this->_objectManager->create(\Magento\Directory\Model\Region::class, $arguments);
     }
 }
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -115,7 +115,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\Country', 'Magento\Directory\Model\ResourceModel\Country');
+        $this->_init(\Magento\Directory\Model\Country::class, \Magento\Directory\Model\ResourceModel\Country::class);
     }
 
     /**

diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Format/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Format/Collection.php
@@ -19,7 +19,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\Country\Format', 'Magento\Directory\Model\ResourceModel\Country\Format');
+        $this->_init(
+            \Magento\Directory\Model\Country\Format::class,
+            \Magento\Directory\Model\ResourceModel\Country\Format::class
+        );
     }
 
     /**

diff --git a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
@@ -59,7 +59,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Magento\Directory\Model\Region', 'Magento\Directory\Model\ResourceModel\Region');
+        $this->_init(\Magento\Directory\Model\Region::class, \Magento\Directory\Model\ResourceModel\Region::class);
 
         $this->_countryTable = $this->getTable('directory_country');
         $this->_regionNameTable = $this->getTable('directory_country_region_name');

diff --git a/app/code/Magento/Directory/Test/Unit/Block/CurrencyTest.php b/app/code/Magento/Directory/Test/Unit/Block/CurrencyTest.php
@@ -26,7 +26,7 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->urlBuilder = $this->getMock(
-            '\Magento\Framework\UrlInterface',
+            \Magento\Framework\UrlInterface::class,
             [],
             [],
             '',
@@ -36,7 +36,7 @@ protected function setUp()
 
         /** @var \Magento\Framework\View\Element\Template\Context $context */
         $context = $this->getMock(
-            '\Magento\Framework\View\Element\Template\Context',
+            \Magento\Framework\View\Element\Template\Context::class,
             ['getUrlBuilder'],
             [],
             '',
@@ -45,11 +45,11 @@ protected function setUp()
         $context->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilder));
 
         /** @var \Magento\Directory\Model\CurrencyFactory $currencyFactory */
-        $currencyFactory = $this->getMock('\Magento\Directory\Model\CurrencyFactory', [], [], '', false);
-        $this->postDataHelper = $this->getMock('Magento\Framework\Data\Helper\PostHelper', [], [], '', false);
+        $currencyFactory = $this->getMock(\Magento\Directory\Model\CurrencyFactory::class, [], [], '', false);
+        $this->postDataHelper = $this->getMock(\Magento\Framework\Data\Helper\PostHelper::class, [], [], '', false);
 
         /** @var \Magento\Framework\Locale\ResolverInterface $localeResolver */
-        $localeResolver = $this->getMock('\Magento\Framework\Locale\ResolverInterface', [], [], '', false);
+        $localeResolver = $this->getMock(\Magento\Framework\Locale\ResolverInterface::class, [], [], '', false);
 
         $this->object = new \Magento\Directory\Block\Currency(
             $context,

diff --git a/app/code/Magento/Directory/Test/Unit/Block/DataTest.php b/app/code/Magento/Directory/Test/Unit/Block/DataTest.php
@@ -64,19 +64,19 @@ protected function setUp()
     {
         $this->prepareContext();
 
-        $this->helperData = $this->getMockBuilder('Magento\Directory\Helper\Data')
+        $this->helperData = $this->getMockBuilder(\Magento\Directory\Helper\Data::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->jsonEncoder = $this->getMockBuilder('Magento\Framework\Json\EncoderInterface')
+        $this->jsonEncoder = $this->getMockBuilder(\Magento\Framework\Json\EncoderInterface::class)
             ->getMockForAbstractClass();
 
-        $this->cacheTypeConfig = $this->getMockBuilder('Magento\Framework\App\Cache\Type\Config')
+        $this->cacheTypeConfig = $this->getMockBuilder(\Magento\Framework\App\Cache\Type\Config::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->regionCollectionFactory = $this->getMockBuilder(
-            'Magento\Directory\Model\ResourceModel\Region\CollectionFactory'
+            \Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class
         )
             ->disableOriginalConstructor()
             ->getMock();
@@ -95,24 +95,24 @@ protected function setUp()
 
     protected function prepareContext()
     {
-        $this->store = $this->getMockBuilder('Magento\Store\Model\Store')
+        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->getMockForAbstractClass();
 
-        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
             ->getMockForAbstractClass();
 
         $this->storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($this->store);
 
-        $this->layout = $this->getMockBuilder('Magento\Framework\View\LayoutInterface')
+        $this->layout = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)
             ->getMockForAbstractClass();
 
-        $this->context = $this->getMockBuilder('Magento\Framework\View\Element\Template\Context')
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -131,12 +131,12 @@ protected function prepareContext()
 
     protected function prepareCountryCollection()
     {
-        $this->countryCollection = $this->getMockBuilder('Magento\Directory\Model\ResourceModel\Country\Collection')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->countryCollection = $this->getMockBuilder(
+            \Magento\Directory\Model\ResourceModel\Country\Collection::class
+        )->disableOriginalConstructor()->getMock();
 
         $this->countryCollectionFactory = $this->getMockBuilder(
-            'Magento\Directory\Model\ResourceModel\Country\CollectionFactory'
+            \Magento\Directory\Model\ResourceModel\Country\CollectionFactory::class
         )
             ->disableOriginalConstructor()
             ->setMethods([
@@ -283,7 +283,7 @@ protected function mockElementHtmlSelect($defaultCountry, $options, $resultHtml)
         $id = 'country';
         $title = 'Country';
 
-        $elementHtmlSelect = $this->getMockBuilder('Magento\Framework\View\Element\Html\Select')
+        $elementHtmlSelect = $this->getMockBuilder(\Magento\Framework\View\Element\Html\Select::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setName',

diff --git a/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php b/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Directory\Helper\Data;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -42,31 +45,31 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
+        $this->scopeConfigMock = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $context = $this->getMock(\Magento\Framework\App\Helper\Context::class, [], [], '', false);
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
 
-        $configCacheType = $this->getMock('Magento\Framework\App\Cache\Type\Config', [], [], '', false);
+        $configCacheType = $this->getMock(\Magento\Framework\App\Cache\Type\Config::class, [], [], '', false);
 
         $this->_countryCollection = $this->getMock(
-            'Magento\Directory\Model\ResourceModel\Country\Collection',
+            \Magento\Directory\Model\ResourceModel\Country\Collection::class,
             [],
             [],
             '',
             false
         );
 
         $this->_regionCollection = $this->getMock(
-            'Magento\Directory\Model\ResourceModel\Region\Collection',
+            \Magento\Directory\Model\ResourceModel\Region\Collection::class,
             [],
             [],
             '',
             false
         );
         $regCollectionFactory = $this->getMock(
-            'Magento\Directory\Model\ResourceModel\Region\CollectionFactory',
+            \Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class,
             ['create'],
             [],
             '',
@@ -80,13 +83,13 @@ protected function setUp()
             $this->returnValue($this->_regionCollection)
         );
 
-        $this->jsonHelperMock = $this->getMock('Magento\Framework\Json\Helper\Data', [], [], '', false);
+        $this->jsonHelperMock = $this->getMock(\Magento\Framework\Json\Helper\Data::class, [], [], '', false);
 
-        $this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+        $this->_store = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
+        $storeManager = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class, [], [], '', false);
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->_store));
 
-        $currencyFactory = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
+        $currencyFactory = $this->getMock(\Magento\Directory\Model\CurrencyFactory::class, [], [], '', false);
 
         $arguments = [
             'context' => $context,
@@ -97,7 +100,7 @@ protected function setUp()
             'storeManager' => $storeManager,
             'currencyFactory' => $currencyFactory,
         ];
-        $this->_object = $objectManager->getObject('Magento\Directory\Helper\Data', $arguments);
+        $this->_object = $objectManager->getObject(\Magento\Directory\Helper\Data::class, $arguments);
     }
 
     public function testGetRegionJson()
@@ -248,7 +251,7 @@ public function testGetCountryCollection()
             $this->returnValue(0)
         );
 
-        $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+        $store = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
         $this->_countryCollection->expects(
             $this->once()
         )->method(

diff --git a/app/code/Magento/Directory/Test/Unit/Model/Config/Source/AllRegionTest.php b/app/code/Magento/Directory/Test/Unit/Model/Config/Source/AllRegionTest.php
@@ -27,11 +27,12 @@ protected function setUp()
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $countryCollectionFactory = $this->getMockBuilder(
-            'Magento\Directory\Model\ResourceModel\Country\CollectionFactory'
+            \Magento\Directory\Model\ResourceModel\Country\CollectionFactory::class
         )->setMethods(['create', '__wakeup', '__sleep'])->disableOriginalConstructor()->getMock();
 
-        $this->countryCollection = $this->getMockBuilder('Magento\Directory\Model\ResourceModel\Country\Collection')
-            ->setMethods(['load', 'toOptionArray', '__wakeup', '__sleep'])
+        $this->countryCollection = $this->getMockBuilder(
+            \Magento\Directory\Model\ResourceModel\Country\Collection::class
+        )->setMethods(['load', 'toOptionArray', '__wakeup', '__sleep'])
             ->disableOriginalConstructor()
             ->getMock();
         $countryCollectionFactory->expects($this->once())
@@ -42,9 +43,9 @@ protected function setUp()
             ->will($this->returnSelf());
 
         $regionCollectionFactory = $this->getMockBuilder(
-            'Magento\Directory\Model\ResourceModel\Region\CollectionFactory'
+            \Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class
         )->disableOriginalConstructor()->setMethods(['create', '__wakeup', '__sleep'])->getMock();
-        $this->regionCollection = $this->getMockBuilder('Magento\Directory\Model\ResourceModel\Region\Collection')
+        $this->regionCollection = $this->getMockBuilder(\Magento\Directory\Model\ResourceModel\Region\Collection::class)
             ->disableOriginalConstructor()
             ->setMethods(['load', 'getIterator', '__wakeup', '__sleep'])
             ->getMock();
@@ -56,7 +57,7 @@ protected function setUp()
             ->will($this->returnValue($this->regionCollection));
 
         $this->model = $objectManagerHelper->getObject(
-            'Magento\Directory\Model\Config\Source\Allregion',
+            \Magento\Directory\Model\Config\Source\Allregion::class,
             [
                 'countryCollectionFactory' => $countryCollectionFactory,
                 'regionCollectionFactory' => $regionCollectionFactory
@@ -200,7 +201,7 @@ private function generateCountry($countryLabel, $countryValue)
      */
     private function generateRegion($countryId, $id, $defaultName)
     {
-        $region = $this->getMockBuilder('Magento\Directory\Model\Region')
+        $region = $this->getMockBuilder(\Magento\Directory\Model\Region::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCountryId', 'getId', 'getDefaultName', '__wakeup', '__sleep'])
             ->getMock();