Merge pull request #392 from phparkitect/fix-cs-fixer-bug-on-ci

Fix cs fixer bug on ci

Author: fain182

.php-cs-fixer.dist.php

@@ -24,6 +24,7 @@
         'modernize_types_casting' => true, // Replaces intval, floatval, doubleval, strval and boolval function calls with according type casting operator.
         'multiline_whitespace_before_semicolons' => true, // Forbid multi-line whitespace before the closing semicolon or move the semicolon to the new line for chained calls.
         'no_unreachable_default_argument_value' => true, // In function arguments there must not be arguments with default values before non-default ones.
+	'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],// To avoid problems of compatibility with the old php-cs-fixer version used on PHP 7.3
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_class_elements' => true, // Orders the elements of classes/interfaces/traits.

src/Analyzer/ClassDescriptionBuilder.php

@@ -11,13 +11,13 @@ class ClassDescriptionBuilder
     private $classDependencies = [];
 
     /** @var ?FullyQualifiedClassName */
-    private $FQCN = null;
+    private $FQCN;
 
     /** @var list<FullyQualifiedClassName> */
     private $interfaces = [];
 
     /** @var ?FullyQualifiedClassName */
-    private $extend = null;
+    private $extend;
 
     /** @var bool */
     private $final = false;

src/Analyzer/FileVisitor.php

@@ -72,8 +72,8 @@ public function enterNode(Node $node): void
          *
          * @see FileVisitorTest::test_it_should_return_errors_for_const_outside_namespace
          */
-        if ($node instanceof Node\Expr\ClassConstFetch &&
-            method_exists($node->class, 'toString')
+        if ($node instanceof Node\Expr\ClassConstFetch
+            && method_exists($node->class, 'toString')
         ) {
             if ($this->isSelfOrStaticOrParent($node->class->toString())) {
                 return;
@@ -89,8 +89,8 @@ public function enterNode(Node $node): void
          *
          * @see FileVisitorTest::test_should_returns_all_dependencies
          */
-        if ($node instanceof Node\Expr\StaticCall &&
-            method_exists($node->class, 'toString')
+        if ($node instanceof Node\Expr\StaticCall
+            && method_exists($node->class, 'toString')
         ) {
             if ($this->isSelfOrStaticOrParent($node->class->toString())) {
                 return;
@@ -100,8 +100,8 @@ public function enterNode(Node $node): void
                 ->addDependency(new ClassDependency($node->class->toString(), $node->getLine()));
         }
 
-        if ($node instanceof Node\Expr\Instanceof_ &&
-            method_exists($node->class, 'toString')
+        if ($node instanceof Node\Expr\Instanceof_
+            && method_exists($node->class, 'toString')
         ) {
             if ($this->isSelfOrStaticOrParent($node->class->toString())) {
                 return;
@@ -110,11 +110,11 @@ public function enterNode(Node $node): void
                 ->addDependency(new ClassDependency($node->class->toString(), $node->getLine()));
         }
 
-        if ($node instanceof Node\Expr\New_ &&
-            !($node->class instanceof Node\Expr\Variable)
+        if ($node instanceof Node\Expr\New_
+            && !($node->class instanceof Node\Expr\Variable)
         ) {
-            if ((method_exists($node->class, 'isAnonymous') && $node->class->isAnonymous()) ||
-                !method_exists($node->class, 'toString')) {
+            if ((method_exists($node->class, 'isAnonymous') && $node->class->isAnonymous())
+                || !method_exists($node->class, 'toString')) {
                 return;
             }
 

src/Analyzer/NameResolver.php

@@ -175,7 +175,7 @@ public function enterNode(Node $node)
 
             if ($this->parseCustomAnnotations && !($node->type instanceof FullyQualified)) {
                 foreach ($phpDocNode->getTags() as $tagValue) {
-                    if ('@' === $tagValue->name[0] && false === strpos($tagValue->name, '@var')) {
+                    if ('@' === $tagValue->name[0] && !str_contains($tagValue->name, '@var')) {
                         $customTag = str_replace('@', '', $tagValue->name);
                         $type = $this->resolveName(new Node\Name($customTag), Use_::TYPE_NORMAL);
                         $node->type = $type;

src/Analyzer/PatternString.php

@@ -38,10 +38,10 @@ public function toString(): string
     private function containsWildcard(string $pattern): bool
     {
         return
-            str_contains($pattern, '*') ||
-            str_contains($pattern, '?') ||
-            str_contains($pattern, '.') ||
-            str_contains($pattern, '[');
+            str_contains($pattern, '*')
+            || str_contains($pattern, '?')
+            || str_contains($pattern, '.')
+            || str_contains($pattern, '[');
     }
 
     private function startsWithPattern(string $pattern): bool

src/Expression/ForClasses/DependsOnlyOnTheseNamespaces.php

@@ -36,8 +36,8 @@ public function evaluate(ClassDescription $theClass, Violations $violations, str
         /** @var ClassDependency $dependency */
         foreach ($dependencies as $dependency) {
             if (
-                '' === $dependency->getFQCN()->namespace() ||
-                $theClass->namespaceMatches($dependency->getFQCN()->namespace())
+                '' === $dependency->getFQCN()->namespace()
+                || $theClass->namespaceMatches($dependency->getFQCN()->namespace())
             ) {
                 continue;
             }

src/Rules/Violation.php

@@ -15,7 +15,7 @@ class Violation implements \JsonSerializable
     /** @var string */
     private $error;
 
-    public function __construct(string $fqcn, string $error, ?int $line = null)
+    public function __construct(string $fqcn, string $error, int $line = null)
     {
         $this->fqcn = $fqcn;
         $this->error = $error;

tests/E2E/Cli/CheckCommandTest.php

@@ -149,7 +149,7 @@ public function test_you_can_ignore_the_default_baseline(): void
     protected function runCheck(
         $configFilePath = null,
         bool $stopOnFailure = null,
-        ?string $useBaseline = null,
+        string $useBaseline = null,
         $generateBaseline = false,
         bool $skipBaseline = false
     ): ApplicationTester {