CS: Add more rector rule sets (#1778)

Author: DerManoMann

rector.php

@@ -1,31 +1,41 @@
 <?php
 
-use Rector\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector;
 use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
+use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
+use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector;
+use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
-use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
+use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
 use Rector\ValueObject\PhpVersion;
 
 return RectorConfig::configure()
-    ->withRules([
-        TypedPropertyFromStrictConstructorRector::class
-    ])
     ->withSkip([
         CombineIfRector::class,
         ExplicitBoolCompareRector::class,
         ForRepeatedCountToOwnVariableRector::class,
         RemoveAlwaysTrueIfConditionRector::class => [
             __DIR__ . '/src/Processors/ExpandEnums.php',
-        ] ,
+        ],
         RemoveDeadInstanceOfRector::class => [
             __DIR__ . '/src/Processors/ExpandEnums.php',
         ],
         ShortenElseIfRector::class,
+        NewlineAfterStatementRector::class,
+        NullableCompareToNullRector::class,
+        StringClassNameToClassConstantRector::class => [
+            __DIR__ . '/src/Analysers/DocBlockParser.php',
+        ],
+        EncapsedStringsToSprintfRector::class,
+        ParamTypeByMethodCallTypeRector::class => [
+            __DIR__ . '/src/Serializer.php',
+        ],
     ])
-    ->withPreparedSets(true, true)
-    ->withPhpVersion(PhpVersion::PHP_74);
+    ->withPreparedSets(true, true, true, true)
+    ->withPhpVersion(PhpVersion::PHP_74)
+    ->withPhpSets();

src/Analysers/ComposerAutoloaderScanner.php

@@ -26,7 +26,7 @@ class ComposerAutoloaderScanner
     public function scan(array $namespaces): array
     {
         $units = [];
-        if ($autoloader = $this->getComposerAutoloader()) {
+        if ($autoloader = static::getComposerAutoloader()) {
             foreach (array_keys($autoloader->getClassMap()) as $unit) {
                 foreach ($namespaces as $namespace) {
                     if (0 === strpos($unit, $namespace)) {

src/Analysers/DocBlockAnnotationFactory.php

@@ -27,7 +27,7 @@ public function isSupported(): bool
         return DocBlockParser::isEnabled();
     }
 
-    public function setGenerator(Generator $generator)
+    public function setGenerator(Generator $generator): self
     {
         $this->generator = $generator;
 

src/Analysers/DocBlockParser.php

@@ -65,19 +65,19 @@ public function fromComment(string $comment, Context $context): array
             }
 
             return $this->docParser->parse($comment, $context->getDebugLocation());
-        } catch (\Exception $e) {
-            if (preg_match('/^(.+) at position ([0-9]+) in ' . preg_quote((string) $context, '/') . '\.$/', $e->getMessage(), $matches)) {
+        } catch (\Exception $exception) {
+            if (preg_match('/^(.+) at position ([0-9]+) in ' . preg_quote((string) $context, '/') . '\.$/', $exception->getMessage(), $matches)) {
                 $errorMessage = $matches[1];
                 $errorPos = (int) $matches[2];
                 $atPos = strpos($comment, '@');
                 $context->line -= substr_count($comment, "\n", $atPos + $errorPos) + 1;
                 $lines = explode("\n", substr($comment, $atPos, $errorPos));
                 $context->character = strlen(array_pop($lines)) + 1; // position starts at 0 character starts at 1
-                $context->logger->error($errorMessage . ' in ' . $context, ['exception' => $e]);
+                $context->logger->error($errorMessage . ' in ' . $context, ['exception' => $exception]);
             } else {
                 $context->logger->error(
-                    $e->getMessage() . ($context->filename ? ('; file=' . $context->filename) : ''),
-                    ['exception' => $e]
+                    $exception->getMessage() . ($context->filename ? ('; file=' . $context->filename) : ''),
+                    ['exception' => $exception]
                 );
             }
 

src/Analysers/TokenScanner.php

@@ -31,8 +31,8 @@ public function scanFile(string $filename): array
         $parser = (new ParserFactory())->createForNewestSupportedVersion();
         try {
             $stmts = $parser->parse(file_get_contents($filename));
-        } catch (Error $e) {
-            throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
+        } catch (Error $error) {
+            throw new \RuntimeException($error->getMessage(), $error->getCode(), $error);
         }
 
         $result = [];
@@ -59,7 +59,7 @@ protected function collect_stmts(array $stmts, string $namespace): array
 
             return $namespace . '\\' . $name;
         };
-        $details = function () use (&$uses) {
+        $details = function () use (&$uses): array {
             return [
                 'uses' => $uses,
                 'interfaces' => [],

src/Analysis.php

@@ -387,7 +387,7 @@ public function unmerged(): Analysis
      *
      * @return \stdClass {merged: Analysis, unmerged: Analysis}
      */
-    public function split()
+    public function split(): \stdClass
     {
         $result = new \stdClass();
         $result->merged = $this->merged();

src/Annotations/AbstractAnnotation.php

@@ -434,7 +434,7 @@ public function jsonSerialize()
      * @param string $ref     Current ref path?
      * @param object $context a free-form context contains
      */
-    public function validate(array $stack = [], array $skip = [], string $ref = '', $context = null): bool
+    public function validate(array $stack = [], array $skip = [], string $ref = '', ?object $context = null): bool
     {
         if (in_array($this, $skip, true)) {
             return true;
@@ -792,6 +792,6 @@ protected function combine(...$args): array
             }
         }
 
-        return array_filter($combined, fn ($value) => !Generator::isDefault($value) && $value !== null);
+        return array_filter($combined, fn ($value): bool => !Generator::isDefault($value) && $value !== null);
     }
 }

src/Annotations/Components.php

@@ -123,7 +123,7 @@ class Components extends AbstractAnnotation
      */
     public static function componentTypes(): array
     {
-        return array_filter(array_keys(self::$_nested), fn ($value) => $value !== Attachable::class);
+        return array_filter(array_keys(self::$_nested), fn ($value): bool => $value !== Attachable::class);
     }
 
     /**

src/Annotations/Items.php

@@ -41,7 +41,7 @@ class Items extends Schema
     /**
      * @inheritdoc
      */
-    public function validate(array $stack = [], array $skip = [], string $ref = '', $context = null): bool
+    public function validate(array $stack = [], array $skip = [], string $ref = '', ?object $context = null): bool
     {
         if (in_array($this, $skip, true)) {
             return true;

src/Annotations/License.php

@@ -86,7 +86,7 @@ public function jsonSerialize()
     /**
      * @inheritdoc
      */
-    public function validate(array $stack = [], array $skip = [], string $ref = '', $context = null): bool
+    public function validate(array $stack = [], array $skip = [], string $ref = '', ?object $context = null): bool
     {
         $valid = parent::validate($stack, $skip, $ref, $context);