Merge pull request #32 from ruudk/stable

Make `main` stable
overblog · Dec 8, 2021 · be0d4ce · be0d4ce
2 parents 75f89c8 + 24888d4
commit be0d4ce
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -55,15 +55,20 @@
         }
     },
     "scripts": {
-        "test": "bin/phpunit --color=always -v --debug",
-        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.15.3/php-cs-fixer.phar -O php-cs-fixer.phar",
+        "test": "bin/phpunit --color=always",
+        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.18.7/php-cs-fixer.phar -O php-cs-fixer.phar",
         "fix-cs": [
             "@install-cs",
             "@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi"
         ],
         "check-cs": [
             "@install-cs",
             "@php php-cs-fixer.phar fix --dry-run --diff -v --allow-risky=yes --ansi"
+        ],
+        "code-quality": [
+            "rm composer.lock",
+            "@composer install --ansi",
+            "@check-cs"
         ]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="OverblogGraphiQLBundle Test Suite">
-            <directory>./tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -39,7 +39,6 @@ public function getConfigTreeBuilder(): TreeBuilder
     }
 
     /**
-     * @param TreeBuilder $builder
      * @param string|null $name
      * @param string      $type
      *

diff --git a/src/OverblogGraphiQLBundle.php b/src/OverblogGraphiQLBundle.php
@@ -11,7 +11,7 @@
 
 final class OverblogGraphiQLBundle extends Bundle
 {
-    public function build(ContainerBuilder $container) : void
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
@@ -22,7 +22,7 @@ public function build(ContainerBuilder $container) : void
         $container->addCompilerPass(new DefaultEndpointWiringPass());
     }
 
-    public function getContainerExtension() : ?ExtensionInterface
+    public function getContainerExtension(): ?ExtensionInterface
     {
         return new OverblogGraphiQLExtension();
     }

diff --git a/tests/Config/GraphQLEndpoint/RouteResolverTest.php b/tests/Config/GraphQLEndpoint/RouteResolverTest.php
@@ -6,8 +6,6 @@
 use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\RouteResolver;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Routing\RouterInterface;
 
 final class RouteResolverTest extends TestCase
@@ -21,8 +19,6 @@ public function setUp(): void
     }
 
     /**
-     * @param array $routeCollection
-     *
      * @return RouteResolver
      */
     private function subject(array $routeCollection)

diff --git a/tests/Controller/GraphiQLControllerTest.php b/tests/Controller/GraphiQLControllerTest.php
@@ -7,7 +7,7 @@
 
 final class GraphiQLControllerTest extends TestCase
 {
-    public function testInvalidSchema() : void
+    public function testInvalidSchema(): void
     {
         $client = static::createClient();
 
@@ -18,7 +18,7 @@ public function testInvalidSchema() : void
         $this->assertSame(500, $response->getStatusCode());
     }
 
-    public function testDefaultSchema() : void
+    public function testDefaultSchema(): void
     {
         $client = static::createClient();
 
@@ -30,7 +30,7 @@ public function testDefaultSchema() : void
         $this->stringContains('Loading...', $response->getContent());
     }
 
-    public function testDefaultSchemaViaMultipleRoute() : void
+    public function testDefaultSchemaViaMultipleRoute(): void
     {
         $client = static::createClient();
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -14,7 +14,7 @@ abstract class TestCase extends WebTestCase
     /**
      * {@inheritdoc}
      */
-    protected static function getKernelClass() : string
+    protected static function getKernelClass(): string
     {
         return TestKernel::class;
     }

diff --git a/tests/TestKernel.php b/tests/TestKernel.php
@@ -23,6 +23,7 @@ public function getLogDir(): string
     {
         return sys_get_temp_dir().'/OverblogGraphQLBundle/'.Kernel::VERSION.'/'.$this->testCase.'/logs';
     }
+
     public function isBooted()
     {
         return $this->booted;