[TASK] Harden method signature of logicalAnd() and logicalOr()

Resolves: #2861
sabbelasichon · Oct 19, 2023 · fb52501 · fb52501
1 parent 0a32294
commit fb52501
Show file tree

Hide file tree

Showing 22 changed files with 1,017 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -79,12 +79,13 @@
         "contribute": [
             "@fix-rector",
             "@fix-style",
-            "@analyze"
+            "@analyze",
+            "@phpstan-generate-baseline"
         ],
         "check-style": "@php vendor/bin/ecs check --ansi",
         "fix-style": "@php vendor/bin/ecs check --fix --ansi",
         "analyze": "@php vendor/bin/phpstan analyse --memory-limit=-1 --ansi",
-        "phpstan-generate-baseline": "@php vendor/bin/phpstan analyse --generate-baseline --memory-limit=-1 --ansi",
+        "phpstan-generate-baseline": "@php vendor/bin/phpstan analyse --generate-baseline --memory-limit=-1 --ansi --allow-empty-baseline",
         "test": "@php vendor/bin/phpunit",
         "docs": "@php vendor/bin/rule-doc-generator generate src --output-file docs/all_rectors_overview.md --ansi",
         "rector": "@php vendor/bin/rector process --dry-run --ansi",

diff --git a/config/v12/typo3-120.php b/config/v12/typo3-120.php
@@ -12,6 +12,7 @@
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\AddMethodToWidgetInterfaceClassesRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\ChangeExtbaseValidatorsRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\ContentObjectRegistrationViaServiceConfigurationRector;
+use Ssch\TYPO3Rector\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\HintNecessaryUploadedFileChangesRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\ImplementSiteLanguageAwareInterfaceRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\MigrateQueryBuilderExecuteRector;
@@ -170,4 +171,5 @@
     $rectorConfig->rule(RegisterExtbaseTypeConvertersAsServicesRector::class);
     $rectorConfig->rule(ChangeExtbaseValidatorsRector::class);
     $rectorConfig->rule(ContentObjectRegistrationViaServiceConfigurationRector::class);
+    $rectorConfig->rule(HardenMethodSignatureOfLogicalAndAndLogicalOrRector::class);
 };
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -0,0 +1,2 @@
+parameters:
+	ignoreErrors: []
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,4 +1,5 @@
 includes:
+    - phpstan-baseline.neon
     # see https://github.com/symplify/phpstan-extensions
     - utils/phpstan/config/typo3-rector.neon
 
@@ -33,11 +34,19 @@ parameters:
          - tests/bootstrap-phpstan.php
 
     inferPrivatePropertyTypeFromConstructor: true
-    reportUnmatchedIgnoredErrors: true
+    reportUnmatchedIgnoredErrors: false
 
     ignoreErrors:
         # node finder
         - '#Method Ssch\\TYPO3Rector\\Rector\\v11\\v0\\ForwardResponseInsteadOfForwardMethodRector\:\:extractForwardMethodCalls\(\) should return array<PhpParser\\Node\\Expr\\MethodCall\> but returns array<PhpParser\\Node\>#'
+        - "#\\:\\:getRuleDefinition\\(\\) has invalid return type Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\CodeSample\\\\CodeSample not found\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition not found\\.$#"
+
+        # These 3 rules are not found for some strange reasons in GitHub Actions but locally they are reported
+        - "#\\:\\:getRuleDefinition\\(\\) has invalid return type Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\CodeSample\\\\CodeSample not found\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition not found\\.$#"
 
         # waits for Rector and PHPStan to share same php-parser, probably with PHPStan 1.0
         - '#PhpParser\\Node\\Arg\|PhpParser\\Node\\VariadicPlaceholder#'