Merge branch '0.11'

mcg-web · mcg-web · commit 7e06b51bbf1a · 2018-09-01T14:04:01.000+02:00
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "react/promise": "To use ReactPHP promise adapter"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.26 || ^6.0",
+        "phpunit/phpunit": "^5.7.26 || ^6.0 || ^7.2",
         "react/promise": "^2.5",
         "sensio/framework-extra-bundle": "^3.0",
         "symfony/asset": "^3.4 || ^4.0",
@@ -70,9 +70,9 @@
     "scripts": {
         "test": "bin/phpunit --color=always -v --debug",
         "static-analysis": [
-            "@composer req --ansi --dev 'phpstan/phpstan:^0.10.3'",
-            "phpstan analyse --ansi -l 1 -c phpstan.neon src",
-            "@composer rem --ansi --dev phpstan/phpstan"
+            "@composer req --ansi --dev 'phpstan/phpstan:^0.10.3' 'phpstan/phpstan-phpunit:^0.10.0'",
+            "phpstan analyse --ansi -l 1 src tests",
+            "@composer rem --ansi --dev phpstan/phpstan phpstan/phpstan-phpunit"
         ],
         "bench":  [
             "test -f phpbench.phar || wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey",
diff --git a/phpstan.neon b/phpstan.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,3 @@
+includes:
+	- vendor/phpstan/phpstan-phpunit/extension.neon
+	- vendor/phpstan/phpstan-phpunit/rules.neon
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
         >
     <testsuites>
diff --git a/src/Definition/ConfigProcessor.php b/src/Definition/ConfigProcessor.php
@@ -34,10 +34,16 @@ public function register(ConfigProcessorInterface $configProcessor, $priority =
         $this->processors[] = ['processor' => $configProcessor, 'priority' => $priority];
     }
 
-    public function process(LazyConfig $lazyConfig)
+    public function getOrderedProcessors()
     {
         $this->initialize();
-        foreach ($this->orderedProcessors as $processor) {
+
+        return $this->orderedProcessors;
+    }
+
+    public function process(LazyConfig $lazyConfig)
+    {
+        foreach ($this->getOrderedProcessors() as $processor) {
             $lazyConfig = $processor->process($lazyConfig);
         }
 
diff --git a/tests/Config/Processor/BuilderProcessorTest.php b/tests/Config/Processor/BuilderProcessorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Config;
+namespace Overblog\GraphQLBundle\Tests\Config\Processor;
 
 use Overblog\GraphQLBundle\Config\Processor\BuilderProcessor;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Config/Processor/InheritanceProcessorTest.php b/tests/Config/Processor/InheritanceProcessorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Config;
+namespace Overblog\GraphQLBundle\Tests\Config\Processor;
 
 use Overblog\GraphQLBundle\Config\Processor\InheritanceProcessor;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Definition/ConfigProcessorTest.php b/tests/Definition/ConfigProcessorTest.php
@@ -39,15 +39,7 @@ public function testOrderByPriorityDesc()
             return [];
         }));
 
-        $getOrderedProcessors = \Closure::bind(
-            function () {
-                return $this->orderedProcessors;
-            },
-            $configProcessor,
-            \get_class($configProcessor)
-        );
-
-        $processors = $getOrderedProcessors();
+        $processors = $configProcessor->getOrderedProcessors();
 
         $this->assertSame(
             $processors,
diff --git a/tests/DependencyInjection/Compiler/ResolverTestService.php b/tests/DependencyInjection/Compiler/ResolverTestService.php
@@ -12,10 +12,6 @@ class ResolverTestService implements ContainerAwareInterface
 {
     use ContainerAwareTrait;
 
-    public function __construct($service)
-    {
-    }
-
     public function doSomethingWithContainer()
     {
         return $this->container->get('injected_service')->doSomething();
diff --git a/tests/Executor/Promise/Adapter/ReactPromiseAdapterTest.php b/tests/Executor/Promise/Adapter/ReactPromiseAdapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Error;
+namespace Overblog\GraphQLBundle\Tests\Executor\Promise\Adapter;
 
 use GraphQL\Executor\Promise\Promise;
 use Overblog\GraphQLBundle\Executor\Promise\Adapter\ReactPromiseAdapter;
diff --git a/tests/ExpressionLanguage/TestCase.php b/tests/ExpressionLanguage/TestCase.php
@@ -5,6 +5,7 @@
 use Overblog\GraphQLBundle\Definition\GlobalVariables;
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionLanguage;
 use Overblog\GraphQLBundle\Tests\DIContainerMockTrait;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase as BaseTestCase;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -50,7 +51,7 @@ private function getAuthorizationCheckerIsGrantedWithExpectation($with, $expects
         }
         $authChecker = $this->getAuthorizationCheckerMock();
 
-        if ($return instanceof \PHPUnit_Framework_MockObject_Stub_Return) {
+        if ($return instanceof Stub) {
             $returnValue = $return;
         } else {
             $returnValue = $this->returnValue($return);
diff --git a/tests/Functional/ArgumentWrapper/ArgumentWrapperTest.php b/tests/Functional/ArgumentWrapper/ArgumentWrapperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Functional\AutoMapping;
+namespace Overblog\GraphQLBundle\Tests\Functional\ArgumentWrapper;
 
 use Overblog\GraphQLBundle\Tests\Functional\TestCase;
 
diff --git a/tests/Functional/Inheritance/InheritanceTest.php b/tests/Functional/Inheritance/InheritanceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Functional\Relay\Connection;
+namespace Overblog\GraphQLBundle\Tests\Functional\Inheritance;
 
 use Overblog\GraphQLBundle\Config\Processor\InheritanceProcessor;
 use Overblog\GraphQLBundle\Tests\Functional\TestCase;
diff --git a/tests/Functional/SchemaLanguage/SchemaLanguageTest.php b/tests/Functional/SchemaLanguage/SchemaLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Functional\Security;
+namespace Overblog\GraphQLBundle\Tests\Functional\SchemaLanguage;
 
 use Overblog\GraphQLBundle\Tests\Functional\TestCase;
 
diff --git a/tests/Functional/Type/CustomScalarTest.php b/tests/Functional/Type/CustomScalarTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Functional\Security;
+namespace Overblog\GraphQLBundle\Tests\Functional\Type;
 
 use Overblog\GraphQLBundle\Tests\Functional\TestCase;
 
diff --git a/tests/Functional/Type/DefinitionTest.php b/tests/Functional/Type/DefinitionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Functional\Security;
+namespace Overblog\GraphQLBundle\Tests\Functional\Type;
 
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\ObjectType;
diff --git a/tests/Relay/Mutation/MutationFieldDefinitionTest.php b/tests/Relay/Mutation/MutationFieldDefinitionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Overblog\GraphQLBundle\Tests\Relay\Node;
+namespace Overblog\GraphQLBundle\Tests\Relay\Mutation;
 
 use Overblog\GraphQLBundle\Relay\Mutation\MutationFieldDefinition;
 use PHPUnit\Framework\TestCase;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+includes:`
	`2`	`+ - vendor/phpstan/phpstan-phpunit/extension.neon`
	`3`	`+ - vendor/phpstan/phpstan-phpunit/rules.neon`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertWarningsToExceptions="true"`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="false"`
`11`		`- syntaxCheck="false"`
`12`	`11`	`bootstrap="vendor/autoload.php"`
`13`	`12`	`>`
`14`	`13`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,16 @@ public function register(ConfigProcessorInterface $configProcessor, $priority =`
`34`	`34`	`$this->processors[] = ['processor' => $configProcessor, 'priority' => $priority];`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function process(LazyConfig $lazyConfig)`
	`37`	`+ public function getOrderedProcessors()`
`38`	`38`	`{`
`39`	`39`	`$this->initialize();`
`40`		`- foreach ($this->orderedProcessors as $processor) {`
	`40`	`+`
	`41`	`+ return $this->orderedProcessors;`
	`42`	`+ }`
	`43`	`+`
	`44`	`+ public function process(LazyConfig $lazyConfig)`
	`45`	`+ {`
	`46`	`+ foreach ($this->getOrderedProcessors() as $processor) {`
`41`	`47`	`$lazyConfig = $processor->process($lazyConfig);`
`42`	`48`	`}`
`43`	`49`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,6 @@ class ResolverTestService implements ContainerAwareInterface`
`12`	`12`	`{`
`13`	`13`	`use ContainerAwareTrait;`
`14`	`14`
`15`		`- public function __construct($service)`
`16`		`- {`
`17`		`- }`
`18`		`-`
`19`	`15`	`public function doSomethingWithContainer()`
`20`	`16`	`{`
`21`	`17`	`return $this->container->get('injected_service')->doSomething();`