Fix: Run 'make coding-standards'

ergebnis · Apr 30, 2023 · 73d7ef8 · 73d7ef8
1 parent 6392fa9
commit 73d7ef8
Show file tree

Hide file tree

Showing 30 changed files with 62 additions and 72 deletions.
diff --git a/.php-cs-fixer.fixture.php b/.php-cs-fixer.fixture.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Copyright (c) 2018-2020 Andreas Möller
+ * Copyright (c) 2018-2023 Andreas Möller
  *
  * For the full copyright and license information, please view
  * the LICENSE.md file that was distributed with this source code.

diff --git a/src/Classes/FinalRule.php b/src/Classes/FinalRule.php
@@ -24,7 +24,7 @@ final class FinalRule implements Rule
     /**
      * @var array<int, string>
      */
-    private static $whitelistedAnnotations = [
+    private static array $whitelistedAnnotations = [
         'Entity',
         'ORM\Entity',
         'ORM\Mapping\Entity',
@@ -33,31 +33,25 @@ final class FinalRule implements Rule
     /**
      * @var array<int, class-string>
      */
-    private static $whitelistedAttributes = [
+    private static array $whitelistedAttributes = [
         'Doctrine\ORM\Mapping\Entity',
     ];
 
-    /**
-     * @var bool
-     */
-    private $allowAbstractClasses;
+    private bool $allowAbstractClasses;
 
     /**
      * @var array<int, string>
      */
-    private $classesNotRequiredToBeAbstractOrFinal;
+    private array $classesNotRequiredToBeAbstractOrFinal;
 
-    /**
-     * @var string
-     */
-    private $errorMessageTemplate = 'Class %s is not final.';
+    private string $errorMessageTemplate = 'Class %s is not final.';
 
     /**
      * @param array<int, class-string> $classesNotRequiredToBeAbstractOrFinal
      */
     public function __construct(
         bool $allowAbstractClasses,
-        array $classesNotRequiredToBeAbstractOrFinal
+        array $classesNotRequiredToBeAbstractOrFinal,
     ) {
         $this->allowAbstractClasses = $allowAbstractClasses;
         $this->classesNotRequiredToBeAbstractOrFinal = \array_map(static function (string $classNotRequiredToBeAbstractOrFinal): string {
@@ -76,13 +70,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\Class_) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\Class_::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Classes/NoExtendsRule.php b/src/Classes/NoExtendsRule.php
@@ -23,14 +23,14 @@ final class NoExtendsRule implements Rule
     /**
      * @var array<int, class-string>
      */
-    private static $defaultClassesAllowedToBeExtended = [
+    private static array $defaultClassesAllowedToBeExtended = [
         'PHPUnit\\Framework\\TestCase',
     ];
 
     /**
      * @var array<int, class-string>
      */
-    private $classesAllowedToBeExtended;
+    private array $classesAllowedToBeExtended;
 
     /**
      * @param array<int, class-string> $classesAllowedToBeExtended
@@ -53,13 +53,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\Class_) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\Class_::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Classes/PHPUnit/Framework/TestCaseWithSuffixRule.php b/src/Classes/PHPUnit/Framework/TestCaseWithSuffixRule.php
@@ -24,14 +24,11 @@ final class TestCaseWithSuffixRule implements Rules\Rule
     /**
      * @var array<int, class-string>
      */
-    private static $phpunitTestCaseClassNames = [
+    private static array $phpunitTestCaseClassNames = [
         'PHPUnit\Framework\TestCase',
     ];
 
-    /**
-     * @var Reflection\ReflectionProvider
-     */
-    private $reflectionProvider;
+    private Reflection\ReflectionProvider $reflectionProvider;
 
     public function __construct(Reflection\ReflectionProvider $reflectionProvider)
     {
@@ -45,13 +42,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Analyser\Scope $scope
+        Analyser\Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\Class_) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\Class_::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Closures/NoNullableReturnTypeDeclarationRule.php b/src/Closures/NoNullableReturnTypeDeclarationRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Expr\Closure) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Expr\Closure::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Closures/NoParameterWithNullDefaultValueRule.php b/src/Closures/NoParameterWithNullDefaultValueRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Expr\Closure) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Expr\Closure::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Closures/NoParameterWithNullableTypeDeclarationRule.php b/src/Closures/NoParameterWithNullableTypeDeclarationRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Expr\Closure) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Expr\Closure::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Expressions/NoCompactRule.php b/src/Expressions/NoCompactRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Expr\FuncCall) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Expr\FuncCall::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Expressions/NoEmptyRule.php b/src/Expressions/NoEmptyRule.php
@@ -26,7 +26,7 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         return [
             'Language construct empty() should not be used.',

diff --git a/src/Expressions/NoErrorSuppressionRule.php b/src/Expressions/NoErrorSuppressionRule.php
@@ -26,7 +26,7 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         return [
             'Error suppression via "@" should not be used.',

diff --git a/src/Expressions/NoEvalRule.php b/src/Expressions/NoEvalRule.php
@@ -26,7 +26,7 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         return [
             'Language construct eval() should not be used.',

diff --git a/src/Expressions/NoIssetRule.php b/src/Expressions/NoIssetRule.php
@@ -26,7 +26,7 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         return [
             'Language construct isset() should not be used.',

diff --git a/src/Files/DeclareStrictTypesRule.php b/src/Files/DeclareStrictTypesRule.php
@@ -28,13 +28,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof FileNode) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 FileNode::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Functions/NoNullableReturnTypeDeclarationRule.php b/src/Functions/NoNullableReturnTypeDeclarationRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\Function_) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\Function_::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Functions/NoParameterWithNullDefaultValueRule.php b/src/Functions/NoParameterWithNullDefaultValueRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\Function_) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\Function_::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Functions/NoParameterWithNullableTypeDeclarationRule.php b/src/Functions/NoParameterWithNullableTypeDeclarationRule.php
@@ -27,13 +27,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\Function_) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\Function_::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Methods/FinalInAbstractClassRule.php b/src/Methods/FinalInAbstractClassRule.php
@@ -28,13 +28,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\ClassMethod) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\ClassMethod::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Methods/NoConstructorParameterWithDefaultValueRule.php b/src/Methods/NoConstructorParameterWithDefaultValueRule.php
@@ -28,13 +28,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\ClassMethod) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\ClassMethod::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Methods/NoNullableReturnTypeDeclarationRule.php b/src/Methods/NoNullableReturnTypeDeclarationRule.php
@@ -28,13 +28,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\ClassMethod) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\ClassMethod::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 

diff --git a/src/Methods/NoParameterWithContainerTypeDeclarationRule.php b/src/Methods/NoParameterWithContainerTypeDeclarationRule.php
@@ -21,22 +21,19 @@
 
 final class NoParameterWithContainerTypeDeclarationRule implements Rule
 {
-    /**
-     * @var Reflection\ReflectionProvider
-     */
-    private $reflectionProvider;
+    private Reflection\ReflectionProvider $reflectionProvider;
 
     /**
      * @var array<int, string>
      */
-    private $interfacesImplementedByContainers;
+    private array $interfacesImplementedByContainers;
 
     /**
      * @param array<int, string> $interfacesImplementedByContainers
      */
     public function __construct(
         Reflection\ReflectionProvider $reflectionProvider,
-        array $interfacesImplementedByContainers
+        array $interfacesImplementedByContainers,
     ) {
         $this->reflectionProvider = $reflectionProvider;
         $this->interfacesImplementedByContainers = \array_filter(
@@ -56,13 +53,13 @@ public function getNodeType(): string
 
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array {
         if (!$node instanceof Node\Stmt\ClassMethod) {
             throw new ShouldNotHappenException(\sprintf(
                 'Expected node to be instance of "%s", but got instance of "%s" instead.',
                 Node\Stmt\ClassMethod::class,
-                \get_class($node),
+                $node::class,
             ));
         }
 
@@ -134,7 +131,7 @@ private static function createError(
         Reflection\ClassReflection $classReflection,
         string $methodName,
         string $parameterName,
-        Reflection\ClassReflection $classUsedInTypeDeclaration
+        Reflection\ClassReflection $classUsedInTypeDeclaration,
     ): string {
         if ($classReflection->isAnonymous()) {
             return \sprintf(