Merge pull request #39 from shochdoerfer/feature/optimize_rule_config

Apply phpstan.rules.rule tag dynamically via DI

Author: shochdoerfer

extension.neon

@@ -9,6 +9,12 @@ parametersSchema:
 		checkServiceContracts: bool()
 	])
 
+conditionalTags:
+	bitExpert\PHPStan\Magento\Rules\AbstractModelRetrieveCollectionViaFactoryRule:
+		phpstan.rules.rule: %magento.checkCollectionViaFactory%
+	bitExpert\PHPStan\Magento\Rules\AbstractModelUseServiceContractRule:
+		phpstan.rules.rule: %magento.checkServiceContracts%
+
 services:
 	-
 		class: bitExpert\PHPStan\Magento\Type\ObjectManagerDynamicReturnTypeExtension
@@ -24,13 +30,6 @@ services:
 			- phpstan.broker.methodsClassReflectionExtension
 	-
 		class: bitExpert\PHPStan\Magento\Rules\AbstractModelRetrieveCollectionViaFactoryRule
-		arguments:
-					checkCollectionViaFactory: %magento.checkCollectionViaFactory%
-		tags:
-			- phpstan.rules.rule
 	-
 		class: bitExpert\PHPStan\Magento\Rules\AbstractModelUseServiceContractRule
-		arguments:
-					checkServiceContracts: %magento.checkServiceContracts%
-		tags:
-			- phpstan.rules.rule
+

src/bitExpert/PHPStan/Magento/Rules/AbstractModelRetrieveCollectionViaFactoryRule.php

@@ -27,21 +27,6 @@
  */
 class AbstractModelRetrieveCollectionViaFactoryRule implements Rule
 {
-    /**
-     * @var bool
-     */
-    private $checkCollectionViaFactory;
-
-    /**
-     * AbstractModelRetrieveCollectionViaFactoryRule constructor.
-     *
-     * @param bool $checkCollectionViaFactory
-     */
-    public function __construct(bool $checkCollectionViaFactory = true)
-    {
-        $this->checkCollectionViaFactory = $checkCollectionViaFactory;
-    }
-
     /**
      * @return string
      */
@@ -58,10 +43,6 @@ public function getNodeType(): string
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        if (!$this->checkCollectionViaFactory) {
-            return [];
-        }
-
         if (!$node instanceof MethodCall) {
             throw new ShouldNotHappenException();
         }

src/bitExpert/PHPStan/Magento/Rules/AbstractModelUseServiceContractRule.php

@@ -27,21 +27,6 @@
  */
 class AbstractModelUseServiceContractRule implements Rule
 {
-    /**
-     * @var bool
-     */
-    private $checkServiceContracts;
-
-    /**
-     * AbstractModelUseServiceContractRule constructor.
-     *
-     * @param bool $checkServiceContracts
-     */
-    public function __construct(bool $checkServiceContracts = true)
-    {
-        $this->checkServiceContracts = $checkServiceContracts;
-    }
-
     /**
      * @return string
      */
@@ -58,10 +43,6 @@ public function getNodeType(): string
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        if (!$this->checkServiceContracts) {
-            return [];
-        }
-
         if (!$node instanceof MethodCall) {
             throw new ShouldNotHappenException();
         }

tests/bitExpert/PHPStan/Magento/Rules/AbstractModelRetrieveCollectionViaFactoryRuleUnitTest.php

@@ -39,17 +39,4 @@ public function checkCaughtException(): void
             ]
         ]);
     }
-
-    /**
-     * @test
-     */
-    public function inactiveRuleReturnsArray(): void
-    {
-        $rule = new AbstractModelRetrieveCollectionViaFactoryRule(false);
-        $node = $this->createMock(\PhpParser\Node::class);
-        $scope = $this->createMock(\PHPStan\Analyser\Scope::class);
-
-        $return = $rule->processNode($node, $scope);
-        $this->assertCount(0, $return);
-    }
 }

tests/bitExpert/PHPStan/Magento/Rules/AbstractModelUseServiceContractRuleUnitTest.php

@@ -46,17 +46,4 @@ public function checkCaughtExceptions(): void
             ],
         ]);
     }
-
-    /**
-     * @test
-     */
-    public function inactiveRuleReturnsArray(): void
-    {
-        $rule = new AbstractModelUseServiceContractRule(false);
-        $node = $this->createMock(\PhpParser\Node::class);
-        $scope = $this->createMock(\PHPStan\Analyser\Scope::class);
-
-        $return = $rule->processNode($node, $scope);
-        $this->assertCount(0, $return);
-    }
 }