apply cs

rectorphp · Jun 29, 2023 · 9ff2388 · 9ff2388
1 parent 9d85c96
commit 9ff2388
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 38 deletions.
diff --git a/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php b/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php
@@ -253,12 +253,12 @@ private function shouldSkipParameter(
 
         // Check if default value is the same
         $classMethod = $this->astResolver->resolveClassMethodFromCall($node);
-        if (!$classMethod instanceof ClassMethod) {
+        if (! $classMethod instanceof ClassMethod) {
             // is correct scope?
             return ! $this->argumentAddingScope->isInCorrectScope($node, $argumentAdder);
         }
 
-        if (!isset($classMethod->params[$position])) {
+        if (! isset($classMethod->params[$position])) {
             // is correct scope?
             return ! $this->argumentAddingScope->isInCorrectScope($node, $argumentAdder);
         }

diff --git a/rules/CodingStyle/Application/UseImportsAdder.php b/rules/CodingStyle/Application/UseImportsAdder.php
@@ -33,8 +33,12 @@ public function __construct(
      * @param array<FullyQualifiedObjectType|AliasedObjectType> $functionUseImportTypes
      * @return Stmt[]
      */
-    public function addImportsToStmts(FileWithoutNamespace $fileWithoutNamespace, array $stmts, array $useImportTypes, array $functionUseImportTypes): array
-    {
+    public function addImportsToStmts(
+        FileWithoutNamespace $fileWithoutNamespace,
+        array $stmts,
+        array $useImportTypes,
+        array $functionUseImportTypes
+    ): array {
         $existingUseImportTypes = $this->usedImportsResolver->resolveForStmts($stmts);
         $existingFunctionUseImports = $this->usedImportsResolver->resolveFunctionImportsForStmts($stmts);
 

diff --git a/rules/Naming/Naming/UseImportsResolver.php b/rules/Naming/Naming/UseImportsResolver.php
@@ -20,40 +20,6 @@ public function __construct(
     ) {
     }
 
-    private function resolveNamespace(): Namespace_|FileWithoutNamespace|null
-    {
-        /** @var File|null $file */
-        $file = $this->currentFileProvider->getFile();
-        if (! $file instanceof File) {
-            return null;
-        }
-
-        $newStmts = $file->getNewStmts();
-
-        if ($newStmts === []) {
-            return null;
-        }
-
-        $namespaces = array_filter($newStmts, static fn(Stmt $stmt): bool => $stmt instanceof Namespace_);
-
-        // multiple namespaces is not supported
-        if (count($namespaces) > 1) {
-            return null;
-        }
-
-        $currentNamespace = current($namespaces);
-        if ($currentNamespace instanceof Namespace_) {
-            return $currentNamespace;
-        }
-
-        $currentStmt = current($newStmts);
-        if (! $currentStmt instanceof FileWithoutNamespace) {
-            return null;
-        }
-
-        return $currentStmt;
-    }
-
     /**
      * @return Use_[]|GroupUse[]
      */
@@ -90,4 +56,38 @@ public function resolvePrefix(Use_|GroupUse $use): string
             ? $use->prefix . '\\'
             : '';
     }
+
+    private function resolveNamespace(): Namespace_|FileWithoutNamespace|null
+    {
+        /** @var File|null $file */
+        $file = $this->currentFileProvider->getFile();
+        if (! $file instanceof File) {
+            return null;
+        }
+
+        $newStmts = $file->getNewStmts();
+
+        if ($newStmts === []) {
+            return null;
+        }
+
+        $namespaces = array_filter($newStmts, static fn (Stmt $stmt): bool => $stmt instanceof Namespace_);
+
+        // multiple namespaces is not supported
+        if (count($namespaces) > 1) {
+            return null;
+        }
+
+        $currentNamespace = current($namespaces);
+        if ($currentNamespace instanceof Namespace_) {
+            return $currentNamespace;
+        }
+
+        $currentStmt = current($newStmts);
+        if (! $currentStmt instanceof FileWithoutNamespace) {
+            return null;
+        }
+
+        return $currentStmt;
+    }
 }