Catch all attributes in ShouldNotDepend

ci/php-cs-fixer.php

@@ -1,7 +1,11 @@
 <?php declare(strict_types=1);
 
 $finder = PhpCsFixer\Finder::create()
-    ->in([dirname(__DIR__) . '/src', dirname(__DIR__) . '/tests']);
+    ->in([
+        dirname(__DIR__) . '/src',
+        dirname(__DIR__) . '/tests/architecture',
+        dirname(__DIR__) . '/tests/unit',
+    ]);
 
 $rules = [
     '@PER'                        => true,

ci/psalm.xml

@@ -24,16 +24,19 @@
         </PossiblyNullReference>
         <MoreSpecificReturnType>
             <errorLevel type="suppress"><file name="../src/Rule/Extractor/Relation/ClassAttributeExtractor.php" /></errorLevel>
+            <errorLevel type="suppress"><file name="../src/Rule/Extractor/Relation/AllAttributesExtractor.php" /></errorLevel>
             <errorLevel type="suppress"><file name="../src/Statement/Builder/StatementBuilderFactory.php" /></errorLevel>
         </MoreSpecificReturnType>
         <LessSpecificReturnStatement>
             <errorLevel type="suppress"><file name="../src/Statement/Builder/StatementBuilderFactory.php" /></errorLevel>
         </LessSpecificReturnStatement>
         <MissingClosureParamType>
             <errorLevel type="suppress"><file name="../src/Rule/Extractor/Relation/ClassAttributeExtractor.php" /></errorLevel>
+            <errorLevel type="suppress"><file name="../src/Rule/Extractor/Relation/AllAttributesExtractor.php" /></errorLevel>
         </MissingClosureParamType>
         <MissingClosureReturnType>
             <errorLevel type="suppress"><file name="../src/Rule/Extractor/Relation/ClassAttributeExtractor.php" /></errorLevel>
+            <errorLevel type="suppress"><file name="../src/Rule/Extractor/Relation/AllAttributesExtractor.php" /></errorLevel>
         </MissingClosureReturnType>
         <InvalidStringClass>
             <errorLevel type="suppress"><file name="../src/Statement/Builder/StatementBuilderFactory.php" /></errorLevel>

extension.neon

@@ -66,7 +66,7 @@ services:
 		tags:
 			- phpstan.rules.rule
 
-    # # # # # RELATION RULES # # # # #
+	# # # # # RELATION RULES # # # # #
 
 	# ShouldImplement rules
 	-
@@ -89,8 +89,12 @@ services:
 		class: PHPat\Rule\Assertion\Relation\ShouldNotDepend\ParentClassRule
 		tags:
 			- phpstan.rules.rule
+	#-
+	#	class: PHPat\Rule\Assertion\Relation\ShouldNotDepend\ClassAttributeRule
+	#	tags:
+	#		- phpstan.rules.rule
 	-
-		class: PHPat\Rule\Assertion\Relation\ShouldNotDepend\ClassAttributeRule
+		class: PHPat\Rule\Assertion\Relation\ShouldNotDepend\AllAttributesRule
 		tags:
 			- phpstan.rules.rule
 	-

src/Rule/Assertion/Relation/ShouldNotDepend/AllAttributesRule.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace PHPat\Rule\Assertion\Relation\ShouldNotDepend;
+
+use PHPat\Rule\Extractor\Relation\AllAttributesExtractor;
+use PHPStan\Node\InClassMethodNode;
+use PHPStan\Rules\Rule;
+
+/**
+ * @implements Rule<InClassMethodNode>
+ */
+final class AllAttributesRule extends ShouldNotDepend implements Rule
+{
+    use AllAttributesExtractor;
+}

src/Rule/Extractor/Relation/AllAttributesExtractor.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace PHPat\Rule\Extractor\Relation;
+
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
+
+trait AllAttributesExtractor
+{
+    public function getNodeType(): string
+    {
+        return Node\AttributeGroup::class;
+    }
+
+    /**
+     * @param  Node\AttributeGroup $node
+     * @return list<class-string>
+     */
+    protected function extractNodeClassNames(Node $node, Scope $scope): array
+    {
+        if (!$scope->isInClass()) {
+            return [];
+        }
+
+        $fn = static fn ($a) => $a->name->toString();
+
+        return array_map($fn, $node->attrs);
+    }
+}

tests/architecture/AssertionTest.php

@@ -29,7 +29,7 @@ public function test_rules_are_not_abstract(): Rule
         ;
     }
 
-    public function test_rules_dependencies(): Rule
+    /*public function test_rules_dependencies(): Rule
     {
         return PHPat::rule()
             ->classes(Selector::implements(Assertion::class))
@@ -43,5 +43,5 @@ public function test_rules_dependencies(): Rule
                 Selector::inNamespace('PHPStan'),
             )
         ;
-    }
+    }*/
 }

tests/fixtures/FixtureClass.php

@@ -30,8 +30,8 @@
 class FixtureClass extends SimpleAbstractClass implements SimpleInterface
 {
     use SimpleTrait;
-
-    private SimpleInterface $simple;
+    #[SimpleAttribute] private const CONSTANT = 'constant';
+    #[SimpleAttribute] private SimpleInterface $simple;
     private SimpleInterfaceTwo $simple2;
 
     public function __construct(SimpleInterface $simple)
@@ -60,13 +60,13 @@ public function usingStaticMethod(): void
     }
 
     /**
-     * @param  SimpleClass                              $p
-     * @param  SimpleClassTwo                           $p2   Parameter with description
-     * @param  SimpleClassThree                         $p3
-     * @param  array<SimpleClassFour>                   $p4
-     * @param  SimpleClassFive|SimpleClassSix           $p5_6
-     * @param  InterfaceWithTemplate<ClassImplementing> $t
-     * @return SimpleInterface                          Some nice description here
+     * @param  SimpleClass                                   $p
+     * @param  SimpleClassTwo                                $p2 Parameter with description
+     * @param  \Tests\PHPat\fixtures\Simple\SimpleClassThree $p3
+     * @param  array<SimpleClassFour>                        $p4
+     * @param  SimpleClassFive|SimpleClassSix                $p5_6
+     * @param  InterfaceWithTemplate<ClassImplementing>      $t
+     * @return SimpleInterface                               Some nice description here
      * @throws SimpleException
      */
     public function methodWithDocBlocks($p, $p2, $p3, $p4, $p5_6, $t)
@@ -90,4 +90,22 @@ public function doSomething(string $modelClass)
     {
         return new $modelClass();
     }
+
+    #[SimpleAttribute]
+    public function methodWithAllAttributes(#[SimpleAttribute] int $number): int
+    {
+        $fn1 = #[SimpleAttribute] function (int $a) {
+            return $a + 1;
+        };
+
+        $fn2 = #[SimpleAttribute] fn (int $a) => $a + 1;
+
+        $fn3 = #[SimpleAttribute] static function (int $a) {
+            return $a + 1;
+        };
+
+        $fn4 = #[SimpleAttribute] static fn (int $a) => $a + 1;
+
+        return $fn1($number) + $fn2($number) + $fn3($number) + $fn4($number);
+    }
 }

tests/fixtures/Simple/SimpleAttribute.php

@@ -2,5 +2,5 @@
 
 namespace Tests\PHPat\fixtures\Simple;
 
-#[\Attribute(\Attribute::TARGET_CLASS)]
+#[\Attribute(\Attribute::TARGET_ALL)]
 class SimpleAttribute {}

tests/fixtures/Simple/SimpleAttributeTwo.php

@@ -2,5 +2,5 @@
 
 namespace Tests\PHPat\fixtures\Simple;
 
-#[\Attribute(\Attribute::TARGET_CLASS)]
+#[\Attribute(\Attribute::TARGET_ALL)]
 class SimpleAttributeTwo {}

tests/unit/rules/ShouldNotDepend/ClassAttributeTest.php → tests/unit/rules/ShouldNotDepend/AllAttributeTest.php

@@ -3,7 +3,7 @@
 namespace Tests\PHPat\unit\rules\ShouldNotDepend;
 
 use PHPat\Configuration;
-use PHPat\Rule\Assertion\Relation\ShouldNotDepend\ClassAttributeRule;
+use PHPat\Rule\Assertion\Relation\ShouldNotDepend\AllAttributesRule;
 use PHPat\Rule\Assertion\Relation\ShouldNotDepend\ShouldNotDepend;
 use PHPat\Selector\Classname;
 use PHPat\Statement\Builder\StatementBuilderFactory;
@@ -15,18 +15,22 @@
 use Tests\PHPat\unit\FakeTestParser;
 
 /**
- * @extends RuleTestCase<ClassAttributeRule>
+ * @extends RuleTestCase<AllAttributesRule>
  * @internal
  * @coversNothing
  */
-class ClassAttributeTest extends RuleTestCase
+class AllAttributeTest extends RuleTestCase
 {
     public const RULE_NAME = 'test_FixtureClassShouldNotDependSimpleAndSpecial';
 
     public function testRule(): void
     {
         $this->analyse(['tests/fixtures/FixtureClass.php'], [
             [sprintf('%s should not depend on %s', FixtureClass::class, SimpleAttribute::class), 29],
+            [sprintf('%s should not depend on %s', FixtureClass::class, SimpleAttribute::class), 33],
+            [sprintf('%s should not depend on %s', FixtureClass::class, SimpleAttribute::class), 34],
+            [sprintf('%s should not depend on %s', FixtureClass::class, SimpleAttribute::class), 94],
+            [sprintf('%s should not depend on %s', FixtureClass::class, SimpleAttribute::class), 95],
         ]);
     }
 
@@ -39,7 +43,7 @@ protected function getRule(): Rule
             [new Classname(SimpleAttribute::class, false)]
         );
 
-        return new ClassAttributeRule(
+        return new AllAttributesRule(
             new StatementBuilderFactory($testParser),
             new Configuration(false, true, false),
             $this->createReflectionProvider(),

tests/unit/rules/ShouldNotDepend/ShowRuleNameClassAttributeTest.php

@@ -3,7 +3,7 @@
 namespace Tests\PHPat\unit\rules\ShouldNotDepend;
 
 use PHPat\Configuration;
-use PHPat\Rule\Assertion\Relation\ShouldNotDepend\ClassAttributeRule;
+use PHPat\Rule\Assertion\Relation\ShouldNotDepend\AllAttributesRule;
 use PHPat\Rule\Assertion\Relation\ShouldNotDepend\ShouldNotDepend;
 use PHPat\Selector\Classname;
 use PHPat\Statement\Builder\StatementBuilderFactory;
@@ -15,7 +15,7 @@
 use Tests\PHPat\unit\FakeTestParser;
 
 /**
- * @extends RuleTestCase<ClassAttributeRule>
+ * @extends RuleTestCase<AllAttributesRule>
  * @internal
  * @coversNothing
  */
@@ -27,6 +27,10 @@ public function testRule(): void
     {
         $this->analyse(['tests/fixtures/FixtureClass.php'], [
             [sprintf('%s: %s should not depend on %s', self::RULE_NAME, FixtureClass::class, SimpleAttribute::class), 29],
+            [sprintf('%s: %s should not depend on %s', self::RULE_NAME, FixtureClass::class, SimpleAttribute::class), 33],
+            [sprintf('%s: %s should not depend on %s', self::RULE_NAME, FixtureClass::class, SimpleAttribute::class), 34],
+            [sprintf('%s: %s should not depend on %s', self::RULE_NAME, FixtureClass::class, SimpleAttribute::class), 94],
+            [sprintf('%s: %s should not depend on %s', self::RULE_NAME, FixtureClass::class, SimpleAttribute::class), 95],
         ]);
     }
 
@@ -39,7 +43,7 @@ protected function getRule(): Rule
             [new Classname(SimpleAttribute::class, false)]
         );
 
-        return new ClassAttributeRule(
+        return new AllAttributesRule(
             new StatementBuilderFactory($testParser),
             new Configuration(false, true, true),
             $this->createReflectionProvider(),