Cleanup configs + remove few unused classes (#99)

symplify · Oct 19, 2023 · d4b0cd4 · d4b0cd4
1 parent 43f05cb
commit d4b0cd4
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 320 deletions.
diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json
@@ -24,8 +24,7 @@
         },
         "phpstan": {
             "includes": [
-                "config/services/services.neon",
-                "config/packages/symfony/services.neon"
+                "config/services/services.neon"
             ]
         }
     },

diff --git a/composer.json b/composer.json
@@ -45,8 +45,7 @@
     "extra": {
         "phpstan": {
             "includes": [
-                "config/services/services.neon",
-                "config/packages/symfony/services.neon"
+                "config/services/services.neon"
             ]
         }
     },

diff --git a/config/packages/cognitive-complexity/cognitive-complexity-rules.neon b/config/packages/cognitive-complexity/cognitive-complexity-rules.neon
diff --git a/config/packages/cognitive-complexity/cognitive-complexity-services.neon b/config/packages/cognitive-complexity/cognitive-complexity-services.neon
diff --git a/config/packages/object-calisthenics-rules/object-calisthenics-rules.neon b/config/packages/object-calisthenics-rules/object-calisthenics-rules.neon
diff --git a/config/packages/symfony/services.neon b/config/packages/symfony/services.neon
diff --git a/config/packages/symfony/symfony-rules.neon b/config/packages/symfony/symfony-rules.neon
diff --git a/config/services/services.neon b/config/services/services.neon
@@ -40,8 +40,3 @@ services:
     - Symplify\PHPStanRules\Matcher\Collector\PublicClassMethodMatcher
     - Symplify\PHPStanRules\Matcher\ClassMethodCallReferenceResolver
     - Symplify\PHPStanRules\Printer\CollectorMetadataPrinter
-
-    -
-        class: Symplify\PHPStanRules\NodeVisitor\AssignedToPropertyNodeVisitor
-        tags:
-            - phpstan.parser.richParserNodeVisitor
diff --git a/config/static-rules.neon b/config/static-rules.neon
@@ -3,6 +3,7 @@ rules:
     - Symplify\PHPStanRules\Rules\ForbiddenExtendOfNonAbstractClassRule
     - Symplify\PHPStanRules\Rules\NoStaticPropertyRule
     - Symplify\PHPStanRules\Rules\NoConstructorInTestRule
+    - Symplify\PHPStanRules\Rules\Complexity\ForbiddenSameNamedNewInstanceRule
 
     # domain
     - Symplify\PHPStanRules\Rules\Domain\RequireExceptionNamespaceRule

diff --git a/config/symplify-rules.neon b/config/symplify-rules.neon
@@ -1,15 +1,7 @@
 includes:
-    # 1. basic static sets
-    - static-rules.neon
-
-    # 2. prepared sets
     - code-complexity-rules.neon
-    - forbidden-static-rules.neon
-    - regex-rules.neon
-    - packages/symfony/symfony-rules.neon
-    - test-rules.neon
-    - naming-rules.neon
     - collector-rules.neon
-
-    # 3. custom symplify configuratoin
     - configurable-rules.neon
+    - naming-rules.neon
+    - regex-rules.neon
+    - static-rules.neon
diff --git a/src/Collector/ClassMethod/NewAndSetterCallsCollector.php b/src/Collector/ClassMethod/NewAndSetterCallsCollector.php
diff --git a/src/Enum/AttributeKey.php b/src/Enum/AttributeKey.php
@@ -31,11 +31,6 @@ final class AttributeKey
      */
     public const PHPSTAN_CACHE_PRINTER = 'phpstan_cache_printer';
 
-    /**
-     * @var string
-     */
-    public const ASSIGNED_TO = 'assigned_to';
-
     /**
      * PHPStan @api
      *

diff --git a/src/NodeVisitor/AssignedToPropertyNodeVisitor.php b/src/NodeVisitor/AssignedToPropertyNodeVisitor.php
diff --git a/src/Symfony/NodeAnalyzer/SymfonyControllerAnalyzer.php b/src/Symfony/NodeAnalyzer/SymfonyControllerAnalyzer.php
@@ -15,18 +15,15 @@ final class SymfonyControllerAnalyzer
      */
     private const ROUTE_ATTRIBUTE = 'Symfony\Component\Routing\Annotation\Route';
 
-    public function __construct(
-        private readonly AttributeFinder $attributeFinder
-    ) {
-    }
-
-    public function isControllerActionMethod(ClassMethod $classMethod): bool
+    public static function isControllerActionMethod(ClassMethod $classMethod): bool
     {
+        $attributeFinder = new AttributeFinder();
+
         if (! $classMethod->isPublic()) {
             return false;
         }
 
-        if ($this->attributeFinder->hasAttribute($classMethod, self::ROUTE_ATTRIBUTE)) {
+        if ($attributeFinder->hasAttribute($classMethod, self::ROUTE_ATTRIBUTE)) {
             return true;
         }
 

diff --git a/src/Symfony/Rules/RequireInvokableControllerRule.php b/src/Symfony/Rules/RequireInvokableControllerRule.php
@@ -27,11 +27,6 @@ final class RequireInvokableControllerRule implements Rule, DocumentedRuleInterf
      */
     public const ERROR_MESSAGE = 'Use invokable controller with __invoke() method instead of named action method';
 
-    public function __construct(
-        private readonly SymfonyControllerAnalyzer $symfonyControllerAnalyzer
-    ) {
-    }
-
     /**
      * @return class-string<Node>
      */
@@ -58,7 +53,7 @@ public function processNode(Node $node, Scope $scope): array
 
         $classLike = $node->getOriginalNode();
         foreach ($classLike->getMethods() as $classMethod) {
-            if (! $this->symfonyControllerAnalyzer->isControllerActionMethod($classMethod)) {
+            if (! SymfonyControllerAnalyzer::isControllerActionMethod($classMethod)) {
                 continue;
             }