Merge pull request #4421 from magento-trigger/MC-5806

- added Detection of URL dependencies does not work for the Dependency static test
magento · Jun 27, 2019 · f77ac3c · f77ac3c
2 parents 355b6ff + 5abbe7e
commit f77ac3c
Show file tree

Hide file tree

Showing 23 changed files with 789 additions and 224 deletions.
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -11,7 +11,8 @@
         "magento/module-backend": "*",
         "magento/module-media-storage": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/module-ui": "*",
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -253,7 +253,7 @@ public function getLoadTreeUrl($expanded = null)
      */
     public function getNodesUrl()
     {
-        return $this->getUrl('catalog/category/jsonTree');
+        return $this->getUrl('catalog/category/tree');
     }
 
     /**

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -8,7 +8,7 @@
 use Magento\Store\Model\Store;
 
 /**
- * Grid.
+ * Catalog product grid
  *
  * @api
  * @since 100.0.2
@@ -87,9 +87,7 @@ public function __construct(
     }
 
     /**
-     * Construct.
-     *
-     * @return void
+     * @inheritDoc
      */
     protected function _construct()
     {
@@ -106,6 +104,7 @@ protected function _construct()
      * Get store.
      *
      * @return Store
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _getStore()
     {
@@ -115,8 +114,6 @@ protected function _getStore()
 
     /**
      * @inheritDoc
-     *
-     * @return $this
      */
     protected function _prepareCollection()
     {
@@ -195,9 +192,6 @@ protected function _prepareCollection()
 
     /**
      * @inheritDoc
-     *
-     * @param \Magento\Backend\Block\Widget\Grid\Column $column
-     * @return $this
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -218,9 +212,8 @@ protected function _addColumnFilterToCollection($column)
 
     /**
      * @inheritDoc
-     *
-     * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Exception
      */
     protected function _prepareColumns()
     {
@@ -375,18 +368,11 @@ protected function _prepareColumns()
             ]
         );
 
-        $block = $this->getLayout()->getBlock('grid.bottom.links');
-        if ($block) {
-            $this->setChild('grid.bottom.links', $block);
-        }
-
         return parent::_prepareColumns();
     }
 
     /**
      * @inheritDoc
-     *
-     * @return $this
      */
     protected function _prepareMassaction()
     {
@@ -438,20 +424,15 @@ protected function _prepareMassaction()
     }
 
     /**
-     * Get grid Url.
-     *
-     * @return string
+     * @inheritDoc
      */
     public function getGridUrl()
     {
         return $this->getUrl('catalog/*/grid', ['_current' => true]);
     }
 
     /**
-     * Get row url.
-     *
-     * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $row
-     * @return string
+     * @inheritDoc
      */
     public function getRowUrl($row)
     {

diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
@@ -8,6 +8,8 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="formkey"/>
     <container name="root" label="Root">
-        <block class="Magento\Catalog\Block\Adminhtml\Product\Grid" name="admin.product.grid"/>
+        <block class="Magento\Catalog\Block\Adminhtml\Product\Grid" name="admin.product.grid">
+            <block class="Magento\Framework\View\Element\Text\ListText" name="grid.bottom.links"/>
+        </block>
     </container>
 </layout>
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -6,10 +6,14 @@
 
 namespace Magento\Checkout\Controller\Onepage;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\PaymentException;
 
-class SaveOrder extends \Magento\Checkout\Controller\Onepage
+/**
+ * One Page Checkout saveOrder action
+ */
+class SaveOrder extends \Magento\Checkout\Controller\Onepage implements HttpPostActionInterface
 {
     /**
      * Create order action
@@ -31,7 +35,7 @@ public function execute()
         $result = new DataObject();
         try {
             $agreementsValidator = $this->_objectManager->get(
-                \Magento\CheckoutAgreements\Model\AgreementsValidator::class
+                \Magento\Checkout\Api\AgreementsValidatorInterface::class
             );
             if (!$agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) {
                 $result->setData('success', false);

diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -114,10 +114,13 @@ public function getAddressEditUrl($address)
      * Retrieve the Url for customer orders.
      *
      * @return string
+     * @deprecated Action does not exist
      */
     public function getOrdersUrl()
     {
-        return $this->_urlBuilder->getUrl('customer/order/index', ['_secure' => true]);
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        trigger_error('Method is deprecated', E_USER_DEPRECATED);
+        return '';
     }
 
     /**
@@ -137,7 +140,7 @@ public function getReviewsUrl()
      */
     public function getWishlistUrl()
     {
-        return $this->_urlBuilder->getUrl('customer/wishlist/index', ['_secure' => true]);
+        return $this->_urlBuilder->getUrl('wishlist/index', ['_secure' => true]);
     }
 
     /**

diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
@@ -77,7 +77,7 @@ public function __construct(
      */
     public function getLoadrRegionUrl()
     {
-        return $this->getUrl('directory/json/childRegion');
+        return $this->getUrl('directory/json/countryRegion');
     }
 
     /**

diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -69,7 +69,7 @@ public function requestToken(Quote $quote)
         $request->setSecuretokenid($this->mathRandom->getUniqueHash());
         $request->setReturnurl($this->url->getUrl('paypal/transparent/response'));
         $request->setErrorurl($this->url->getUrl('paypal/transparent/response'));
-        $request->setCancelurl($this->url->getUrl('paypal/transparent/cancel'));
+        $request->setCancelurl($this->url->getUrl('paypal/transparent/response'));
         $request->setDisablereceipt('TRUE');
         $request->setSilenttran('TRUE');
 

diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss.php b/app/code/Magento/Review/Block/Adminhtml/Rss.php
@@ -9,6 +9,7 @@
 
 /**
  * Class Rss
+ *
  * @package Magento\Catalog\Block\Adminhtml\Rss
  */
 class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
@@ -41,26 +42,28 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getRssData()
     {
-        $newUrl = $this->getUrl('rss/catalog/review', ['_secure' => true, '_nosecret' => true]);
         $title = __('Pending product review(s)');
 
-        $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
+        $data = ['title' => $title, 'description' => $title, 'link' => '', 'charset' => 'UTF-8'];
 
         foreach ($this->rssModel->getProductCollection() as $item) {
             if ($item->getStoreId()) {
                 $this->_urlBuilder->setScope($item->getStoreId());
             }
 
             $url = $this->getUrl('catalog/product/view', ['id' => $item->getId()]);
-            $reviewUrl = $this->getUrl('review/product/edit/', [
-                'id' => $item->getReviewId(),
-                '_secure' => true,
-                '_nosecret' => true
-            ]);
+            $reviewUrl = $this->getUrl(
+                'review/product/edit/',
+                [
+                    'id' => $item->getReviewId(),
+                    '_secure' => true,
+                    '_nosecret' => true
+                ]
+            );
 
             $storeName = $this->storeManager->getStore($item->getStoreId())->getName();
             $description = '<p>' . __('Product: <a href="%1" target="_blank">%2</a> <br/>', $url, $item->getName())
@@ -80,31 +83,31 @@ public function getRssData()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getCacheLifetime()
     {
         return 0;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function isAllowed()
     {
         return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getFeeds()
     {
         return [];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function isAuthRequired()
     {

diff --git a/app/code/Magento/Review/Test/Unit/Block/Adminhtml/RssTest.php b/app/code/Magento/Review/Test/Unit/Block/Adminhtml/RssTest.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+/**
+ * Test RSS adminhtml block
+ */
 class RssTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -35,6 +38,9 @@ class RssTest extends \PHPUnit\Framework\TestCase
      */
     protected $urlBuilder;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->storeManagerInterface = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
@@ -51,18 +57,22 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGetRssData()
     {
+        $rssUrl = '';
         $rssData = [
             'title' => 'Pending product review(s)',
             'description' => 'Pending product review(s)',
-            'link' => 'http://rss.magento.com',
+            'link' => $rssUrl,
             'charset' => 'UTF-8',
             'entries' => [
                     'title' => 'Product: "Product Name" reviewed by: Product Nick',
                     'link' => 'http://product.magento.com',
                     'description' => [
-                            'rss_url' => 'http://rss.magento.com',
+                            'rss_url' => $rssUrl,
                             'name' => 'Product Name',
                             'summary' => 'Product Title',
                             'review' => 'Product Detail',
@@ -71,8 +81,9 @@ public function testGetRssData()
                         ],
                 ],
         ];
-        $rssUrl = 'http://rss.magento.com';
-        $productModel = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Product::class, [
+        $productModel = $this->createPartialMock(
+            \Magento\Catalog\Model\ResourceModel\Product::class,
+            [
                 'getStoreId',
                 'getId',
                 'getReviewId',
@@ -81,7 +92,8 @@ public function testGetRssData()
                 'getTitle',
                 'getNickname',
                 'getProductUrl'
-            ]);
+            ]
+        );
         $storeModel = $this->createMock(\Magento\Store\Model\Store::class);
         $this->storeManagerInterface->expects($this->once())->method('getStore')->will($this->returnValue($storeModel));
         $storeModel->expects($this->once())->method('getName')
@@ -118,16 +130,25 @@ public function testGetRssData()
         $this->assertContains($rssData['entries']['description']['store'], $data['entries'][0]['description']);
     }
 
+    /**
+     * @return void
+     */
     public function testGetCacheLifetime()
     {
         $this->assertEquals(0, $this->block->getCacheLifetime());
     }
 
+    /**
+     * @return void
+     */
     public function testIsAllowed()
     {
         $this->assertEquals(true, $this->block->isAllowed());
     }
 
+    /**
+     * @return void
+     */
     public function testGetFeeds()
     {
         $this->assertEquals([], $this->block->getFeeds());
-Original file line number
+Diff line change
@@ Expand Up / @@ -253,7 +253,7 @@ public function getLoadTreeUrl($expanded = null) @@
          */
         public function getNodesUrl()
         {
-            return $this->getUrl('catalog/category/jsonTree');
+            return $this->getUrl('catalog/category/tree');
         }
         /**
@@ Expand Down @@