Merge branch 'develop' of https://github.corp.ebay.com/magento-troll/magento2ce into develop

Author: Roman Ganin

app/code/Magento/Catalog/Helper/Product.php

@@ -156,7 +156,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product|array $data
      * @return boolean
      */
-    public function  isDataForPriceIndexerWasChanged($data)
+    public function isDataForPriceIndexerWasChanged($data)
     {
         if ($data instanceof ModelProduct) {
             foreach ($this->_reindexPriceIndexerData['byDataResult'] as $param) {
@@ -187,11 +187,11 @@ public function  isDataForPriceIndexerWasChanged($data)
      */
     public function isDataForProductCategoryIndexerWasChanged(\Magento\Catalog\Model\Product $data)
     {
-            foreach ($this->_reindexProductCategoryIndexerData['byDataChange'] as $param) {
-                if ($data->dataHasChangedFor($param)) {
-                    return true;
-                }
+        foreach ($this->_reindexProductCategoryIndexerData['byDataChange'] as $param) {
+            if ($data->dataHasChangedFor($param)) {
+                return true;
             }
+        }
         return false;
     }
 

app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php

@@ -15,16 +15,17 @@ class Export extends \Magento\Backend\Block\System\Config\Form\Field
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
         /** @var \Magento\Backend\Block\Widget\Button $buttonBlock  */
         $buttonBlock = $this->getForm()->getLayout()->createBlock('Magento\Backend\Block\Widget\Button');
 
-        $params = array(
+        $params = [
             'website' => $buttonBlock->getRequest()->getParam('website'),
             'varnish' => $this->getVarnishVersion()
-        );
+        ];
 
         $url = $this->getUrl("*/PageCache/exportVarnishConfig", $params);
         $data = [
@@ -37,7 +38,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
         return $html;
     }
 
-    /*
+    /**
      * Return Varnish version to this class
      *
      * @return int

app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish3.php

@@ -10,7 +10,7 @@
  */
 class Varnish3 extends \Magento\PageCache\Block\System\Config\Form\Field\Export
 {
-    /*
+    /**
      * Return Varnish version to this class
      *
      * @return int

app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish4.php

@@ -10,7 +10,7 @@
  */
 class Varnish4 extends \Magento\PageCache\Block\System\Config\Form\Field\Export
 {
-    /*
+    /**
      * Return Varnish version to this class
      *
      * @return int

app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php

@@ -49,7 +49,7 @@ public function execute()
                 $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_3_CONFIGURATION_PATH);
                 break;
             default:
-                $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_4_CONFIGURATION_PATH);;
+                $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_4_CONFIGURATION_PATH);
                 break;
         }
         return $this->fileFactory->create($fileName, $content, DirectoryList::VAR_DIR);

app/code/Magento/PageCache/view/adminhtml/templates/page_cache_validation.phtml

@@ -24,7 +24,10 @@ require(['jquery'], function($){
             var invalidFields = fields.filter(function () {
                 return ($(this).val().length == 0 || ($(this).val() != $(this).data('previous-value')));
             });
-            $('[id^=system_full_page_cache_varnish_export_button_version]').prop('disabled', (invalidFields.length > 0));
+            $('[id^=system_full_page_cache_varnish_export_button_version]').prop(
+                'disabled',
+                (invalidFields.length > 0)
+            );
         });
     //]]>
 

lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CssMinifier.php

@@ -34,4 +34,4 @@ public function minify($content)
     {
         return $this->cssMinifier->run($content);
     }
-}
+}