cleanup type annotations

carlosas · Jul 9, 2023 · d6dd6e1 · d6dd6e1
1 parent 4944190
commit d6dd6e1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/src/Rule/Assertion/Declaration/DeclarationAssertion.php b/src/Rule/Assertion/Declaration/DeclarationAssertion.php
@@ -18,7 +18,7 @@
 
 abstract class DeclarationAssertion implements Assertion
 {
-    /** @var array<array{string, SelectorInterface, array<SelectorInterface>, array<SelectorInterface>, array<SelectorInterface>}> */
+    /** @var array<array{string, SelectorInterface, array<SelectorInterface>, string[]}> */
     protected array $statements;
     protected Configuration $configuration;
     protected ReflectionProvider $reflectionProvider;

diff --git a/src/Rule/Assertion/Declaration/ValidationTrait.php b/src/Rule/Assertion/Declaration/ValidationTrait.php
@@ -13,6 +13,7 @@
 trait ValidationTrait
 {
     /**
+     * @param string[] $tips
      * @throws ShouldNotHappenException
      * @return array<RuleError>
      */
@@ -35,6 +36,7 @@ protected function applyShould(string $ruleName, ClassReflection $subject, bool
     }
 
     /**
+     * @param string[] $tips
      * @throws ShouldNotHappenException
      * @return array<RuleError>
      */

diff --git a/src/Statement/Builder/DeclarationStatementBuilder.php b/src/Statement/Builder/DeclarationStatementBuilder.php
@@ -12,7 +12,7 @@
 
 class DeclarationStatementBuilder implements StatementBuilder
 {
-    /** @var array<array{string, SelectorInterface, array<SelectorInterface>}> */
+    /** @var array<array{string, SelectorInterface, array<SelectorInterface>, string[]}> */
     protected $statements = [];
     /** @var array<RelationRule> */
     protected array $rules;
@@ -30,7 +30,7 @@ final public function __construct(string $assertion, array $rules)
     }
 
     /**
-     * @return array<array{string, SelectorInterface, array<SelectorInterface>}>
+     * @return array<array{string, SelectorInterface, array<SelectorInterface>, string[]}>
      */
     public function build(): array
     {
@@ -58,7 +58,7 @@ private function addStatement(
 
     /**
      * @param array<Rule> $rules
-     * @return array<array{string, SelectorInterface, array<SelectorInterface>}>
+     * @return array<array{string, SelectorInterface, array<SelectorInterface>, string[]}>
      */
     private function extractCurrentAssertion(array $rules): array
     {

diff --git a/tests/unit/tips/Declaration/MultipleTipTest.php b/tests/unit/tips/Declaration/MultipleTipTest.php
@@ -4,23 +4,22 @@
 
 namespace Tests\PHPat\unit\tips\Declaration;
 
-use Attribute;
 use PHPat\Configuration;
 use PHPat\Rule\Assertion\Declaration\ShouldBeFinal\IsFinalRule;
 use PHPat\Rule\Assertion\Declaration\ShouldBeFinal\ShouldBeFinal;
-use PHPat\Rule\Assertion\Relation\CanOnlyDepend\CanOnlyDepend;
 use PHPat\Rule\Assertion\Relation\CanOnlyDepend\ClassAttributeRule;
 use PHPat\Selector\Classname;
 use PHPat\Statement\Builder\StatementBuilderFactory;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
-use Tests\PHPat\fixtures\FixtureClass;
-use Tests\PHPat\fixtures\Simple\SimpleAttribute;
-use Tests\PHPat\unit\FakeTestParser;
 
 use function sprintf;
 
+use Tests\PHPat\fixtures\FixtureClass;
+
+use Tests\PHPat\unit\FakeTestParser;
+
 /**
  * @extends RuleTestCase<ClassAttributeRule>
  */
@@ -34,9 +33,9 @@ public function testRule(): void
                 sprintf('%s should be final', FixtureClass::class),
                 31,
                 <<<TIPS
-                • tip #1
-                • tip #2
-                TIPS,
+                    • tip #1
+                    • tip #2
+                    TIPS,
             ],
         ]);
     }

diff --git a/tests/unit/tips/Declaration/NoTipTest.php b/tests/unit/tips/Declaration/NoTipTest.php
@@ -4,23 +4,22 @@
 
 namespace Tests\PHPat\unit\tips\Declaration;
 
-use Attribute;
 use PHPat\Configuration;
 use PHPat\Rule\Assertion\Declaration\ShouldBeFinal\IsFinalRule;
 use PHPat\Rule\Assertion\Declaration\ShouldBeFinal\ShouldBeFinal;
-use PHPat\Rule\Assertion\Relation\CanOnlyDepend\CanOnlyDepend;
 use PHPat\Rule\Assertion\Relation\CanOnlyDepend\ClassAttributeRule;
 use PHPat\Selector\Classname;
 use PHPat\Statement\Builder\StatementBuilderFactory;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
-use Tests\PHPat\fixtures\FixtureClass;
-use Tests\PHPat\fixtures\Simple\SimpleAttribute;
-use Tests\PHPat\unit\FakeTestParser;
 
 use function sprintf;
 
+use Tests\PHPat\fixtures\FixtureClass;
+
+use Tests\PHPat\unit\FakeTestParser;
+
 /**
  * @extends RuleTestCase<ClassAttributeRule>
  */

diff --git a/tests/unit/tips/Declaration/OneTipTest.php b/tests/unit/tips/Declaration/OneTipTest.php
@@ -4,23 +4,22 @@
 
 namespace Tests\PHPat\unit\tips\Declaration;
 
-use Attribute;
 use PHPat\Configuration;
 use PHPat\Rule\Assertion\Declaration\ShouldBeFinal\IsFinalRule;
 use PHPat\Rule\Assertion\Declaration\ShouldBeFinal\ShouldBeFinal;
-use PHPat\Rule\Assertion\Relation\CanOnlyDepend\CanOnlyDepend;
 use PHPat\Rule\Assertion\Relation\CanOnlyDepend\ClassAttributeRule;
 use PHPat\Selector\Classname;
 use PHPat\Statement\Builder\StatementBuilderFactory;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
-use Tests\PHPat\fixtures\FixtureClass;
-use Tests\PHPat\fixtures\Simple\SimpleAttribute;
-use Tests\PHPat\unit\FakeTestParser;
 
 use function sprintf;
 
+use Tests\PHPat\fixtures\FixtureClass;
+
+use Tests\PHPat\unit\FakeTestParser;
+
 /**
  * @extends RuleTestCase<ClassAttributeRule>
  */
@@ -33,7 +32,7 @@ public function testRule(): void
             [
                 sprintf('%s should be final', FixtureClass::class),
                 31,
-                'tip #1'
+                'tip #1',
             ],
         ]);
     }

diff --git a/tests/unit/tips/Relation/MultipleTipTest.php b/tests/unit/tips/Relation/MultipleTipTest.php
@@ -13,11 +13,13 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
+
+use function sprintf;
+
 use Tests\PHPat\fixtures\FixtureClass;
 use Tests\PHPat\fixtures\Simple\SimpleAttribute;
-use Tests\PHPat\unit\FakeTestParser;
 
-use function sprintf;
+use Tests\PHPat\unit\FakeTestParser;
 
 /**
  * @extends RuleTestCase<ClassAttributeRule>