Merge pull request #1314 from magento-falcons/MAGETWO-69964

Fixed issues: - MAGETWO-69964 PHPCS cannot parse correctly syntax of PHP 7.x return types
magento · Jul 12, 2017 · 75e5dec · 75e5dec
2 parents 20e58ef + cb44012
commit 75e5dec
Show file tree

Hide file tree

Showing 168 changed files with 1,427 additions and 3,345 deletions.
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -16,7 +16,7 @@
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
  *
- * @deprecated 
+ * @deprecated
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Context extends \Magento\Framework\View\Element\Template\Context

diff --git a/app/code/Magento/Catalog/Model/ProductVisibilityCondition.php b/app/code/Magento/Catalog/Model/ProductVisibilityCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model;

diff --git a/app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php b/app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php
@@ -32,7 +32,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
 
     /**
      * Parse lifetime of recently compared products in widget
-     * 
+     *
      * @inheritdoc
      */
     public function get()

diff --git a/app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php b/app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\Widget;

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php b/app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Block;

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php b/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Model;

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
@@ -93,14 +93,12 @@ public function testGet()
         $attributeId = 5;
         $skus = ['sku_1', 'sku_2'];
         $idsBySku = [
-            'sku_1' =>
-                [
-                    1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-                ],
-            'sku_2' =>
-                [
-                    2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
-                ]
+            'sku_1' => [
+                1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'sku_2' => [
+                2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
+            ]
         ];
         $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()->getMock();
@@ -228,14 +226,12 @@ public function testDelete()
         $attributeId = 5;
         $skus = ['sku_1', 'sku_2'];
         $idsBySku = [
-            'sku_1' =>
-                [
-                    1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-                ],
-            'sku_2' =>
-                [
-                    2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
-                ]
+            'sku_1' => [
+                1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'sku_2' => [
+                2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
+            ]
         ];
         $this->productIdLocator
             ->expects($this->once())
@@ -278,14 +274,12 @@ public function testDeleteWithException()
         $attributeId = 5;
         $skus = ['sku_1', 'sku_2'];
         $idsBySku = [
-            'sku_1' =>
-                [
-                    1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-                ],
-            'sku_2' =>
-                [
-                    2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
-                ]
+            'sku_1' => [
+                1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'sku_2' => [
+                2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
+            ]
         ];
         $this->productIdLocator
             ->expects($this->once())

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Model;

diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
@@ -27,7 +27,7 @@
 
 /**
  * Class AdvancedPricing
- * 
+ *
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/AdditionalInfo.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/AdditionalInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Ui\DataProvider\Product\Listing\Collector;

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Url.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Url.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;

diff --git a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 ?>
 <script type="text/x-magento-init">
         {

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -7,8 +7,8 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <img class="photo image"
-     <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
-     src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-     width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
-     height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
-     alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
+    <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
+    src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
+    width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
+    height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
+    alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -11,9 +11,9 @@
     <span class="product-image-wrapper"
           style="padding-bottom: <?= /* @escapeNotVerified */ ($block->getRatio() * 100) ?>%;">
         <img class="product-image-photo"
-             <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
-             src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-             width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
-             height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
-             alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
+            <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
+            src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
+            width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
+            height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
+            alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 ?>
@@ -10,13 +10,11 @@
  */
 ?>
 
-<?= /* @escapeNotVerified */ $block->renderApp(
-    [
-        'widget_columns' => [
-            'displayMode' => 'grid'
-        ],
-        'image' => [
-            'imageCode' => 'recently_viewed_products_grid_content_widget'
-        ]
+<?= /* @escapeNotVerified */ $block->renderApp([
+    'widget_columns' => [
+        'displayMode' => 'grid'
+    ],
+    'image' => [
+        'imageCode' => 'recently_viewed_products_grid_content_widget'
     ]
-);
+]);
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
@@ -10,13 +10,11 @@
  */
 ?>
 
-<?= /* @escapeNotVerified */ $block->renderApp(
-    [
-        'widget_columns' => [
-            'displayMode' => 'list'
-        ],
-        'image' => [
-            'imageCode' => 'recently_viewed_products_list_content_widget'
-        ]
+<?= /* @escapeNotVerified */ $block->renderApp([
+    'widget_columns' => [
+        'displayMode' => 'list'
+    ],
+    'image' => [
+        'imageCode' => 'recently_viewed_products_list_content_widget'
     ]
-);
+]);
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php
@@ -34,14 +34,10 @@ public function testPrepareAttributesWithDefaultValueForSave()
                         'is_unique' => '0',
                         'frontend_label' => 'Name',
                         'is_static' => false,
-                        'apply_to' =>
-                            [
-                            ],
+                        'apply_to' => [],
                         'type' => 'varchar',
                         'default_value' => null,
-                        'options' =>
-                            [
-                            ],
+                        'options' => [],
                     ],
                     'sku' => [
                         'id' => '70',
@@ -51,14 +47,10 @@ public function testPrepareAttributesWithDefaultValueForSave()
                         'is_unique' => '1',
                         'frontend_label' => 'SKU',
                         'is_static' => true,
-                        'apply_to' =>
-                            [
-                            ],
+                        'apply_to' => [],
                         'type' => 'varchar',
                         'default_value' => null,
-                        'options' =>
-                            [
-                            ],
+                        'options' => [],
                     ]
                 ]
             ]

diff --git a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogInventory\Model;

diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -355,7 +355,6 @@ public function rebuildStoreIndex($storeId, $productIds = null)
         $products = $this->dataProvider
             ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId);
         while (count($products) > 0) {
-
             $productsIds = array_column($products, 'entity_id');
             $relatedProducts = $this->getRelatedProducts($products);
             $productsIds = array_merge($productsIds, array_values($relatedProducts));

diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -185,7 +185,9 @@ protected function _renderFiltersBefore()
                 $searchResult = $this->searchResultFactory->create()->setItems([]);
             } catch (NonExistingRequestNameException $e) {
                 $this->_logger->error($e->getMessage());
-                throw new LocalizedException(__('Sorry, something went wrong. You can find out more in the error log.'));
+                throw new LocalizedException(
+                    __('Sorry, something went wrong. You can find out more in the error log.')
+                );
             }
             $temporaryStorage = $this->temporaryStorageFactory->create();
             $table = $temporaryStorage->storeApiDocuments($searchResult->getItems());

diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
@@ -45,8 +45,7 @@ public function __construct(
      */
     public function mapSelectContainerToStrategy(SelectContainer $selectContainer)
     {
-        if (
-            $selectContainer->isFullTextSearchRequired()
+        if ($selectContainer->isFullTextSearchRequired()
             && !$selectContainer->hasCustomAttributesFilters()
             && !$selectContainer->hasVisibilityFilter()
         ) {

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -149,8 +149,7 @@ public function getCategoryProductsUrlRewrites(
             ->addAttributeToSelect('url_path');
 
         foreach ($productCollection as $product) {
-            if (
-                isset($this->isSkippedProduct[$category->getEntityId()]) &&
+            if (isset($this->isSkippedProduct[$category->getEntityId()]) &&
                 in_array($product->getId(), $this->isSkippedProduct[$category->getEntityId()])
             ) {
                 continue;

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Cart;
 
-
 class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
 {
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * Parse lifetime of recently compared products in widget
-         *
+         *
          * @inheritdoc
          */
         public function get()
@@ Expand Down @@