Merge remote-tracking branch 'origin/MC-17925' into 2.3-develop-pr28

Author: serhii-balko

app/code/Magento/Customer/Model/Data/Address.php

@@ -42,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getCustomAttributesCodes()
     {
@@ -327,7 +327,7 @@ public function setCompany($company)
      */
     public function setTelephone($telephone)
     {
-        return $this->setData(self::TELEPHONE, $telephone);
+        return $this->setData(self::TELEPHONE, trim($telephone));
     }
 
     /**
@@ -452,7 +452,7 @@ public function setIsDefaultBilling($isDefaultBilling)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Customer\Api\Data\AddressExtensionInterface|null
      */
@@ -462,7 +462,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Customer\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this

app/code/Magento/Eav/Model/Attribute/Data/Text.php

@@ -45,7 +45,7 @@ public function __construct(
      */
     public function extractValue(RequestInterface $request)
     {
-        $value = $this->_getRequestValue($request);
+        $value = trim($this->_getRequestValue($request));
         return $this->_applyInputFilter($value);
     }
 
@@ -168,7 +168,7 @@ private function validateLength(\Magento\Eav\Model\Attribute $attribute, string
      */
     private function validateInputRule(string $value): array
     {
-        $result = $this->_validateInputRule(trim($value));
+        $result = $this->_validateInputRule($value);
         return \is_array($result) ? $result : [];
     }
 }

app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php

@@ -138,7 +138,6 @@ public function alphanumDataProvider(): array
             ['QazWsx12345', [
                 __('"%1" length must be equal or less than %2 characters.', 'Test', 10)]
             ],
-            [' 12345 ', true],
         ];
     }
 

app/code/Magento/Sales/Model/Order/Address.php

@@ -601,7 +601,7 @@ public function setEmail($email)
      */
     public function setTelephone($telephone)
     {
-        return $this->setData(OrderAddressInterface::TELEPHONE, $telephone);
+        return $this->setData(OrderAddressInterface::TELEPHONE, trim($telephone));
     }
 
     /**

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php

@@ -571,4 +571,20 @@ private function getWebsite(string $code): WebsiteInterface
         $repository = $this->objectManager->get(WebsiteRepositoryInterface::class);
         return $repository->get($code);
     }
+
+    /**
+     * Test for saving address with extra spaces in phone.
+     *
+     * @magentoDataFixture  Magento/Customer/_files/customer.php
+     * @magentoDataFixture  Magento/Customer/_files/customer_address.php
+     */
+    public function testSaveNewAddressWithExtraSpacesInPhone()
+    {
+        $proposedAddress = $this->_createSecondAddress()
+            ->setCustomerId(1)
+            ->setTelephone(' 123456 ');
+        $returnedAddress = $this->repository->save($proposedAddress);
+        $savedAddress = $this->repository->getById($returnedAddress->getId());
+        $this->assertEquals('123456', $savedAddress->getTelephone());
+    }
 }