Merge remote-tracking branch 'github-magento2ce/MAGETWO-91659' into EPAM-PR-12

Author: nikshostko

app/code/Magento/Customer/Helper/Address.php

@@ -127,27 +127,35 @@ public function getBookUrl()
     }
 
     /**
+     * Retrieve edit url.
+     *
      * @return void
      */
     public function getEditUrl()
     {
     }
 
     /**
+     * Retrieve delete url.
+     *
      * @return void
      */
     public function getDeleteUrl()
     {
     }
 
     /**
+     * Retrieve create url.
+     *
      * @return void
      */
     public function getCreateUrl()
     {
     }
 
     /**
+     * Retrieve block renderer.
+     *
      * @param string $renderer
      * @return \Magento\Framework\View\Element\BlockInterface
      */
@@ -204,6 +212,8 @@ public function getStreetLines($store = null)
     }
 
     /**
+     * Retrieve address format.
+     *
      * @param string $code
      * @return Format|string
      */
@@ -391,4 +401,23 @@ public function isAttributeVisible($code)
         }
         return false;
     }
+
+    /**
+     * Retrieve attribute required
+     *
+     * @param string $code
+     * @return bool
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function isAttributeRequired($code)
+    {
+        $attributeMetadata = $this->_addressMetadataService->getAttributeMetadata($code);
+
+        if ($attributeMetadata) {
+            return $attributeMetadata->isRequired();
+        }
+
+        return false;
+    }
 }

app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php

@@ -414,4 +414,43 @@ public function isAttributeVisibleDataProvider()
             ['invalid_code', false]
         ];
     }
+
+    /**
+     * Test is required filed by attribute code
+     *
+     * @param string $attributeCode
+     * @param bool $isMetadataExists
+     * @dataProvider isAttributeRequiredDataProvider
+     * @covers \Magento\Customer\Helper\Address::isAttributeRequired()
+     * @return void
+     */
+    public function testIsAttributeRequired($attributeCode, $isMetadataExists)
+    {
+        $attributeMetadata = null;
+        if ($isMetadataExists) {
+            $attributeMetadata = $this->getMockBuilder(\Magento\Customer\Api\Data\AttributeMetadataInterface::class)
+                ->getMockForAbstractClass();
+            $attributeMetadata->expects($this->once())
+                ->method('isRequired')
+                ->willReturn(true);
+        }
+        $this->addressMetadataService->expects($this->once())
+            ->method('getAttributeMetadata')
+            ->with($attributeCode)
+            ->willReturn($attributeMetadata);
+        $this->assertEquals($isMetadataExists, $this->helper->isAttributeRequired($attributeCode));
+    }
+
+    /**
+     * Data provider for test  testIsAttributeRequire
+     *
+     * @return array
+     */
+    public function isAttributeRequiredDataProvider()
+    {
+        return [
+            ['fax', true],
+            ['invalid_code', false]
+        ];
+    }
 }

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -486,9 +486,6 @@
                 </item>
             </argument>
             <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
                 <dataType>text</dataType>
             </settings>
         </field>