Use PSR-4 Autoloader for tests

composer.json

@@ -23,10 +23,8 @@
     }
   },
   "autoload-dev": {
-    "classmap": [
+    "psr-4": {
-      "tests/"
+      "GraphQL\\Tests\\": "tests/"
-    ],
+    }
-    "files": [
-    ]
   }
 }

tests/Executor/AbstractTest.php

@@ -1,8 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
-
-require_once __DIR__ . '/TestClasses.php';
 
+use GraphQL\Executor\ExecutionResult;
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\InterfaceType;

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;

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;

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;

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 @@ class ListsTest extends \PHPUnit_Framework_TestCase
             }
         ];
     }
-}
+}

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;

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;

tests/Executor/TestClasses.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Type\Definition\ScalarType;
 

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;

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;

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

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\Location;
 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

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\SelectionSet;
 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
 {

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
 {

tests/StarWarsData.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 class StarWarsData
 {

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

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

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 @@ namespace GraphQL;
  * 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;

tests/StarWarsValidationTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 use GraphQL\Language\Parser;
 use GraphQL\Validator\DocumentValidator;

tests/Type/DefinitionTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;

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\EnumType;
 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

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 @@ class ResolveInfoTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedDefaultSelection, $actualDefaultSelection);
         $this->assertEquals($expectedDeepSelection, $actualDeepSelection);
     }
-}
+}

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 @@ class ScalarSerializationTest extends \PHPUnit_Framework_TestCase
 
         // TODO: how should it behaive on '0'?
     }
-}
+}

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\NonNull;
 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
 {

tests/Validator/ArgumentsOfCorrectTypeTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

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

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

tests/Validator/FragmentsOnCompositeTypesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/KnownArgumentNamesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/KnownDirectivesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/KnownFragmentNamesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\Validator\Rules\KnownFragmentNames;
 use GraphQL\FormattedError;

tests/Validator/KnownTypeNamesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/NoFragmentCyclesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/NoUndefinedVariablesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/NoUnusedFragmentsTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/NoUnusedVariablesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/OverlappingFieldsCanBeMergedTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\Source;

tests/Validator/PossibleFragmentSpreadsTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/ProvidedNonNullArgumentsTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/ScalarLeafsTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;

tests/Validator/TestCase.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
@@ -10,6 +10,7 @@ use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
+use GraphQL\Validator\DocumentValidator;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase
 {

tests/Validator/VariablesAreInputTypesTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
@@ -39,4 +39,4 @@ class VariablesAreInputTypesTest extends TestCase
             ]
         );
     }
-}
+}

tests/Validator/VariablesInAllowedPositionTest.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\VariablesInAllowedPosition;
 
 class VariablesInAllowedPositionTest extends TestCase