Merge pull request magento#1661 from magento-engcom/2.1-develop-prs

Public Pull Requests magento#11960 [Backport 2.1] magento#11898 - Change NL PostCode Pattern by @osrecio magento#11920 [BACKPORT 2.1] [TASK] Add resetPassword call to the webapi by @lewisvoncken magento#11890 Save background color correctly in images. [backport 2.1] by @raumatbel Fixed Public Issues magento#11898 Zip code Netherlands should allow zipcode without space magento#8799 Image brackground
thiagolima-bm · Nov 3, 2017 · 9d75bca · 9d75bca
2 parents 9bc8f13 + a870086
commit 9d75bca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
 use Magento\Catalog\Helper\Image;
+use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
+use Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface;
 
-class ImageExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface
+class ImageExtractor implements TypeDataExtractorInterface
 {
     /**
      * Extract configuration data of images from the DOM structure
@@ -30,8 +31,11 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
                 if ($attribute->nodeType != XML_ELEMENT_NODE) {
                     continue;
                 }
-                if ($attribute->tagName == 'background') {
+                $attributeTagName = $attribute->tagName;
+                if ($attributeTagName === 'background') {
                     $nodeValue = $this->processImageBackground($attribute->nodeValue);
+                } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
+                    $nodeValue = intval($attribute->nodeValue);
                 } else {
                     $nodeValue = $attribute->nodeValue;
                 }
@@ -55,6 +59,7 @@ private function processImageBackground($backgroundString)
         $backgroundArray = [];
         if (preg_match($pattern, $backgroundString, $backgroundArray)) {
             array_shift($backgroundArray);
+            $backgroundArray = array_map('intval', $backgroundArray);
         }
         return $backgroundArray;
     }

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php
@@ -23,7 +23,7 @@ protected function setUp()
     public function testProcess()
     {
         $expectedArray = include(__DIR__ . '/_files/converted_view.php');
-        $this->assertEquals($expectedArray, $this->model->process($this->getDomElement(), 'media'));
+        $this->assertSame($expectedArray, $this->model->process($this->getDomElement(), 'media'));
     }
 
     /**

diff --git a/app/code/Magento/Customer/etc/webapi.xml b/app/code/Magento/Customer/etc/webapi.xml
@@ -188,6 +188,12 @@
             <resource ref="anonymous"/>
         </resources>
     </route>
+    <route url="/V1/customers/resetPassword" method="POST">
+        <service class="Magento\Customer\Api\AccountManagementInterface" method="resetPassword"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
     <route url="/V1/customers/:customerId/confirm" method="GET">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="getConfirmationStatus"/>
         <resources>

diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -318,7 +318,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/1234AB">^[1-9][0-9]{3}\s?[a-zA-Z]{2}$</code>
         </codes>
     </zip>
     <zip countryCode="NO">