feat: allow validating missing keys

flarum · Dec 6, 2024 · eb1063e · eb1063e
1 parent e43449c
commit eb1063e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 37 deletions.
diff --git a/extensions/package-manager/src/AllValidatorRules.php b/extensions/package-manager/src/AllValidatorRules.php
diff --git a/extensions/package-manager/src/ConfigureAuthValidator.php b/extensions/package-manager/src/ConfigureAuthValidator.php
@@ -13,7 +13,7 @@
 
 class ConfigureAuthValidator extends AbstractValidator
 {
-    use AllValidatorRules;
+    protected bool $validateMissingKeys = true;
 
     protected array $rules = [
         'github-oauth' => ['sometimes', 'array'],

diff --git a/extensions/package-manager/src/ConfigureComposerValidator.php b/extensions/package-manager/src/ConfigureComposerValidator.php
@@ -13,7 +13,7 @@
 
 class ConfigureComposerValidator extends AbstractValidator
 {
-    use AllValidatorRules;
+    protected bool $validateMissingKeys = true;
 
     protected array $rules = [
         'minimum-stability' => ['sometimes', 'in:stable,RC,beta,alpha,dev'],

diff --git a/framework/core/src/Foundation/AbstractValidator.php b/framework/core/src/Foundation/AbstractValidator.php
@@ -22,13 +22,12 @@ abstract class AbstractValidator
      */
     protected array $configuration = [];
 
-    /**
-     * @var array
-     */
     protected array $rules = [];
 
     protected ?Validator $laravelValidator = null;
 
+    protected bool $validateMissingKeys = false;
+
     public function __construct(
         protected Factory $validator,
         protected TranslatorInterface $translator
@@ -54,6 +53,16 @@ public function assertValid(array $attributes): void
         }
     }
 
+    /**
+     * Whether to validate missing keys or to only validate provided data keys.
+     */
+    public function validateMissingKeys(bool $validateMissingKeys = true): static
+    {
+        $this->validateMissingKeys = $validateMissingKeys;
+
+        return $this;
+    }
+
     public function prepare(array $attributes): static
     {
         $this->laravelValidator ??= $this->makeValidator($attributes);
@@ -71,14 +80,23 @@ protected function getRules(): array
         return $this->rules;
     }
 
+    protected function getActiveRules(array $attributes): array
+    {
+        $rules = $this->getRules();
+
+        return $this->validateMissingKeys
+            ? $rules
+            : Arr::only($rules, array_keys($attributes));
+    }
+
     protected function getMessages(): array
     {
         return [];
     }
 
     protected function makeValidator(array $attributes): Validator
     {
-        $rules = Arr::only($this->getRules(), array_keys($attributes));
+        $rules = $this->getActiveRules($attributes);
 
         $validator = $this->validator->make($attributes, $rules, $this->getMessages());