Use PSR-4 Autoloader for tests

Jeremiah VALERIE · Jeremiah VALERIE · commit 1bc5e0c9da6a · 2016-04-09T14:14:40.000+02:00
diff --git a/composer.json b/composer.json
@@ -23,10 +23,8 @@
     }
   },
   "autoload-dev": {
-    "classmap": [
-      "tests/"
-    ],
-    "files": [
-    ]
+    "psr-4": {
+      "GraphQL\\Tests\\": "tests/"
+    }
   }
 }
diff --git a/tests/Executor/AbstractTest.php b/tests/Executor/AbstractTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace GraphQL\Executor;
-
-require_once __DIR__ . '/TestClasses.php';
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\ExecutionResult;
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\InterfaceType;
diff --git a/tests/Executor/DirectivesTest.php b/tests/Executor/DirectivesTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\ObjectType;
diff --git a/tests/Executor/ExecutorSchemaTest.php b/tests/Executor/ExecutorSchemaTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;
diff --git a/tests/Executor/ExecutorTest.php b/tests/Executor/ExecutorTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Executor/ListsTest.php b/tests/Executor/ListsTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
@@ -383,4 +384,4 @@ private function data()
             }
         ];
     }
-}
+}
diff --git a/tests/Executor/MutationsTest.php b/tests/Executor/MutationsTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Executor/NonNullTest.php b/tests/Executor/NonNullTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Executor/TestClasses.php b/tests/Executor/TestClasses.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Type\Definition\ScalarType;
 
diff --git a/tests/Executor/UnionInterfaceTest.php b/tests/Executor/UnionInterfaceTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 require_once __DIR__ . '/TestClasses.php';
 
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;
diff --git a/tests/Executor/VariablesTest.php b/tests/Executor/VariablesTest.php
@@ -1,9 +1,10 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 require_once __DIR__ . '/TestClasses.php';
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Language/LexerTest.php b/tests/Language/LexerTest.php
@@ -1,6 +1,9 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
+use GraphQL\Language\Lexer;
+use GraphQL\Language\Source;
+use GraphQL\Language\Token;
 use GraphQL\SyntaxError;
 
 class LexerTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Language/ParserTest.php b/tests/Language/ParserTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
 use GraphQL\Error;
 use GraphQL\Language\AST\Argument;
@@ -10,6 +10,9 @@
 use GraphQL\Language\AST\Name;
 use GraphQL\Language\AST\OperationDefinition;
 use GraphQL\Language\AST\SelectionSet;
+use GraphQL\Language\Parser;
+use GraphQL\Language\Source;
+use GraphQL\Language\SourceLocation;
 use GraphQL\SyntaxError;
 
 class ParserTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Language/PrinterTest.php b/tests/Language/PrinterTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
 use GraphQL\Language\AST\Document;
 use GraphQL\Language\AST\EnumValue;
@@ -10,6 +10,8 @@
 use GraphQL\Language\AST\StringValue;
 use GraphQL\Language\AST\Variable;
 use GraphQL\Language\AST\VariableDefinition;
+use GraphQL\Language\Parser;
+use GraphQL\Language\Printer;
 
 class PrinterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Language/VisitorTest.php b/tests/Language/VisitorTest.php
@@ -1,10 +1,12 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
 use GraphQL\Language\AST\Field;
 use GraphQL\Language\AST\Name;
 use GraphQL\Language\AST\Node;
 use GraphQL\Language\AST\SelectionSet;
+use GraphQL\Language\Parser;
+use GraphQL\Language\Visitor;
 
 class VisitorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/StarWarsData.php b/tests/StarWarsData.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 class StarWarsData
 {
diff --git a/tests/StarWarsIntrospectionTest.php b/tests/StarWarsIntrospectionTest.php
@@ -1,7 +1,9 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 
+use GraphQL\GraphQL;
+
 class StarWarsIntrospectionTest extends \PHPUnit_Framework_TestCase
 {
     // Star Wars Introspection Tests
diff --git a/tests/StarWarsQueryTest.php b/tests/StarWarsQueryTest.php
@@ -1,7 +1,9 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 
+use GraphQL\GraphQL;
+
 class StarWarsQueryTest extends \PHPUnit_Framework_TestCase
 {
     // Star Wars Query Tests
diff --git a/tests/StarWarsSchema.php b/tests/StarWarsSchema.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 /**
  * This is designed to be an end-to-end test, demonstrating
@@ -11,6 +11,7 @@
  * NOTE: This may contain spoilers for the original Star
  * Wars trilogy.
  */
+use GraphQL\Schema;
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\NonNull;
diff --git a/tests/StarWarsValidationTest.php b/tests/StarWarsValidationTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 use GraphQL\Language\Parser;
 use GraphQL\Validator\DocumentValidator;
diff --git a/tests/Type/DefinitionTest.php b/tests/Type/DefinitionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;
diff --git a/tests/Type/IntrospectionTest.php b/tests/Type/IntrospectionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
@@ -9,6 +9,7 @@
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Introspection;
 use GraphQL\Validator\Rules\ProvidedNonNullArguments;
 
 class IntrospectionTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Type/ResolveInfoTest.php b/tests/Type/ResolveInfoTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\GraphQL;
 use GraphQL\Schema;
@@ -153,4 +153,4 @@ public function testFieldSelection()
         $this->assertEquals($expectedDefaultSelection, $actualDefaultSelection);
         $this->assertEquals($expectedDeepSelection, $actualDeepSelection);
     }
-}
+}
diff --git a/tests/Type/ScalarSerializationTest.php b/tests/Type/ScalarSerializationTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Type\Definition\Type;
 
@@ -60,4 +60,4 @@ public function testCoercesOutputBoolean()
 
         // TODO: how should it behaive on '0'?
     }
-}
+}
diff --git a/tests/Type/SchemaValidatorTest.php b/tests/Type/SchemaValidatorTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Schema;
 use GraphQL\Type\Definition\InputObjectType;
@@ -9,6 +9,8 @@
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
+use GraphQL\Type\Introspection;
+use GraphQL\Type\SchemaValidator;
 
 class SchemaValidatorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Validator/ArgumentsOfCorrectTypeTest.php b/tests/Validator/ArgumentsOfCorrectTypeTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/DefaultValuesOfCorrectTypeTest.php b/tests/Validator/DefaultValuesOfCorrectTypeTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
+use GraphQL\Validator\Messages;
 use GraphQL\Validator\Rules\DefaultValuesOfCorrectType;
 
 class DefaultValuesOfCorrectTypeTest extends TestCase
diff --git a/tests/Validator/FieldsOnCorrectTypeTest.php b/tests/Validator/FieldsOnCorrectTypeTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
+use GraphQL\Validator\Messages;
 use GraphQL\Validator\Rules\FieldsOnCorrectType;
 
 class FieldsOnCorrectTypeTest extends TestCase
diff --git a/tests/Validator/FragmentsOnCompositeTypesTest.php b/tests/Validator/FragmentsOnCompositeTypesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/KnownArgumentNamesTest.php b/tests/Validator/KnownArgumentNamesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/KnownDirectivesTest.php b/tests/Validator/KnownDirectivesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/KnownFragmentNamesTest.php b/tests/Validator/KnownFragmentNamesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\Validator\Rules\KnownFragmentNames;
 use GraphQL\FormattedError;
diff --git a/tests/Validator/KnownTypeNamesTest.php b/tests/Validator/KnownTypeNamesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoFragmentCyclesTest.php b/tests/Validator/NoFragmentCyclesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoUndefinedVariablesTest.php b/tests/Validator/NoUndefinedVariablesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoUnusedFragmentsTest.php b/tests/Validator/NoUnusedFragmentsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoUnusedVariablesTest.php b/tests/Validator/NoUnusedVariablesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/OverlappingFieldsCanBeMergedTest.php b/tests/Validator/OverlappingFieldsCanBeMergedTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\Source;
diff --git a/tests/Validator/PossibleFragmentSpreadsTest.php b/tests/Validator/PossibleFragmentSpreadsTest.php
diff --git a/tests/Validator/ProvidedNonNullArgumentsTest.php b/tests/Validator/ProvidedNonNullArgumentsTest.php
diff --git a/tests/Validator/ScalarLeafsTest.php b/tests/Validator/ScalarLeafsTest.php
diff --git a/tests/Validator/TestCase.php b/tests/Validator/TestCase.php
diff --git a/tests/Validator/VariablesAreInputTypesTest.php b/tests/Validator/VariablesAreInputTypesTest.php
diff --git a/tests/Validator/VariablesInAllowedPositionTest.php b/tests/Validator/VariablesInAllowedPositionTest.php

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,8 @@`
`23`	`23`	`}`
`24`	`24`	`},`
`25`	`25`	`"autoload-dev": {`
`26`		`- "classmap": [`
`27`		`- "tests/"`
`28`		`- ],`
`29`		`- "files": [`
`30`		`- ]`
	`26`	`+ "psr-4": {`
	`27`	`+ "GraphQL\\Tests\\": "tests/"`
	`28`	`+ }`
`31`	`29`	`}`
`32`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`<?php`
`2`		`-namespace GraphQL\Executor;`
	`2`	`+namespace GraphQL\Tests\Executor;`
`3`	`3`
`4`	`4`	`use GraphQL\Error;`
	`5`	`+use GraphQL\Executor\Executor;`
`5`	`6`	`use GraphQL\FormattedError;`
`6`	`7`	`use GraphQL\Language\Parser;`
`7`	`8`	`use GraphQL\Language\SourceLocation;`
`@@ -383,4 +384,4 @@ private function data()`
`383`	`384`	`}`
`384`	`385`	`];`
`385`	`386`	`}`
`386`		`-}`
	`387`	`+}`