updates via "rectorphp/rector" (nikic#573)

- "global" -> remove unused "use" statements
- "phpunit" -> fix "@Covers" comments
- "phpunit" -> replace "->will($this->returnValue()" with "->willReturn()"
- "UseTest.php" -> add missing namespace
- "composer.json" -> use "autoload-dev"
- remove -> "require_once" usage in the tests (use autoload-dev via composer.json)

-> most of the changes are done automatically by "https://github.com/rectorphp/rector"

Author: voku

composer.json

@@ -29,6 +29,11 @@
             "PhpParser\\": "lib/PhpParser"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "PhpParser\\": "test/PhpParser/"
+        }
+    },
     "bin": [
         "bin/php-parse"
     ]

lib/PhpParser/BuilderFactory.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
-use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Use_;
 
 class BuilderFactory
@@ -77,7 +76,7 @@ public function useTrait(...$traits) : Builder\TraitUse {
      * @return Builder\TraitUseAdaptation The create trait use adaptation builder
      */
     public function traitUseAdaptation($trait, $method = null) : Builder\TraitUseAdaptation {
-        if (is_null($method)) {
+        if ($method === null) {
             $method = $trait;
             $trait = null;
         }

lib/PhpParser/NodeAbstract.php

@@ -2,8 +2,6 @@
 
 namespace PhpParser;
 
-use PhpParser\Node;
-
 abstract class NodeAbstract implements Node, \JsonSerializable
 {
     protected $attributes;
@@ -159,11 +157,11 @@ public function hasAttribute(string $key) : bool {
     }
 
     public function getAttribute(string $key, $default = null) {
-        if (!array_key_exists($key, $this->attributes)) {
-            return $default;
-        } else {
+        if (array_key_exists($key, $this->attributes)) {
             return $this->attributes[$key];
         }
+
+        return $default;
     }
 
     public function getAttributes() : array {

lib/PhpParser/NodeVisitor/NameResolver.php

@@ -2,7 +2,6 @@
 
 namespace PhpParser\NodeVisitor;
 
-use PhpParser\Error;
 use PhpParser\ErrorHandler;
 use PhpParser\NameContext;
 use PhpParser\Node;

lib/PhpParser/PrettyPrinterAbstract.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Expr\AssignOp;
 use PhpParser\Node\Expr\BinaryOp;
 use PhpParser\Node\Expr\Cast;
-use PhpParser\Node\Name;
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Stmt;
 

test/PhpParser/Builder/ClassTest.php

@@ -6,9 +6,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
-use PHPUnit\Framework\TestCase;
 
-class ClassTest extends TestCase
+class ClassTest extends \PHPUnit\Framework\TestCase
 {
     protected function createClassBuilder($class) {
         return new Class_($class);

test/PhpParser/Builder/FunctionTest.php

@@ -8,9 +8,8 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt;
-use PHPUnit\Framework\TestCase;
 
-class FunctionTest extends TestCase
+class FunctionTest extends \PHPUnit\Framework\TestCase
 {
     public function createFunctionBuilder($name) {
         return new Function_($name);

test/PhpParser/Builder/InterfaceTest.php

@@ -6,9 +6,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Scalar\DNumber;
 use PhpParser\Node\Stmt;
-use PHPUnit\Framework\TestCase;
 
-class InterfaceTest extends TestCase
+class InterfaceTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Interface_ */
     protected $builder;

test/PhpParser/Builder/MethodTest.php

@@ -8,9 +8,8 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt;
-use PHPUnit\Framework\TestCase;
 
-class MethodTest extends TestCase
+class MethodTest extends \PHPUnit\Framework\TestCase
 {
     public function createMethodBuilder($name) {
         return new Method($name);

test/PhpParser/Builder/NamespaceTest.php

@@ -5,9 +5,8 @@
 use PhpParser\Comment\Doc;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
-use PHPUnit\Framework\TestCase;
 
-class NamespaceTest extends TestCase
+class NamespaceTest extends \PHPUnit\Framework\TestCase
 {
     protected function createNamespaceBuilder($fqn) {
         return new Namespace_($fqn);