Move mixin classes to the "Mixin" namespace

Just to make the root directory cleaner. Signed-off-by: Henrique Moody <[email protected]>
Respect · Mar 3, 2024 · c946f16 · c946f16
1 parent cea77d2
commit c946f16
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/library/ChainedValidator.php → library/Mixins/ChainedValidator.php b/library/ChainedValidator.php → library/Mixins/ChainedValidator.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Respect\Validation;
+namespace Respect\Validation\Mixins;
 
 use finfo;
+use Respect\Validation\Validatable;
 
 interface ChainedValidator extends Validatable
 {

diff --git a/library/StaticValidator.php → library/Mixins/StaticValidator.php b/library/StaticValidator.php → library/Mixins/StaticValidator.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Respect\Validation;
+namespace Respect\Validation\Mixins;
 
 use finfo;
+use Respect\Validation\Validatable;
 
 interface StaticValidator
 {

diff --git a/library/Validator.php b/library/Validator.php
@@ -17,6 +17,8 @@
 use Respect\Validation\Message\StandardFormatter;
 use Respect\Validation\Message\StandardRenderer;
 use Respect\Validation\Message\Template;
+use Respect\Validation\Mixins\ChainedValidator;
+use Respect\Validation\Mixins\StaticValidator;
 use Respect\Validation\Rules\AbstractRule;
 use Respect\Validation\Rules\AllOf;
 
@@ -25,6 +27,7 @@
 
 /**
  * @mixin StaticValidator
+ * @mixin ChainedValidator
  */
 #[ExceptionClass(NestedValidationException::class)]
 #[Template(

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -12,16 +12,6 @@ parameters:
       message: '/Instanceof between mixed and SimpleXMLElement will always evaluate to false\./'
       path: library/Rules/ArrayVal.php
 
-    -
-      # Why: This error is intentional, so PHPunit can test an invalid __callStatic call
-      message: '/Call to an undefined static method Respect\\Validation\\Validator::iDoNotExistSoIShouldThrowException/'
-      path: tests/unit/ValidatorTest.php
-
-    -
-      # Why: StaticValidator is a stub interface that types __callStatic
-      message: '/Call to static method PHPUnit\\Framework\\Assert::assertSame\(\) with Respect\\Validation\\Validator and Respect\\Validation\\ChainedValidator will always evaluate to false./'
-      path: tests/unit/ValidatorTest.php
-
     -
         # Why: I don't want to make changes to the code just to make phpstan happy
         message: '/Parameter #2 \$values of function vsprintf expects array<bool\|float\|int\|string\|null>, array<string, array<bool\|int\|string>\|bool\|float\|int\|string> given./'

diff --git a/tests/unit/ValidatorTest.php b/tests/unit/ValidatorTest.php
@@ -27,6 +27,8 @@ public function staticCreateShouldReturnNewValidator(): void
     public function invalidRuleClassShouldThrowComponentException(): void
     {
         $this->expectException(ComponentException::class);
+
+        // @phpstan-ignore-next-line
         Validator::iDoNotExistSoIShouldThrowException();
     }
 
@@ -35,6 +37,7 @@ public function shouldReturnValidatorInstanceWhenTheNotRuleIsCalledWithArguments
     {
         $validator = Validator::create();
 
+        // @phpstan-ignore-next-line
         self::assertSame($validator, $validator->not($validator->notEmpty()));
     }
 }