From 2cee73ff7b3dabbcc13326f5bf22b5572cbd438b Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:19:31 +0100 Subject: [PATCH 1/9] Use class name resolution to reference class names --- .../Magento/Framework/Controller/ResultFactory.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/internal/Magento/Framework/Controller/ResultFactory.php b/lib/internal/Magento/Framework/Controller/ResultFactory.php index db78cf29c6301..1543368a9dd82 100644 --- a/lib/internal/Magento/Framework/Controller/ResultFactory.php +++ b/lib/internal/Magento/Framework/Controller/ResultFactory.php @@ -30,12 +30,12 @@ class ResultFactory * @var array */ protected $typeMap = [ - self::TYPE_JSON => 'Magento\Framework\Controller\Result\Json', - self::TYPE_RAW => 'Magento\Framework\Controller\Result\Raw', - self::TYPE_REDIRECT => 'Magento\Framework\Controller\Result\Redirect', - self::TYPE_FORWARD => 'Magento\Framework\Controller\Result\Forward', - self::TYPE_LAYOUT => 'Magento\Framework\View\Result\Layout', - self::TYPE_PAGE => 'Magento\Framework\View\Result\Page', + self::TYPE_JSON => Result\Json::class, + self::TYPE_RAW => Result\Raw::class, + self::TYPE_REDIRECT => Result\Redirect::class, + self::TYPE_FORWARD => Result\Forward::class, + self::TYPE_LAYOUT => \Magento\Framework\View\Result\Layout::class, + self::TYPE_PAGE => \Magento\Framework\View\Result\Page::class, ]; /** From 1f3155ad6c93e81c3fb46acb85e4574b8d0168b5 Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:31:01 +0100 Subject: [PATCH 2/9] Use class resolution when referencing class names --- lib/internal/Magento/Framework/AclFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/AclFactory.php b/lib/internal/Magento/Framework/AclFactory.php index 3e9839830049d..a48000fbdd33c 100644 --- a/lib/internal/Magento/Framework/AclFactory.php +++ b/lib/internal/Magento/Framework/AclFactory.php @@ -31,6 +31,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan */ public function create() { - return $this->_objectManager->create('Magento\Framework\Acl'); + return $this->_objectManager->create(Acl::class); } } From d1dc6587ea834058cde6c0b2964091fdaf336c04 Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:32:14 +0100 Subject: [PATCH 3/9] Use class name resolution when referencing classes --- lib/internal/Magento/Framework/ValidatorFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/ValidatorFactory.php b/lib/internal/Magento/Framework/ValidatorFactory.php index 6ec20b8487358..6202a8b52cf3c 100644 --- a/lib/internal/Magento/Framework/ValidatorFactory.php +++ b/lib/internal/Magento/Framework/ValidatorFactory.php @@ -10,7 +10,7 @@ */ class ValidatorFactory { - const DEFAULT_INSTANCE_NAME = 'Magento\Framework\Validator'; + const DEFAULT_INSTANCE_NAME = Validator::class; /** * Object Manager instance From 55a808cbb4a9ae8aabe79362aaa9a18cb8f102ab Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:32:59 +0100 Subject: [PATCH 4/9] Use class name resolution when referencing classes --- lib/internal/Magento/Framework/FlagFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/FlagFactory.php b/lib/internal/Magento/Framework/FlagFactory.php index 99aa8d0047d19..fcd066591a061 100644 --- a/lib/internal/Magento/Framework/FlagFactory.php +++ b/lib/internal/Magento/Framework/FlagFactory.php @@ -32,7 +32,7 @@ class FlagFactory */ public function __construct( \Magento\Framework\ObjectManagerInterface $objectManager, - $instanceName = 'Magento\Framework\Flag' + $instanceName = Flag::class ) { $this->_objectManager = $objectManager; $this->_instanceName = $instanceName; From 39e523f1a3a3be8d18089d87cfa62391cf504e93 Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:33:32 +0100 Subject: [PATCH 5/9] Use class name resolution when referencing classes --- lib/internal/Magento/Framework/EventFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/EventFactory.php b/lib/internal/Magento/Framework/EventFactory.php index 47433049bac1b..e73cb8b96a094 100644 --- a/lib/internal/Magento/Framework/EventFactory.php +++ b/lib/internal/Magento/Framework/EventFactory.php @@ -26,6 +26,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan */ public function create($arguments = []) { - return $this->_objectManager->create('Magento\Framework\Event', $arguments); + return $this->_objectManager->create(Event::class, $arguments); } } From cc28d474dea7c02ed1b7457767add577ecee8931 Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:34:24 +0100 Subject: [PATCH 6/9] Use class name resolution when referencing classes --- lib/internal/Magento/Framework/CurrencyFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/CurrencyFactory.php b/lib/internal/Magento/Framework/CurrencyFactory.php index a1a126aecd1f9..0c734627ddfda 100644 --- a/lib/internal/Magento/Framework/CurrencyFactory.php +++ b/lib/internal/Magento/Framework/CurrencyFactory.php @@ -24,7 +24,7 @@ class CurrencyFactory * @param \Magento\Framework\ObjectManagerInterface $objectManager * @param string $instanceName */ - public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = 'Magento\Framework\CurrencyInterface') + public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = CurrencyInterface::class) { $this->_objectManager = $objectManager; $this->_instanceName = $instanceName; From 2bcf7a67f78d378eb43c4eafceb79ea86a74b920 Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:35:32 +0100 Subject: [PATCH 7/9] Shorten unnecessary fully-qualified class names --- lib/internal/Magento/Framework/CurrencyFactory.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/CurrencyFactory.php b/lib/internal/Magento/Framework/CurrencyFactory.php index 0c734627ddfda..1f87858182d0e 100644 --- a/lib/internal/Magento/Framework/CurrencyFactory.php +++ b/lib/internal/Magento/Framework/CurrencyFactory.php @@ -11,7 +11,7 @@ class CurrencyFactory { /** - * @var \Magento\Framework\ObjectManagerInterface + * @var ObjectManagerInterface */ protected $_objectManager = null; @@ -21,10 +21,10 @@ class CurrencyFactory protected $_instanceName = null; /** - * @param \Magento\Framework\ObjectManagerInterface $objectManager + * @param ObjectManagerInterface $objectManager * @param string $instanceName */ - public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = CurrencyInterface::class) + public function __construct(ObjectManagerInterface $objectManager, $instanceName = CurrencyInterface::class) { $this->_objectManager = $objectManager; $this->_instanceName = $instanceName; @@ -34,7 +34,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan * Create class instance with specified parameters * * @param array $data - * @return \Magento\Framework\CurrencyInterface + * @return CurrencyInterface */ public function create(array $data = []) { From 85938f908c4290e83a658a5db5e352452e2a32e8 Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:36:17 +0100 Subject: [PATCH 8/9] Use class name resolution when referencing classes --- lib/internal/Magento/Framework/UrlFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/UrlFactory.php b/lib/internal/Magento/Framework/UrlFactory.php index f3e65d808ca58..7618eea54259f 100644 --- a/lib/internal/Magento/Framework/UrlFactory.php +++ b/lib/internal/Magento/Framework/UrlFactory.php @@ -24,7 +24,7 @@ class UrlFactory * @param \Magento\Framework\ObjectManagerInterface $objectManager * @param string $instanceName */ - public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = 'Magento\Framework\UrlInterface') + public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = UrlInterface::class) { $this->_objectManager = $objectManager; $this->_instanceName = $instanceName; From 2ff5b078e7d3f4dd71afd0112ffba11f33f2786b Mon Sep 17 00:00:00 2001 From: Josh Di Fabio Date: Wed, 21 Oct 2015 15:36:54 +0100 Subject: [PATCH 9/9] Shorten unnecessary fully-qualified class names --- lib/internal/Magento/Framework/UrlFactory.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/UrlFactory.php b/lib/internal/Magento/Framework/UrlFactory.php index 7618eea54259f..65c7d55f1aac5 100644 --- a/lib/internal/Magento/Framework/UrlFactory.php +++ b/lib/internal/Magento/Framework/UrlFactory.php @@ -11,7 +11,7 @@ class UrlFactory { /** - * @var \Magento\Framework\ObjectManagerInterface + * @var ObjectManagerInterface */ protected $_objectManager = null; @@ -21,10 +21,10 @@ class UrlFactory protected $_instanceName = null; /** - * @param \Magento\Framework\ObjectManagerInterface $objectManager + * @param ObjectManagerInterface $objectManager * @param string $instanceName */ - public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = UrlInterface::class) + public function __construct(ObjectManagerInterface $objectManager, $instanceName = UrlInterface::class) { $this->_objectManager = $objectManager; $this->_instanceName = $instanceName; @@ -34,7 +34,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan * Create Url instance with specified parameters * * @param array $data - * @return \Magento\Framework\UrlInterface + * @return UrlInterface */ public function create(array $data = []) {