Merge pull request #115 from JerrySmidt/master

3.6.2

Author: JerrySmidt

Model/Validator/City.php

@@ -2,15 +2,19 @@
 
 namespace Flekto\Postcode\Model\Validator;
 
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Validator\AbstractValidator;
+
 /**
  * Customer city fields validator.
  */
-class City extends \Magento\Customer\Model\Validator\City
+class City extends AbstractValidator
 {
     /**
      * Validate city fields.
      *
      * Adopt pattern from Magento release 2.4.9-alpha3 to fix city validation.
+     *
      * @see https://github.com/magento/magento2/issues/39854
      *
      * @param Customer $customer
@@ -23,7 +27,7 @@ public function isValid($customer): bool
             return true;
         }
 
-        if (preg_match( '/^[\p{L}\p{M}\d\s\-_\'’\.,&\(\)]{1,100}$/u', $city, $matches)) {
+        if (preg_match('/^[\p{L}\p{M}\d\s\-_\'’\.,&\(\)]{1,100}$/u', $city, $matches)) {
             if ($matches[0] === $city) {
                 return true;
             }

Plugin/ValidatorPlugin.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Flekto\Postcode\Plugin;
+
+use Magento\Framework\Validator;
+use Magento\Framework\Validator\ValidatorInterface;
+use Magento\Framework\App\ProductMetadataInterface;
+
+/**
+ * Validator plugin to fix city validation in Magento 2.4.8.
+ */
+class ValidatorPlugin
+{
+    private $_productMetadata;
+
+    /**
+     * Constructor
+     *
+     * @param ProductMetadataInterface $productMetadata
+     */
+    public function __construct(ProductMetadataInterface $productMetadata)
+    {
+        $this->_productMetadata = $productMetadata;
+    }
+
+    /**
+     * Before plugin for the addValidator method
+     *
+     * @param Validator $subject
+     * @param ValidatorInterface $validator
+     * @param boolean $breakChainOnFailure
+     * @return array|null
+     */
+    public function beforeAddValidator(
+        Validator $subject,
+        ValidatorInterface $validator,
+        bool $breakChainOnFailure = false
+    ): ?array {
+        if (substr($this->_productMetadata->getVersion(), 0, 5) === '2.4.8'
+            && method_exists($validator, 'getAlias')
+            && $validator->getAlias() === 'city_validator'
+        ) {
+            return [new \Flekto\Postcode\Model\Validator\City(), $breakChainOnFailure];
+        }
+
+        // Return null if not changing arguments, see
+        // https://developer.adobe.com/commerce/php/development/components/plugins/#before-methods
+        return null;
+    }
+}

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "postcode-nl/api-magento2-module",
-    "version": "3.6.1",
+    "version": "3.6.2",
     "description": "Postcode.eu International Address API module for Magento 2. Adds autocompletion for addresses in multiple countries using official postal data.",
     "require": {
       "php": "^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",

etc/config.xml

@@ -3,7 +3,7 @@
     <default>
         <postcodenl_api>
             <status>
-                <module_version>3.6.1</module_version>
+                <module_version>3.6.2</module_version>
                 <account_status>new</account_status>
             </status>
             <general>

etc/di.xml

@@ -5,7 +5,10 @@
     <preference for="Flekto\Postcode\Api\UpdateNotificationRepositoryInterface" type="Flekto\Postcode\Model\UpdateNotificationRepository" />
     <preference for="Magento\Framework\Filesystem\DriverInterface" type="Magento\Framework\Filesystem\Driver\File" />
     <preference for="Magento\Checkout\Block\Checkout\AttributeMerger" type="Flekto\Postcode\Block\Checkout\AttributeMerger" />
-    <preference for="Magento\Customer\Model\Validator\City" type="Flekto\Postcode\Model\Validator\City" />
+
+    <type name="Magento\Framework\Validator">
+        <plugin name="flekto_postcode_city_validation" type="Flekto\Postcode\Plugin\ValidatorPlugin"/>
+    </type>
 
     <type name="Magento\Framework\App\AreaList">
         <arguments>