MAGETWO-89039: Allow Validation of customer address attributes to include spaces

Author: viktorpetryk

app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php

@@ -40,6 +40,9 @@ class AttributeMergerTest extends \PHPUnit\Framework\TestCase
      */
     private $attributeMerger;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
 
@@ -87,7 +90,7 @@ public function testMerge($validationRule, $expectedValidation)
                 'field' =>
                     [
                         'validation' => ['length' => true],
-                    ]
+                    ],
             ]
         );
 
@@ -104,7 +107,7 @@ public function testMerge($validationRule, $expectedValidation)
      *
      * @return array
      */
-    public function validationRulesDataProvider()
+    public function validationRulesDataProvider(): array
     {
         return [
             ['alpha', 'validate-alpha'],

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php

@@ -256,8 +256,8 @@ public function validateInputRuleDataProvider()
                 'mylabel',
                 'alphanumeric',
                 [
-                    \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
-                ]
+                    \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.',
+                ],
             ],
             ['abcqaz', 'mylabel', 'alphanumeric', true],
             ['abc qaz', 'mylabel', 'alphanum-with-spaces', true],

app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php

@@ -33,7 +33,7 @@ protected function setUp()
      * @return void
      * @dataProvider validationRulesDataProvider
      */
-    public function testGetValidationRules($validationRule, $validationClass)
+    public function testGetValidationRules(string $validationRule, string $validationClass)
     {
         $expectsRules = [
             'required-entry' => true,
@@ -73,7 +73,7 @@ public function testGetValidationRulesWithOnlyRequiredRule()
      *
      * @return array
      */
-    public function validationRulesDataProvider()
+    public function validationRulesDataProvider(): array
     {
         return [
             ['alpha', 'validate-alpha'],

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

@@ -42,6 +42,7 @@ protected function tearDown()
 
     /**
      * Test of string validation.
+     *
      * @return void
      */
     public function testValidateValueString()
@@ -53,6 +54,7 @@ public function testValidateValueString()
 
     /**
      * Test of integer validation.
+     *
      * @return void
      */
     public function testValidateValueInteger()
@@ -65,6 +67,7 @@ public function testValidateValueInteger()
 
     /**
      * Test without length validation.
+     *
      * @return void
      */
     public function testWithoutLengthValidation()
@@ -94,7 +97,7 @@ public function testWithoutLengthValidation()
      * @return void
      * @dataProvider alphanumDataProvider
      */
-    public function testAlphanumericValidation($value, $expectedResult)
+    public function testAlphanumericValidation(string $value, $expectedResult)
     {
         $defaultAttributeData = [
             'store_label' => 'Test',
@@ -116,7 +119,7 @@ public function testAlphanumericValidation($value, $expectedResult)
      *
      * @return array
      */
-    public function alphanumDataProvider()
+    public function alphanumDataProvider(): array
     {
         return [
             ['QazWsx', true],
@@ -144,7 +147,7 @@ public function alphanumDataProvider()
      * @return void
      * @dataProvider alphanumWithSpacesDataProvider
      */
-    public function testAlphanumericValidationWithSpaces($value, $expectedResult)
+    public function testAlphanumericValidationWithSpaces(string $value, $expectedResult)
     {
         $defaultAttributeData = [
             'store_label' => 'Test',
@@ -166,7 +169,7 @@ public function testAlphanumericValidationWithSpaces($value, $expectedResult)
      *
      * @return array
      */
-    public function alphanumWithSpacesDataProvider()
+    public function alphanumWithSpacesDataProvider(): array
     {
         return [
             ['QazWsx', true],

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php

@@ -119,7 +119,7 @@ public function testGetClassEmpty()
      * @return void
      * @dataProvider validationRulesDataProvider
      */
-    public function testGetClass($validationRule, $expectedClass)
+    public function testGetClass(string $validationRule, string $expectedClass)
     {
         /** @var AbstractAttribute|MockObject $attributeMock */
         $attributeMock = $this->createAttributeMock();
@@ -203,7 +203,7 @@ public function testGetSelectOptions()
      *
      * @return array
      */
-    public function validationRulesDataProvider()
+    public function validationRulesDataProvider(): array
     {
         return [
             ['alphanumeric', 'validate-alphanum'],