ACP2E-1001: Customer Zip Code input validation rule not working

- Fixing build failures.

Author: Mohan Ahuja

app/code/Magento/Customer/Model/Metadata/Form.php

@@ -19,13 +19,13 @@ class Form
     /**#@+
      * Values for ignoreInvisible parameter in constructor
      */
-    const IGNORE_INVISIBLE = true;
+    public const IGNORE_INVISIBLE = true;
 
-    const DONT_IGNORE_INVISIBLE = false;
+    public const DONT_IGNORE_INVISIBLE = false;
 
-    /**#@-*/
-
-    /**#@-*/
+    /**
+     * @var CustomerMetadataInterface
+     */
     protected $_customerMetadataService;
 
     /**
@@ -64,8 +64,6 @@ class Form
     protected $_isAjax = false;
 
     /**
-     * Attribute values
-     *
      * @var array
      */
     protected $_attributeValues = [];
@@ -365,9 +363,9 @@ public function validateData(array $data)
         if (!$validator->isValid(false)) {
             $messages = [];
             foreach ($validator->getMessages() as $errorMessages) {
-                $messages = array_merge($messages, array_values((array)$errorMessages));
+                $messages[] = array_values((array)$errorMessages);
             }
-            return $messages;
+            return array_merge([], ...$messages);
         }
         return true;
     }

app/code/Magento/Customer/Model/Metadata/Form/Postcode.php

@@ -9,6 +9,7 @@
 use Magento\Customer\Model\Metadata\ElementFactory;
 use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\Api\ArrayObjectSearch;
+use Magento\Framework\Stdlib\StringUtils;
 use Magento\Framework\Locale\ResolverInterface;
 use Psr\Log\LoggerInterface as PsrLogger;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
@@ -24,7 +25,7 @@ class Postcode extends AbstractData
     protected $directoryHelper;
 
     /**
-     * @var \Magento\Framework\Stdlib\StringUtils
+     * @var StringUtils
      */
     protected $_string;
 
@@ -37,7 +38,7 @@ class Postcode extends AbstractData
      * @param string $entityTypeCode
      * @param bool $isAjax
      * @param DirectoryHelper $directoryHelper
-     * @param \Magento\Framework\Stdlib\StringUtils $stringHelper
+     * @param StringUtils|null $stringHelper
      */
     public function __construct(
         MagentoTimezone $localeDate,
@@ -48,9 +49,12 @@ public function __construct(
         $entityTypeCode,
         $isAjax,
         DirectoryHelper $directoryHelper,
-        \Magento\Framework\Stdlib\StringUtils $stringHelper
+        StringUtils $stringHelper = null
     ) {
         $this->directoryHelper = $directoryHelper;
+        if (is_null($stringHelper)) {
+            $stringHelper = \Magento\Framework\App\ObjectManager::getInstance()->get(StringUtils::class);
+        }
         $this->_string = $stringHelper;
         parent::__construct(
             $localeDate,
@@ -65,6 +69,7 @@ public function __construct(
 
     /**
      * Validate postal/zip code
+     *
      * Return true and skip validation if country zip code is optional
      *
      * @param array|null|string $value
@@ -99,31 +104,31 @@ public function validateValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
         return $this->_applyInputFilter($this->_getRequestValue($request));
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function compactValue($value)
     {
         return $value;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function restoreValue($value)
     {
         return $this->compactValue($value);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function outputValue($format = ElementFactory::OUTPUT_FORMAT_TEXT)
     {