Fix CS

overblog · Nov 22, 2024 · 7314c16 · 7314c16
1 parent 2327323
commit 7314c16
Show file tree

Hide file tree

Showing 32 changed files with 138 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,13 @@
-.idea
 phpunit.xml
 /build
 /vendor
 /bin
 composer.lock
 composer.phar
-.php_cs.cache
-.php_cs
+/.php-cs-fixer.php
+/*.cache
+
+phpbench.phar
+phpbench.phar.*
+/.phpbench_storage
 php-cs-fixer.phar
-/.phpunit.result.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,42 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('Annotation')
+    ->name('*.php')
+    ->in([__DIR__.'/src', __DIR__.'/tests'])
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules(
+        [
+            '@Symfony' => true,
+            '@PHP80Migration' => true,
+            '@PHP80Migration:risky' => true,
+            'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
+            'general_phpdoc_annotation_remove' => [
+                'annotations' => [
+                    'author',
+                    'category',
+                    'copyright',
+                    'created',
+                    'license',
+                    'package',
+                    'since',
+                    'subpackage',
+                    'version',
+                ],
+            ],
+            'fully_qualified_strict_types' => true,
+            'single_line_throw' => false,
+            'phpdoc_to_comment' => false,
+            'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+            'global_namespace_import' => ['import_functions' => true, 'import_classes' => true, 'import_constants' => true],
+            'phpdoc_summary' => false,
+            'single_line_comment_style' => false,
+            'phpdoc_no_alias_tag' => ['replacements' => ['type' => 'var']],
+            'no_mixed_echo_print' => ['use' => 'echo'],
+        ]
+    )
+    ->setFinder($finder)
+    ->setUsingCache(true)
+    ;
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
     },
     "scripts": {
         "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",
+        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/download/v3.48.0/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"

diff --git a/src/Config/GraphQLEndpoint/GraphQLEndpointInvalidSchemaException.php b/src/Config/GraphQLEndpoint/GraphQLEndpointInvalidSchemaException.php
@@ -1,8 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config\GraphQLEndpoint;
 
-class GraphQLEndpointInvalidSchemaException extends \RuntimeException
+use RuntimeException;
+
+class GraphQLEndpointInvalidSchemaException extends RuntimeException
 {
     public static function forSchemaAndResolver($schemaName, $resolverClass)
     {

diff --git a/src/Config/GraphQLEndpoint/Helpers/OverblogGraphQLBundleEndpointResolver.php b/src/Config/GraphQLEndpoint/Helpers/OverblogGraphQLBundleEndpointResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config\GraphQLEndpoint\Helpers;
 
 final class OverblogGraphQLBundleEndpointResolver

diff --git a/src/Config/GraphQLEndpoint/RootResolver.php b/src/Config/GraphQLEndpoint/RootResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config\GraphQLEndpoint;
 
 use Overblog\GraphiQLBundle\Config\GraphiQLControllerEndpoint;

diff --git a/src/Config/GraphQLEndpoint/RouteResolver.php b/src/Config/GraphQLEndpoint/RouteResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config\GraphQLEndpoint;
 
 use Overblog\GraphiQLBundle\Config\GraphiQLControllerEndpoint;

diff --git a/src/Config/GraphiQLControllerEndpoint.php b/src/Config/GraphiQLControllerEndpoint.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config;
 
 interface GraphiQLControllerEndpoint

diff --git a/src/Config/GraphiQLViewConfig.php b/src/Config/GraphiQLViewConfig.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config;
 
 final class GraphiQLViewConfig

diff --git a/src/Config/GraphiQLViewJavaScriptLibraries.php b/src/Config/GraphiQLViewJavaScriptLibraries.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Config;
 
 final class GraphiQLViewJavaScriptLibraries

diff --git a/src/Controller/GraphiQLController.php b/src/Controller/GraphiQLController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Controller;
 
 use Overblog\GraphiQLBundle\Config\GraphiQLControllerEndpoint;

diff --git a/src/DependencyInjection/Compiler/Endpoints/DefaultEndpointWiringPass.php b/src/DependencyInjection/Compiler/Endpoints/DefaultEndpointWiringPass.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\DependencyInjection\Compiler\Endpoints;
 
 use Overblog\GraphiQLBundle\Config\GraphiQLControllerEndpoint;
@@ -9,8 +11,8 @@
 
 final class DefaultEndpointWiringPass implements CompilerPassInterface
 {
-    //@todo https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
-    public function process(ContainerBuilder $container)
+    // @todo https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
+    public function process(ContainerBuilder $container): void
     {
         $endpointDefinition = $container->getDefinition('overblog_graphiql.controller.graphql.endpoint');
 

diff --git a/src/DependencyInjection/Compiler/Endpoints/OverblogGraphQLBundleEndpointWiringPass.php b/src/DependencyInjection/Compiler/Endpoints/OverblogGraphQLBundleEndpointWiringPass.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\DependencyInjection\Compiler\Endpoints;
 
 use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\RouteResolver;
@@ -9,7 +11,7 @@
 
 final class OverblogGraphQLBundleEndpointWiringPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $bundles = $container->getParameter('kernel.bundles_metadata');
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,12 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\DependencyInjection;
 
 use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\Helpers\OverblogGraphQLBundleEndpointResolver;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
+use function method_exists;
+
 final class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
@@ -47,6 +51,6 @@ public function getConfigTreeBuilder(): TreeBuilder
     private static function getRootNodeWithoutDeprecation(TreeBuilder $builder, $name, $type = 'array')
     {
         // BC layer for symfony/config 4.1 and older
-        return \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root($name, $type);
+        return method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root($name, $type);
     }
 }
diff --git a/src/DependencyInjection/OverblogGraphiQLExtension.php b/src/DependencyInjection/OverblogGraphiQLExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;

diff --git a/src/OverblogGraphiQLBundle.php b/src/OverblogGraphiQLBundle.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle;
 
 use Overblog\GraphiQLBundle\DependencyInjection\Compiler\Endpoints\DefaultEndpointWiringPass;

diff --git a/tests/Config/GraphQLEndpoint/Helpers/OverblogGraphQLBundleEndpointResolverTest.php b/tests/Config/GraphQLEndpoint/Helpers/OverblogGraphQLBundleEndpointResolverTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Tests\Config\GraphQLEndpoint\Helpers;
 
 use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\Helpers\OverblogGraphQLBundleEndpointResolver;
 use PHPUnit\Framework\TestCase;
 
 final class OverblogGraphQLBundleEndpointResolverTest extends TestCase
 {
-    public function testGetDefaultRoute()
+    public function testGetDefaultRoute(): void
     {
         $defaultRoute = OverblogGraphQLBundleEndpointResolver::getByName('default');
         $this->assertSame(['overblog_graphql_endpoint'], $defaultRoute);
@@ -16,7 +18,7 @@ public function testGetDefaultRoute()
     /**
      * @dataProvider getSchemas
      */
-    public function testGetWithSchemaName($schemaName, $expectedResult)
+    public function testGetWithSchemaName($schemaName, $expectedResult): void
     {
         $route = OverblogGraphQLBundleEndpointResolver::getByName($schemaName);
         $this->assertSame($expectedResult, $route);

diff --git a/tests/Config/GraphQLEndpoint/RootResolverTest.php b/tests/Config/GraphQLEndpoint/RootResolverTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Tests\Config\GraphQLEndpoint;
 
 use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\GraphQLEndpointInvalidSchemaException;
@@ -16,7 +18,7 @@ private function subject()
         return new RootResolver();
     }
 
-    public function testInvalidSchema()
+    public function testInvalidSchema(): void
     {
         $rootResolver = $this->subject();
 
@@ -26,7 +28,7 @@ public function testInvalidSchema()
         $rootResolver->getBySchema('any');
     }
 
-    public function testDefaultSchema()
+    public function testDefaultSchema(): void
     {
         $rootResolver = $this->subject();
 

diff --git a/tests/Config/GraphQLEndpoint/RouteResolverTest.php b/tests/Config/GraphQLEndpoint/RouteResolverTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Tests\Config\GraphQLEndpoint;
 
 use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\GraphQLEndpointInvalidSchemaException;
@@ -29,7 +31,7 @@ private function subject(array $routeCollection)
         );
     }
 
-    public function testInvalidRoute()
+    public function testInvalidRoute(): void
     {
         $routeResolver = $this->subject([]);
 
@@ -39,7 +41,7 @@ public function testInvalidRoute()
         $routeResolver->getDefault();
     }
 
-    public function testArrayRoutes()
+    public function testArrayRoutes(): void
     {
         $this->router->expects($this->exactly(3))
             ->method('generate')

diff --git a/tests/Controller/GraphiQLControllerTest.php b/tests/Controller/GraphiQLControllerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphQLBundle\Tests\Controller;
 
 use Overblog\GraphiQLBundle\Tests\TestCase;

diff --git a/tests/Fixtures/TestKernel.php b/tests/Fixtures/TestKernel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Tests\Fixtures;
 
 use Overblog\GraphiQLBundle\OverblogGraphiQLBundle;
@@ -23,9 +25,9 @@ public function registerBundles(): array
     /**
      * {@inheritdoc}
      */
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
-        $loader->load(function (ContainerBuilder $container) {
+        $loader->load(function (ContainerBuilder $container): void {
             $container->loadFromExtension('framework', [
                 'secret' => 'test',
                 'test' => true,

diff --git a/tests/ForwardCompatTestCaseTrait.php b/tests/ForwardCompatTestCaseTrait.php
@@ -1,12 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Tests;
 
+use ReflectionMethod;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
+use const PHP_VERSION_ID;
+
 // see https://github.com/lexik/LexikJWTAuthenticationBundle/blob/master/Tests/Functional/ForwardCompatTestCaseTrait.php
 
-if (70000 <= \PHP_VERSION_ID && (new \ReflectionMethod(WebTestCase::class, 'tearDown'))->hasReturnType()) {
+if (70000 <= PHP_VERSION_ID && (new ReflectionMethod(WebTestCase::class, 'tearDown'))->hasReturnType()) {
     eval('
         namespace Overblog\GraphiQLBundle\Tests;
 
@@ -28,7 +33,7 @@ protected function tearDown(): void
      */
     trait ForwardCompatTestCaseTrait
     {
-        protected function tearDown()
+        protected function tearDown(): void
         {
             static::ensureKernelShutdown();
             static::$kernel = null;

diff --git a/tests/Functional/DependencyInjection/Fixtures/Xml/TestKernel.php b/tests/Functional/DependencyInjection/Fixtures/Xml/TestKernel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Overblog\GraphiQLBundle\Tests\Functional\DependencyInjection\Fixtures\Xml;
 
 use Overblog\GraphiQLBundle\OverblogGraphiQLBundle;
@@ -23,10 +25,10 @@ public function registerBundles(): array
     /**
      * {@inheritdoc}
      */
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__.'/config.xml');
-        $loader->load(function (ContainerBuilder $container) {
+        $loader->load(function (ContainerBuilder $container): void {
             $container->loadFromExtension('framework', [
                 'assets' => ['enabled' => false],
             ]);