Reference classes via a use statement

MauricioFauth · MauricioFauth · commit 9d3d3b3e3916 · 2019-12-14T11:05:18.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/src/Component.php b/src/Component.php
@@ -11,6 +11,8 @@
 
 namespace PhpMyAdmin\SqlParser;
 
+use Exception;
+
 /**
  * A component (of a statement) is a part of a statement that is common to
  * multiple query types.
@@ -29,7 +31,7 @@ abstract class Component
      * @param TokensList $list    the list of tokens that are being parsed
      * @param array      $options parameters for parsing
      *
-     * @throws \Exception not implemented yet
+     * @throws Exception not implemented yet
      *
      * @return mixed
      */
@@ -40,7 +42,7 @@ public static function parse(
     ) {
         // This method should be abstract, but it can't be both static and
         // abstract.
-        throw new \Exception(Translator::gettext('Not implemented yet.'));
+        throw new Exception(Translator::gettext('Not implemented yet.'));
     }
 
     /**
@@ -52,15 +54,15 @@ public static function parse(
      * @param mixed $component the component to be built
      * @param array $options   parameters for building
      *
-     * @throws \Exception not implemented yet
+     * @throws Exception not implemented yet
      *
      * @return string
      */
     public static function build($component, array $options = [])
     {
         // This method should be abstract, but it can't be both static and
         // abstract.
-        throw new \Exception(Translator::gettext('Not implemented yet.'));
+        throw new Exception(Translator::gettext('Not implemented yet.'));
     }
 
     /**
diff --git a/src/Core.php b/src/Core.php
@@ -6,6 +6,8 @@
 
 namespace PhpMyAdmin\SqlParser;
 
+use Exception;
+
 class Core
 {
     /**
@@ -24,7 +26,7 @@ class Core
      * error might be false positive or a partial result (even a bad one)
      * might be needed.
      *
-     * @var \Exception[]
+     * @var Exception[]
      *
      * @see Core::error()
      */
@@ -33,9 +35,9 @@ class Core
     /**
      * Creates a new error log.
      *
-     * @param \Exception $error the error exception
+     * @param Exception $error the error exception
      *
-     * @throws \Exception throws the exception, if strict mode is enabled
+     * @throws Exception throws the exception, if strict mode is enabled
      */
     public function error($error)
     {
diff --git a/src/Exceptions/LexerException.php b/src/Exceptions/LexerException.php
@@ -6,14 +6,16 @@
 
 namespace PhpMyAdmin\SqlParser\Exceptions;
 
+use Exception;
+
 /**
  * Exception thrown by the lexer.
  *
  * @category   Exceptions
  *
  * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
  */
-class LexerException extends \Exception
+class LexerException extends Exception
 {
     /**
      * The character that produced this error.
diff --git a/src/Exceptions/LoaderException.php b/src/Exceptions/LoaderException.php
@@ -6,14 +6,16 @@
 
 namespace PhpMyAdmin\SqlParser\Exceptions;
 
+use Exception;
+
 /**
  * Exception thrown by the lexer.
  *
  * @category   Exceptions
  *
  * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
  */
-class LoaderException extends \Exception
+class LoaderException extends Exception
 {
     /**
      * The failed load name.
diff --git a/src/Exceptions/ParserException.php b/src/Exceptions/ParserException.php
@@ -6,6 +6,7 @@
 
 namespace PhpMyAdmin\SqlParser\Exceptions;
 
+use Exception;
 use PhpMyAdmin\SqlParser\Token;
 
 /**
@@ -15,7 +16,7 @@
  *
  * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
  */
-class ParserException extends \Exception
+class ParserException extends Exception
 {
     /**
      * The token that produced this error.
diff --git a/src/Statements/InsertStatement.php b/src/Statements/InsertStatement.php
@@ -6,8 +6,8 @@
 
 namespace PhpMyAdmin\SqlParser\Statements;
 
-use PhpMyAdmin\SqlParser\Components\ArrayObj;
 use PhpMyAdmin\SqlParser\Components\Array2d;
+use PhpMyAdmin\SqlParser\Components\ArrayObj;
 use PhpMyAdmin\SqlParser\Components\IntoKeyword;
 use PhpMyAdmin\SqlParser\Components\OptionsArray;
 use PhpMyAdmin\SqlParser\Components\SetOperation;
diff --git a/src/Statements/PurgeStatement.php b/src/Statements/PurgeStatement.php
@@ -7,7 +7,6 @@
 namespace PhpMyAdmin\SqlParser\Statements;
 
 use PhpMyAdmin\SqlParser\Components\Expression;
-use PhpMyAdmin\SqlParser\Components\OptionsArray;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Statement;
 use PhpMyAdmin\SqlParser\Token;
diff --git a/src/TokensList.php b/src/TokensList.php
@@ -6,14 +6,16 @@
 
 namespace PhpMyAdmin\SqlParser;
 
+use ArrayAccess;
+
 /**
  * A structure representing a list of tokens.
  *
  * @category Tokens
  *
  * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
  */
-class TokensList implements \ArrayAccess
+class TokensList implements ArrayAccess
 {
     /**
      * The array of tokens.
diff --git a/src/Translator.php b/src/Translator.php
@@ -6,12 +6,14 @@
 
 namespace PhpMyAdmin\SqlParser;
 
+use PhpMyAdmin\MoTranslator\Loader;
+
 class Translator
 {
     /**
      * The MoTranslator loader object.
      *
-     * @var \PhpMyAdmin\MoTranslator\Loader
+     * @var Loader
      */
     private static $loader;
 
@@ -29,7 +31,7 @@ public static function load()
     {
         if (is_null(self::$loader)) {
             // Create loader object
-            self::$loader = new \PhpMyAdmin\MoTranslator\Loader();
+            self::$loader = new Loader();
 
             // Set locale
             self::$loader->setlocale(
diff --git a/src/UtfString.php b/src/UtfString.php
@@ -13,6 +13,9 @@
 
 namespace PhpMyAdmin\SqlParser;
 
+use ArrayAccess;
+use Exception;
+
 /**
  * Implements array-like access for UTF-8 strings.
  *
@@ -22,7 +25,7 @@
  *
  * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
  */
-class UtfString implements \ArrayAccess
+class UtfString implements ArrayAccess
 {
     /**
      * The raw, multi-byte string.
@@ -141,23 +144,23 @@ public function offsetGet($offset)
      * @param int    $offset the offset to be set
      * @param string $value  the value to be set
      *
-     * @throws \Exception not implemented
+     * @throws Exception not implemented
      */
     public function offsetSet($offset, $value)
     {
-        throw new \Exception('Not implemented.');
+        throw new Exception('Not implemented.');
     }
 
     /**
      * Unsets an index.
      *
      * @param int $offset the value to be unset
      *
-     * @throws \Exception not implemented
+     * @throws Exception not implemented
      */
     public function offsetUnset($offset)
     {
-        throw new \Exception('Not implemented.');
+        throw new Exception('Not implemented.');
     }
 
     /**
diff --git a/tests/Components/ComponentTest.php b/tests/Components/ComponentTest.php
@@ -7,6 +7,7 @@
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Tests\TestCase;
 use PhpMyAdmin\SqlParser\TokensList;
+use Throwable;
 
 class ComponentTest extends TestCase
 {
@@ -17,14 +18,14 @@ class ComponentTest extends TestCase
     public function testParse()
     {
         $this->expectExceptionMessage('Not implemented yet.');
-        $this->expectException(\Exception::class);
+        $this->expectException(Throwable::class);
         Component::parse(new Parser(), new TokensList());
     }
 
     public function testBuild()
     {
         $this->expectExceptionMessage('Not implemented yet.');
-        $this->expectException(\Exception::class);
+        $this->expectException(Throwable::class);
         Component::build(null);
     }
 }
diff --git a/tests/Lexer/ContextTest.php b/tests/Lexer/ContextTest.php
@@ -5,6 +5,7 @@
 
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Tests\TestCase;
+use Throwable;
 
 class ContextTest extends TestCase
 {
@@ -106,7 +107,7 @@ public function contextNames()
     public function testLoadError()
     {
         $this->expectExceptionMessage('Specified context ("\PhpMyAdmin\SqlParser\Contexts\ContextFoo") does not exist.');
-        $this->expectException(\Exception::class);
+        $this->expectException(Throwable::class);
         Context::load('Foo');
     }
 
diff --git a/tests/Misc/UtfStringTest.php b/tests/Misc/UtfStringTest.php
@@ -5,6 +5,7 @@
 
 use PhpMyAdmin\SqlParser\Tests\TestCase;
 use PhpMyAdmin\SqlParser\UtfString;
+use Throwable;
 
 class UtfStringTest extends TestCase
 {
@@ -40,15 +41,15 @@ public function testArrayAccess()
     public function testSet()
     {
         $this->expectExceptionMessage('Not implemented.');
-        $this->expectException(\Exception::class);
+        $this->expectException(Throwable::class);
         $str = new UtfString('');
         $str[0] = 'a';
     }
 
     public function testUnset()
     {
         $this->expectExceptionMessage('Not implemented.');
-        $this->expectException(\Exception::class);
+        $this->expectException(Throwable::class);
         $str = new UtfString('');
         unset($str[0]);
     }
diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php
@@ -4,6 +4,7 @@
 namespace PhpMyAdmin\SqlParser\Tests\Utils;
 
 use PhpMyAdmin\SqlParser\Tests\TestCase;
+use PhpMyAdmin\SqlParser\Utils\CLI;
 
 class CLITest extends TestCase
 {
@@ -22,7 +23,7 @@ private function getCLI($getopt)
      */
     public function testGetopt()
     {
-        $cli = new \PhpMyAdmin\SqlParser\Utils\CLI();
+        $cli = new CLI();
         $this->assertEquals(
             $cli->getopt('', []),
             []
diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php
@@ -5,6 +5,7 @@
 
 use PhpMyAdmin\SqlParser\Tests\TestCase;
 use PhpMyAdmin\SqlParser\Utils\Formatter;
+use ReflectionMethod;
 
 class FormatterTest extends TestCase
 {
@@ -51,7 +52,7 @@ public function testMergeFormats($default, $overriding, $expected)
             'formats' => $overriding,
         ];
 
-        $reflectionMethod = new \ReflectionMethod($formatter, 'getMergedOptions');
+        $reflectionMethod = new ReflectionMethod($formatter, 'getMergedOptions');
         $reflectionMethod->setAccessible(true);
         $this->assertEquals($expectedOptions, $reflectionMethod->invoke($formatter, $overridingOptions));
     }
diff --git a/tools/ContextGenerator.php b/tools/ContextGenerator.php
@@ -3,6 +3,8 @@
 
 namespace PhpMyAdmin\SqlParser\Tools;
 
+use Exception;
+
 require_once __DIR__ . '/../vendor/autoload.php';
 
 /**
@@ -391,9 +393,9 @@ public static function buildAll($input, $output)
 
     // Checking if all directories are valid.
     if (! is_dir($input)) {
-        throw new \Exception('The input directory does not exist.');
+        throw new Exception('The input directory does not exist.');
     } elseif (! is_dir($output)) {
-        throw new \Exception('The output directory does not exist.');
+        throw new Exception('The output directory does not exist.');
     }
 
     // Finally, building the tests.
diff --git a/tools/TestGenerator.php b/tools/TestGenerator.php
@@ -5,6 +5,7 @@
 
 require_once '../vendor/autoload.php';
 
+use Exception;
 use PhpMyAdmin\SqlParser\Lexer;
 use PhpMyAdmin\SqlParser\Parser;
 
@@ -111,7 +112,7 @@ public static function build($type, $input, $output, $debug = null)
     {
         // Support query types: `lexer` / `parser`.
         if (! in_array($type, ['lexer', 'parser'])) {
-            throw new \Exception('Unknown test type (expected `lexer` or `parser`).');
+            throw new Exception('Unknown test type (expected `lexer` or `parser`).');
         }
 
         /**
@@ -123,7 +124,7 @@ public static function build($type, $input, $output, $debug = null)
 
         // There is no point in generating a test without a query.
         if (empty($query)) {
-            throw new \Exception('No input query specified.');
+            throw new Exception('No input query specified.');
         }
 
         $test = static::generate($query, $type);
@@ -214,11 +215,11 @@ public static function buildAll($input, $output, $debug = null)
 
     // Checking if all directories are valid.
     if (! is_dir($input)) {
-        throw new \Exception('The input directory does not exist.');
+        throw new Exception('The input directory does not exist.');
     } elseif (! is_dir($output)) {
-        throw new \Exception('The output directory does not exist.');
+        throw new Exception('The output directory does not exist.');
     } elseif (($debug !== null) && (! is_dir($debug))) {
-        throw new \Exception('The debug directory does not exist.');
+        throw new Exception('The debug directory does not exist.');
     }
 
     // Finally, building the tests.

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace PhpMyAdmin\SqlParser;`
`13`	`13`
	`14`	`+use Exception;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* A component (of a statement) is a part of a statement that is common to`
`16`	`18`	`* multiple query types.`
`@@ -29,7 +31,7 @@ abstract class Component`
`29`	`31`	`* @param TokensList $list the list of tokens that are being parsed`
`30`	`32`	`* @param array $options parameters for parsing`
`31`	`33`	`*`
`32`		`- * @throws \Exception not implemented yet`
	`34`	`+ * @throws Exception not implemented yet`
`33`	`35`	`*`
`34`	`36`	`* @return mixed`
`35`	`37`	`*/`
`@@ -40,7 +42,7 @@ public static function parse(`
`40`	`42`	`) {`
`41`	`43`	`// This method should be abstract, but it can't be both static and`
`42`	`44`	`// abstract.`
`43`		`- throw new \Exception(Translator::gettext('Not implemented yet.'));`
	`45`	`+ throw new Exception(Translator::gettext('Not implemented yet.'));`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`/**`
`@@ -52,15 +54,15 @@ public static function parse(`
`52`	`54`	`* @param mixed $component the component to be built`
`53`	`55`	`* @param array $options parameters for building`
`54`	`56`	`*`
`55`		`- * @throws \Exception not implemented yet`
	`57`	`+ * @throws Exception not implemented yet`
`56`	`58`	`*`
`57`	`59`	`* @return string`
`58`	`60`	`*/`
`59`	`61`	`public static function build($component, array $options = [])`
`60`	`62`	`{`
`61`	`63`	`// This method should be abstract, but it can't be both static and`
`62`	`64`	`// abstract.`
`63`		`- throw new \Exception(Translator::gettext('Not implemented yet.'));`
	`65`	`+ throw new Exception(Translator::gettext('Not implemented yet.'));`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace PhpMyAdmin\SqlParser;`
`8`	`8`
	`9`	`+use Exception;`
	`10`	`+`
`9`	`11`	`class Core`
`10`	`12`	`{`
`11`	`13`	`/**`
`@@ -24,7 +26,7 @@ class Core`
`24`	`26`	`* error might be false positive or a partial result (even a bad one)`
`25`	`27`	`* might be needed.`
`26`	`28`	`*`
`27`		`- * @var \Exception[]`
	`29`	`+ * @var Exception[]`
`28`	`30`	`*`
`29`	`31`	`* @see Core::error()`
`30`	`32`	`*/`
`@@ -33,9 +35,9 @@ class Core`
`33`	`35`	`/**`
`34`	`36`	`* Creates a new error log.`
`35`	`37`	`*`
`36`		`- * @param \Exception $error the error exception`
	`38`	`+ * @param Exception $error the error exception`
`37`	`39`	`*`
`38`		`- * @throws \Exception throws the exception, if strict mode is enabled`
	`40`	`+ * @throws Exception throws the exception, if strict mode is enabled`
`39`	`41`	`*/`
`40`	`42`	`public function error($error)`
`41`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,16 @@`
`6`	`6`
`7`	`7`	`namespace PhpMyAdmin\SqlParser\Exceptions;`
`8`	`8`
	`9`	`+use Exception;`
	`10`	`+`
`9`	`11`	`/**`
`10`	`12`	`* Exception thrown by the lexer.`
`11`	`13`	`*`
`12`	`14`	`* @category Exceptions`
`13`	`15`	`*`
`14`	`16`	`* @license https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+`
`15`	`17`	`*/`
`16`		`-class LexerException extends \Exception`
	`18`	`+class LexerException extends Exception`
`17`	`19`	`{`
`18`	`20`	`/**`
`19`	`21`	`* The character that produced this error.`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace PhpMyAdmin\SqlParser\Exceptions;`
`8`	`8`
	`9`	`+use Exception;`
`9`	`10`	`use PhpMyAdmin\SqlParser\Token;`
`10`	`11`
`11`	`12`	`/**`
`@@ -15,7 +16,7 @@`
`15`	`16`	`*`
`16`	`17`	`* @license https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+`
`17`	`18`	`*/`
`18`		`-class ParserException extends \Exception`
	`19`	`+class ParserException extends Exception`
`19`	`20`	`{`
`20`	`21`	`/**`
`21`	`22`	`* The token that produced this error.`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,16 @@`
`6`	`6`
`7`	`7`	`namespace PhpMyAdmin\SqlParser;`
`8`	`8`
	`9`	`+use ArrayAccess;`
	`10`	`+`
`9`	`11`	`/**`
`10`	`12`	`* A structure representing a list of tokens.`
`11`	`13`	`*`
`12`	`14`	`* @category Tokens`
`13`	`15`	`*`
`14`	`16`	`* @license https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+`
`15`	`17`	`*/`
`16`		`-class TokensList implements \ArrayAccess`
	`18`	`+class TokensList implements ArrayAccess`
`17`	`19`	`{`
`18`	`20`	`/**`
`19`	`21`	`* The array of tokens.`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`namespace PhpMyAdmin\SqlParser;`
`15`	`15`
	`16`	`+use ArrayAccess;`
	`17`	`+use Exception;`
	`18`	`+`
`16`	`19`	`/**`
`17`	`20`	`* Implements array-like access for UTF-8 strings.`
`18`	`21`	`*`
`@@ -22,7 +25,7 @@`
`22`	`25`	`*`
`23`	`26`	`* @license https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+`
`24`	`27`	`*/`
`25`		`-class UtfString implements \ArrayAccess`
	`28`	`+class UtfString implements ArrayAccess`
`26`	`29`	`{`
`27`	`30`	`/**`
`28`	`31`	`* The raw, multi-byte string.`
`@@ -141,23 +144,23 @@ public function offsetGet($offset)`
`141`	`144`	`* @param int $offset the offset to be set`
`142`	`145`	`* @param string $value the value to be set`
`143`	`146`	`*`
`144`		`- * @throws \Exception not implemented`
	`147`	`+ * @throws Exception not implemented`
`145`	`148`	`*/`
`146`	`149`	`public function offsetSet($offset, $value)`
`147`	`150`	`{`
`148`		`- throw new \Exception('Not implemented.');`
	`151`	`+ throw new Exception('Not implemented.');`
`149`	`152`	`}`
`150`	`153`
`151`	`154`	`/**`
`152`	`155`	`* Unsets an index.`
`153`	`156`	`*`
`154`	`157`	`* @param int $offset the value to be unset`
`155`	`158`	`*`
`156`		`- * @throws \Exception not implemented`
	`159`	`+ * @throws Exception not implemented`
`157`	`160`	`*/`
`158`	`161`	`public function offsetUnset($offset)`
`159`	`162`	`{`
`160`		`- throw new \Exception('Not implemented.');`
	`163`	`+ throw new Exception('Not implemented.');`
`161`	`164`	`}`
`162`	`165`
`163`	`166`	`/**`