From 0ae85616e063903eea530d1ba863404c3dd16194 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 20 Feb 2024 03:50:58 +0100
Subject: [PATCH] CS: always import all used classes [3]

... instead of using fully qualified global/PHP native classes inline.

And when there is no namespace, don't use fully qualified global class names.

Follow up on 347
---
 autoload.php           | 9 ++++++---
 scripts/build-phar.php | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/autoload.php b/autoload.php
index 7e546bb5b6..d7d655e8ed 100644
--- a/autoload.php
+++ b/autoload.php
@@ -16,6 +16,9 @@
 
 namespace PHP_CodeSniffer;
 
+use Composer\Autoload\ClassLoader;
+use Exception;
+
 if (class_exists('PHP_CodeSniffer\Autoload', false) === false) {
     class Autoload
     {
@@ -77,7 +80,7 @@ public static function load($class)
                     && @file_exists(__DIR__.'/../../autoload.php') === true
                 ) {
                     self::$composerAutoloader = include __DIR__.'/../../autoload.php';
-                    if (self::$composerAutoloader instanceof \Composer\Autoload\ClassLoader) {
+                    if (self::$composerAutoloader instanceof ClassLoader) {
                         self::$composerAutoloader->unregister();
                         self::$composerAutoloader->register();
                     } else {
@@ -282,7 +285,7 @@ public static function getSearchPaths()
         public static function getLoadedClassName($path)
         {
             if (isset(self::$loadedClasses[$path]) === false) {
-                throw new \Exception("Cannot get class name for $path; file has not been included");
+                throw new Exception("Cannot get class name for $path; file has not been included");
             }
 
             return self::$loadedClasses[$path];
@@ -301,7 +304,7 @@ public static function getLoadedClassName($path)
         public static function getLoadedFileName($class)
         {
             if (isset(self::$loadedFiles[$class]) === false) {
-                throw new \Exception("Cannot get file name for $class; class has not been included");
+                throw new Exception("Cannot get file name for $class; class has not been included");
             }
 
             return self::$loadedFiles[$class];
diff --git a/scripts/build-phar.php b/scripts/build-phar.php
index 7bc50a2bca..f9621cbaef 100644
--- a/scripts/build-phar.php
+++ b/scripts/build-phar.php
@@ -107,8 +107,8 @@ function stripWhitespaceAndComments($fullpath, $config)
     $srcDir    = realpath(__DIR__.'/../src');
     $srcDirLen = strlen($srcDir);
 
-    $rdi = new \RecursiveDirectoryIterator($srcDir, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
-    $di  = new \RecursiveIteratorIterator($rdi, 0, \RecursiveIteratorIterator::CATCH_GET_CHILD);
+    $rdi = new RecursiveDirectoryIterator($srcDir, RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
+    $di  = new RecursiveIteratorIterator($rdi, 0, RecursiveIteratorIterator::CATCH_GET_CHILD);
 
     $config    = new Config();
     $fileCount = 0;