Merge pull request #966 from magento-engcom/develop-prs

vrann · web-flow · commit 9b977b057cee · 2017-03-25T21:34:37.000-05:00
[EngCom] Public Pull Requests
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
@@ -26,11 +26,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\App\Router">
-        <arguments>
-            <argument name="routerId" xsi:type="string">admin</argument>
-        </arguments>
-    </type>
     <type name="Magento\Backend\Model\Menu\Config">
         <arguments>
             <argument name="menuDirector" xsi:type="object">Magento\Backend\Model\Menu\Director\Director</argument>
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -576,7 +576,7 @@ public function getSpecifyOptionMessage()
      */
     protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
-        $transport = new \StdClass();
+        $transport = new \stdClass();
         $transport->options = [];
         $options = null;
         if ($product->getHasOptions()) {
diff --git a/app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php
@@ -77,7 +77,7 @@ public function execute(EventObserver $observer)
             $this->priceIndexer->reindexList($productIds);
         }
 
-        $this->itemsForReindex ->clear();
+        $this->itemsForReindex->clear();
         // Clear list of remembered items - we don't need it anymore
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Router.php b/app/code/Magento/Cms/Controller/Router.php
@@ -6,9 +6,7 @@
 namespace Magento\Cms\Controller;
 
 /**
- * Cms Controller Router
- *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Router implements \Magento\Framework\App\RouterInterface
 {
@@ -87,7 +85,7 @@ public function __construct(
      * Validate and Match Cms Page and modify request
      *
      * @param \Magento\Framework\App\RequestInterface $request
-     * @return bool
+     * @return \Magento\Framework\App\ActionInterface|null
      */
     public function match(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/app/code/Magento/Cms/view/frontend/layout/default.xml b/app/code/Magento/Cms/view/frontend/layout/default.xml
@@ -13,7 +13,7 @@
         <referenceBlock name="footer_links">
             <block class="Magento\Framework\View\Element\Html\Link\Current" name="privacy-policy-link">
                 <arguments>
-                    <argument name="label" xsi:type="string">Privacy and Cookie Policy</argument>
+                    <argument name="label" xsi:type="string" translate="true">Privacy and Cookie Policy</argument>
                     <argument name="path" xsi:type="string">privacy-policy-cookie-restriction-mode</argument>
                 </arguments>
             </block>
diff --git a/app/code/Magento/ConfigurableProduct/i18n/en_US.csv b/app/code/Magento/ConfigurableProduct/i18n/en_US.csv
@@ -35,7 +35,7 @@ Summary,Summary
 "This attribute is used in configurable products. You cannot remove it from the attribute set.","This attribute is used in configurable products. You cannot remove it from the attribute set."
 "Associated Products","Associated Products"
 "Step 2: Attribute Values","Step 2: Attribute Values"
-"Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU."
+"Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU."
 "Sort Variations","Sort Variations"
 Options,Options
 "Select All","Select All"
diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -319,7 +319,7 @@
     </zip>
     <zip countryCode="NL">
         <codes>
-            <code id="pattern_1" active="true" example="1234 AB">^[0-9]{4}\s[a-zA-Z]{2}$</code>
+            <code id="pattern_1" active="true" example="1234 AB">^[0-9]{4}\s?[a-zA-Z]{2}$</code>
         </codes>
     </zip>
     <zip countryCode="NO">
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
@@ -276,11 +276,6 @@
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Router\Base">
-        <arguments>
-            <argument name="routerId" xsi:type="string">standard</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Stdlib\DateTime\Timezone">
         <arguments>
             <argument name="defaultTimezonePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>
diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv
@@ -15,7 +15,7 @@ Delete,Delete
 "Upload a file","Upload a file"
 Clear,Clear
 "Step 2: Attribute Values","Step 2: Attribute Values"
-"Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU."
+"Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU."
 "Sort Variations","Sort Variations"
 Options,Options
 "Select All","Select All"
diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
@@ -15,8 +15,6 @@
             </invalid_caches>
             <head translate="default_description">
                 <default_title>Magento Commerce</default_title>
-                <default_description>Default Description</default_description>
-                <default_keywords>Magento, Varien, E-commerce</default_keywords>
                 <default_media_type>text/html</default_media_type>
                 <default_charset>utf-8</default_charset>
                 <demonotice>0</demonotice>
@@ -44,7 +42,6 @@ Disallow: /*SID=
                 </default_custom_instructions>
             </search_engine_robots>
             <header translate="welcome">
-                <logo_alt>Magento Commerce</logo_alt>
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright">
diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
@@ -133,7 +133,6 @@ Configuration,Configuration
 "Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
 "Reset to Defaults","Reset to Defaults"
 "This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
-"Default Description","Default Description"
 "Default welcome msg!","Default welcome msg!"
 "Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
 "Design Config Grid","Design Config Grid"
@@ -145,11 +144,12 @@ Configuration,Configuration
 "HTML Head","HTML Head"
 "Favicon Icon","Favicon Icon"
 "Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!","Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!"
-"Default Title","Default Title"
-"Title Prefix","Title Prefix"
-"Title Suffix","Title Suffix"
-"Default Keywords","Default Keywords"
 "Miscellaneous Scripts","Miscellaneous Scripts"
+"Default Page Title","Default Page Title"
+"Page Title Prefix","Page Title Prefix"
+"Page Title Suffix","Page Title Suffix"
+"Default Meta Description","Default Meta Description"
+"Default Meta Keywords","Default Meta Keywords"
 "Display Demo Store Notice","Display Demo Store Notice"
 Header,Header
 "Logo Image","Logo Image"
diff --git a/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
@@ -77,7 +77,7 @@
             <field name="head_default_title">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Default Title</item>
+                        <item name="label" xsi:type="string" translate="true">Default Page Title</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">head_default_title</item>
@@ -90,7 +90,7 @@
             <field name="head_title_prefix">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Title Prefix</item>
+                        <item name="label" xsi:type="string" translate="true">Page Title Prefix</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">head_title_prefix</item>
@@ -103,7 +103,7 @@
             <field name="head_title_suffix">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Title Suffix</item>
+                        <item name="label" xsi:type="string" translate="true">Page Title Suffix</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">head_title_suffix</item>
@@ -116,7 +116,7 @@
             <field name="head_default_description">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Default Description</item>
+                        <item name="label" xsi:type="string" translate="true">Default Meta Description</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">textarea</item>
                         <item name="dataScope" xsi:type="string">head_default_description</item>
@@ -129,7 +129,7 @@
             <field name="head_default_keywords">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Default Keywords</item>
+                        <item name="label" xsi:type="string" translate="true">Default Meta Keywords</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">textarea</item>
                         <item name="dataScope" xsi:type="string">head_default_keywords</item>
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -116,7 +116,6 @@ class Base implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
      * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      *
@@ -131,7 +130,6 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
         \Magento\Framework\App\Router\PathConfigInterface $pathConfig
     ) {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php
@@ -88,13 +88,11 @@ public function processContent(File $asset)
             gc_enable();
 
             if (trim($content) === '') {
-                $errorMessage = PHP_EOL . self::ERROR_MESSAGE_PREFIX . PHP_EOL . $path;
-                $this->logger->critical($errorMessage);
-
-                throw new ContentProcessorException(new Phrase($errorMessage));
+                $this->logger->warning('Parsed less file is empty: ' .  $path);
+                return '';
+            } else {
+                return $content;
             }
-
-            return $content;
         } catch (\Exception $e) {
             throw new ContentProcessorException(new Phrase($e->getMessage()));
         }
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
@@ -533,7 +533,7 @@ public function getQueryValue($name = null, $default = null)
     }
 
     /**
-     * Retrieve GET parameters
+     * Set GET parameters
      *
      * @param string $name
      * @param mixed $value

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ public function getSpecifyOptionMessage()`
`576`	`576`	`*/`
`577`	`577`	`protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $product, $processMode)`
`578`	`578`	`{`
`579`		`- $transport = new \StdClass();`
	`579`	`+ $transport = new \stdClass();`
`580`	`580`	`$transport->options = [];`
`581`	`581`	`$options = null;`
`582`	`582`	`if ($product->getHasOptions()) {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function execute(EventObserver $observer)`
`77`	`77`	`$this->priceIndexer->reindexList($productIds);`
`78`	`78`	`}`
`79`	`79`
`80`		`- $this->itemsForReindex ->clear();`
	`80`	`+ $this->itemsForReindex->clear();`
`81`	`81`	`// Clear list of remembered items - we don't need it anymore`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,7 @@`
`6`	`6`	`namespace Magento\Cms\Controller;`
`7`	`7`
`8`	`8`	`/**`
`9`		`- * Cms Controller Router`
`10`		`- *`
`11`		`- * @author Magento Core Team <core@magentocommerce.com>`
	`9`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`12`	`10`	`*/`
`13`	`11`	`class Router implements \Magento\Framework\App\RouterInterface`
`14`	`12`	`{`
`@@ -87,7 +85,7 @@ public function __construct(`
`87`	`85`	`* Validate and Match Cms Page and modify request`
`88`	`86`	`*`
`89`	`87`	`* @param \Magento\Framework\App\RequestInterface $request`
`90`		`- * @return bool`
	`88`	`+ * @return \Magento\Framework\App\ActionInterface\|null`
`91`	`89`	`*/`
`92`	`90`	`public function match(\Magento\Framework\App\RequestInterface $request)`
`93`	`91`	`{`