update use resolving

Author: TomasVotruba

rules/Naming/Naming/UseImportsResolver.php

@@ -57,7 +57,7 @@ public function resolvePrefix(Use_|GroupUse $use): string
             : '';
     }
 
-    private function resolveNamespace(): Namespace_|FileNode|null
+    private function resolveNamespace(): Namespace_|null
     {
         /** @var File|null $file */
         $file = $this->currentFileProvider->getFile();

rules/TypeDeclaration/Rector/StmtsAwareInterface/IncreaseDeclareStrictTypesRector.php

@@ -67,10 +67,14 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         throw new ShouldNotHappenException(sprintf(
+<<<<<<< HEAD
 <<<<<<< HEAD
             '"%s" is deprecated as changes strict types randomly on each run.. Use "%s" Rector on specific paths instead.',
 =======
             'This rule is deprecated as behaves very randomly and keeps adding strict types on new run Cannot be automated.
+=======
+            'The "%s" rule is deprecated as behaves very randomly and keeps adding strict types on new run Cannot be automated.
+>>>>>>> a0bb7b3a1a (update use resolving)
  * Use %s on specific paths instead narrow control',
 >>>>>>> 595b685f3e (introduce FileNode to handle file-level changes; deprecate IncreaseDeclareStrictTypesRector)
             self::class,
@@ -84,9 +88,12 @@ public function refactor(Node $node): ?Node
     public function configure(array $configuration): void
     {
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         Assert::keyExists($configuration, self::LIMIT);
         $this->limit = (int) $configuration[self::LIMIT];
 >>>>>>> 595b685f3e (introduce FileNode to handle file-level changes; deprecate IncreaseDeclareStrictTypesRector)
+=======
+>>>>>>> a0bb7b3a1a (update use resolving)
     }
 }