MAGETWO-32366: Move Core\Helper\Url to Framework

Dale Sikkema · Dale Sikkema · commit 31f128126e93 · 2015-02-27T16:48:25.000-06:00
- move to Helper/Data
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -13,18 +13,18 @@
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * @var \Magento\Framework\Url\Helper
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Framework\Url\Helper $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Url\Helper $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         array $data = []
     ) {
         $this->_urlHelper = $urlHelper;
diff --git a/app/code/Magento/Backend/Block/Page/Locale.php b/app/code/Magento/Backend/Block/Page/Locale.php
@@ -27,22 +27,22 @@ class Locale extends \Magento\Backend\Block\Template
     protected $_localeResolver;
 
     /**
-     * @var \Magento\Framework\Url\Helper
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param \Magento\Framework\Url\Helper $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Locale\ListsInterface $localeLists,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
-        \Magento\Framework\Url\Helper $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         array $data = []
     ) {
         $this->_localeLists = $localeLists;
diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -32,7 +32,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Framework\Url\Helper $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param Configuration $bundleProductConfiguration
@@ -45,7 +45,7 @@ public function __construct(
         \Magento\Catalog\Helper\Product\Configuration $productConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Framework\Url\Helper $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Manager $moduleManager,
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
@@ -9,14 +9,13 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product as ModelProduct;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Url\Helper;
 use Magento\Store\Model\Store;
 
 /**
  * Catalog category helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Product extends \Magento\Framework\Url\Helper
+class Product extends \Magento\Framework\Url\Helper\Data
 {
     const XML_PATH_PRODUCT_URL_USE_CATEGORY = 'catalog/seo/product_use_categories';
 
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -14,7 +14,7 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Compare extends \Magento\Framework\Url\Helper
+class Compare extends \Magento\Framework\Url\Helper\Data
 {
     /**
      * Product Compare Items Collection
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -60,7 +60,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements \Mage
     protected $_productConfig = null;
 
     /**
-     * @var \Magento\Framework\Url\Helper
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
@@ -89,7 +89,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements \Mage
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Framework\Url\Helper $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Module\Manager $moduleManager
@@ -100,7 +100,7 @@ public function __construct(
         \Magento\Catalog\Helper\Product\Configuration $productConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Framework\Url\Helper $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Manager $moduleManager,
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
@@ -7,14 +7,14 @@
 // @codingStandardsIgnoreFile
 
 namespace Magento\Checkout\Helper;
-use Magento\Framework\Url\Helper;
+use Magento\Framework\Url\Helper\Data;
 
 /**
  * Shopping cart helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Cart extends \Magento\Framework\Url\Helper
+class Cart extends \Magento\Framework\Url\Helper\Data
 {
     /**
      * Path to controller to delete item from cart
diff --git a/app/code/Magento/Checkout/Helper/ExpressRedirect.php b/app/code/Magento/Checkout/Helper/ExpressRedirect.php
@@ -60,7 +60,7 @@ public function redirectLogin(RedirectLoginInterface $expressRedirect, $customer
 
         $expressRedirect->getResponse()->setRedirect(
             $this->_objectManager->get(
-                'Magento\Framework\Url\Helper'
+                'Magento\Framework\Url\Helper\Data'
             )->addRequestParam(
                 $expressRedirect->getLoginUrl(),
                 ['context' => 'checkout']
diff --git a/app/code/Magento/Customer/Block/Form/Login.php b/app/code/Magento/Customer/Block/Form/Login.php
@@ -37,7 +37,7 @@ class Login extends \Magento\Framework\View\Element\Template
     /**
      * Core url
      *
-     * @var \Magento\Framework\Url\Helper
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $coreUrl;
 
@@ -54,7 +54,7 @@ class Login extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Checkout\Helper\Data $checkoutData
-     * @param \Magento\Framework\Url\Helper $coreUrl
+     * @param \Magento\Framework\Url\Helper\Data $coreUrl
      * @param array $data
      */
     public function __construct(
@@ -63,7 +63,7 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Url $customerUrl,
         \Magento\Checkout\Helper\Data $checkoutData,
-        \Magento\Framework\Url\Helper $coreUrl,
+        \Magento\Framework\Url\Helper\Data $coreUrl,
         array $data = []
     ) {
         $this->registration = $registration;
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
@@ -49,7 +49,7 @@ class Session extends \Magento\Framework\Session\SessionManager
     /**
      * Core url
      *
-     * @var \Magento\Framework\Url\Helper|null
+     * @var \Magento\Framework\Url\Helper\Data|null
      */
     protected $_coreUrl = null;
 
@@ -103,7 +103,7 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param Share $configShare
-     * @param \Magento\Framework\Url\Helper $coreUrl
+     * @param \Magento\Framework\Url\Helper\Data $coreUrl
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param ResourceCustomer $customerResource
      * @param CustomerFactory $customerFactory
@@ -125,7 +125,7 @@ public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         Config\Share $configShare,
-        \Magento\Framework\Url\Helper $coreUrl,
+        \Magento\Framework\Url\Helper\Data $coreUrl,
         \Magento\Customer\Model\Url $customerUrl,
         Resource\Customer $customerResource,
         CustomerFactory $customerFactory,
diff --git a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
@@ -27,7 +27,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Framework\Url\Helper $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration
@@ -40,7 +40,7 @@ public function __construct(
         \Magento\Catalog\Helper\Product\Configuration $productConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Framework\Url\Helper $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Manager $moduleManager,
diff --git a/app/code/Magento/Multishipping/Helper/Url.php b/app/code/Magento/Multishipping/Helper/Url.php
@@ -11,7 +11,7 @@
  */
 namespace Magento\Multishipping\Helper;
 
-class Url extends \Magento\Framework\Url\Helper
+class Url extends \Magento\Framework\Url\Helper\Data
 {
     /**
      * Retrieve shopping cart url
diff --git a/app/code/Magento/ProductAlert/Helper/Data.php b/app/code/Magento/ProductAlert/Helper/Data.php
@@ -12,7 +12,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Data extends \Magento\Framework\Url\Helper
+class Data extends \Magento\Framework\Url\Helper\Data
 {
     /**
      * Current product instance (override registry one)
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Url/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Framework/Url/Helper/DataTest.php
@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Url;
+namespace Magento\Framework\Url\Helper;
 
-class HelperTest extends \PHPUnit_Framework_TestCase
+class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Url\Helper
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_helper = null;
 
@@ -17,7 +17,7 @@ protected function setUp()
         $_SERVER['HTTP_HOST'] = 'example.com';
         $_SERVER['REQUEST_URI'] = '/fancy_uri';
         $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Url\Helper'
+            'Magento\Framework\Url\Helper\Data'
         );
     }
 
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
@@ -1383,7 +1383,7 @@
     ['Magento\Quote\Model\Resource\Quote\Address\Attribute\Backend\Parent'],
     ['Magento\Core\Helper\Http'],
     ['Magento\Core\Helper\Theme', 'Magento\Theme\Helper\Theme'],
-    ['Magento\Core\Helper\Url', 'Magento\Framework\Url\Helper'],
+    ['Magento\Core\Helper\Url', 'Magento\Framework\Url\Helper\Data'],
     ['Magento\Core\Helper\PostData', 'Magento\Framework\Data\Helper\PostHelper'],
     ['Magento\Core\Model\Theme', 'Magento\Theme\Model\Theme'],
     ['Magento\Core\Model\Theme\Collection', 'Magento\Theme\Model\Theme\Collection'],
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/ExpressRedirectTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/ExpressRedirectTest.php
@@ -106,7 +106,7 @@ public function testRedirectLogin($actionFlagList, $customerBeforeAuthUrl, $cust
         );
 
         $urlMock = $this->getMockBuilder(
-            'Magento\Framework\Url\Helper'
+            'Magento\Framework\Url\Helper\Data'
         )->disableOriginalConstructor()->setMethods(
             ['addRequestParam']
         )->getMock();
@@ -126,7 +126,7 @@ public function testRedirectLogin($actionFlagList, $customerBeforeAuthUrl, $cust
         )->method(
             'get'
         )->with(
-            'Magento\Framework\Url\Helper'
+            'Magento\Framework\Url\Helper\Data'
         )->will(
             $this->returnValue($urlMock)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Form/LoginTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Form/LoginTest.php
@@ -28,7 +28,7 @@ class LoginTest extends \PHPUnit_Framework_TestCase
     protected $checkoutData;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Url\Helper
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Url\Helper\Data
      */
     protected $coreUrl;
 
@@ -45,7 +45,7 @@ public function setUp()
             ['isContextCheckout']
         )->getMock();
         $this->coreUrl = $this->getMockBuilder(
-            'Magento\Framework\Url\Helper'
+            'Magento\Framework\Url\Helper\Data'
         )->disableOriginalConstructor()->setMethods(
             ['addRequestParam']
         )->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Url/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/Helper/DataTest.php
@@ -3,9 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Url;
+namespace Magento\Framework\Url\Helper;
 
-class HelperTest extends \PHPUnit_Framework_TestCase
+class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\TestFramework\Helper\ObjectManager
@@ -40,8 +40,8 @@ public function testGetCurrentBase64Url()
                 'urlEncoder' => $urlEncoder,
             ]
         );
-        /** @var \Magento\Framework\Url\Helper $helper */
-        $helper = new Helper($context);
+        /** @var \Magento\Framework\Url\Helper\Data $helper */
+        $helper = new \Magento\Framework\Url\Helper\Data($context);
         $this->assertEquals($encodedUrl, $helper->getCurrentBase64Url());
     }
 
@@ -74,8 +74,8 @@ public function testGetEncodedUrl($url, $callNum)
             ]
         );
 
-        /** @var \Magento\Framework\Url\Helper $helper */
-        $helper = new Helper($context);
+        /** @var \Magento\Framework\Url\Helper\Data $helper */
+        $helper = new \Magento\Framework\Url\Helper\Data($context);
         $this->assertEquals($encodedUrl, $helper->getEncodedUrl($url));
     }
 
@@ -167,10 +167,10 @@ public function removeRequestParamDataProvider()
      * Get helper instance
      *
      * @param array $arguments
-     * @return \Magento\Framework\Url\Helper
+     * @return \Magento\Framework\Url\Helper\Data
      */
     private function getHelper($arguments)
     {
-        return $this->objectManager->getObject('Magento\Framework\Url\Helper', $arguments);
+        return $this->objectManager->getObject('Magento\Framework\Url\Helper\Data', $arguments);
     }
 }
diff --git a/lib/internal/Magento/Framework/Url/Helper/Data.php b/lib/internal/Magento/Framework/Url/Helper/Data.php
@@ -9,9 +9,9 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Framework\Url;
+namespace Magento\Framework\Url\Helper;
 
-class Helper extends \Magento\Framework\App\Helper\AbstractHelper
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Retrieve current url in base64 encoding

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* @SuppressWarnings(PHPMD.LongVariable)`
`15`	`15`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`16`	`16`	`*/`
`17`		`-class Compare extends \Magento\Framework\Url\Helper`
	`17`	`+class Compare extends \Magento\Framework\Url\Helper\Data`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* Product Compare Items Collection`