Fixed #11162

craftcms · May 10, 2022 · cf8d4b5 · cf8d4b5
1 parent 6dffbc5
commit cf8d4b5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Fixed a bug where Assets fields’ “Upload files” buttons weren’t wrapping when there wasn’t enough space to show them alongside “Add an asset”. ([#11133](https://github.com/craftcms/cms/issues/11133))
 - Fixed an error that occurred when searching for elements by a custom field. ([#11120](https://github.com/craftcms/cms/pull/11120))
 - Fixed a bug where `Craft.getUrl()` was appending empty query strings to URLs when they weren’t needed. ([#11159](https://github.com/craftcms/cms/issues/11159))
+- Fixed a bug where addresses could validate the wrong set of required fields, if the validation rules were invoked before the country code was set. ([#11162](https://github.com/craftcms/cms/issues/11162))
 
 ## 4.0.1 - 2022-05-06
 

diff --git a/src/elements/Address.php b/src/elements/Address.php
@@ -485,20 +485,25 @@ public function beforeValidate(): bool
     public function defineRules(): array
     {
         $rules = parent::defineRules();
-
         $rules[] = [['ownerId'], 'number'];
         $rules[] = [['countryCode'], 'required'];
         $rules[] = [['longitude', 'latitude'], 'safe'];
         $rules[] = [self::_addressAttributes(), 'safe'];
+        return $rules;
+    }
 
-        $formatter = Craft::$app->getAddresses()->getAddressFormatRepository()->get($this->countryCode);
-        $requiredAddressFields = array_filter(
-            $formatter->getRequiredFields(),
-            fn(string $attribute) => !in_array($attribute, ['givenName', 'familyName', 'additionalName']),
-        );
-        $rules[] = [$requiredAddressFields, 'required', 'on' => self::SCENARIO_LIVE];
-
+    /**
+     * @inheritdoc
+     */
+    public function afterValidate(): void
+    {
         if ($this->getScenario() === self::SCENARIO_LIVE) {
+            $formatter = Craft::$app->getAddresses()->getAddressFormatRepository()->get($this->countryCode);
+            $requiredAttributes = array_filter(
+                $formatter->getRequiredFields(),
+                fn(string $attribute) => !in_array($attribute, ['givenName', 'familyName', 'additionalName']),
+            );
+
             $requirableNativeFields = [
                 OrganizationField::class,
                 OrganizationTaxIdField::class,
@@ -512,18 +517,19 @@ public function defineRules(): array
                 /** @var BaseNativeField|null $field */
                 $field = $fieldLayout->getFirstVisibleElementByType($class, $this);
                 if ($field && $field->required) {
-                    $attributes = match ($field->attribute()) {
+                    array_push($requiredAttributes, ...match ($field->attribute()) {
                         'latLong' => ['latitude', 'longitude'],
                         default => [$field->attribute()],
-                    };
-                    foreach ($attributes as $attribute) {
-                        (new RequiredValidator())->validateAttribute($this, $attribute);
-                    }
+                    });
                 }
             }
+
+            foreach ($requiredAttributes as $attribute) {
+                (new RequiredValidator())->validateAttribute($this, $attribute);
+            }
         }
 
-        return $rules;
+        parent::afterValidate();
     }
 
     /**