Tweak CS-Fixer settings

Author: mbabker

.gitattributes

@@ -3,7 +3,7 @@
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs export-ignore
+/.php-cs-fixer.php export-ignore
 /CHANGELOG.md export-ignore
 /gulpfile.js export-ignore
 /package.json export-ignore

.gitignore

@@ -2,8 +2,7 @@
 composer.lock
 .phpunit.result.cache
 /phpunit.xml
-.php_cs.cache
-/.php_cs
+.php-cs-fixer.cache
 /.phpstan.neon
 /node_modules/
 /package-lock.json

.php-cs-fixer.php

@@ -1,21 +1,22 @@
 <?php declare(strict_types=1);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHPUnit75Migration:risky' => true,
+        '@PHP74Migration' => true,
+        '@PHP74Migration:risky' => true,
+        '@PHPUnit84Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => false,
-        'declare_strict_types' => true,
         'fopen_flags' => false,
-        'ordered_imports' => true,
-        'protected_to_private' => true,
-        'void_return' => true,
+        'linebreak_after_opening_tag' => false,
+        'no_superfluous_phpdoc_tags' => ['remove_inheritdoc' => true],
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
-        PhpCsFixer\Finder::create()
+        (new PhpCsFixer\Finder())
             ->in(__DIR__.'/src')
             ->in(__DIR__.'/tests')
     )

src/Client/ClientConnection.php

@@ -28,8 +28,6 @@ public function getConnection(): ConnectionInterface
 
     /**
      * @param int|string $offset
-     *
-     * @return bool
      */
     public function offsetExists($offset): bool
     {
@@ -64,7 +62,7 @@ public function offsetGet($offset)
                         $trace[0]['file'],
                         $trace[0]['line']
                     ),
-                    E_USER_NOTICE
+                    \E_USER_NOTICE
                 );
         }
     }

src/Client/ClientManipulator.php

@@ -66,7 +66,7 @@ public function findByRoles(Topic $topic, array $roles): array
                 if (\in_array($role, $roles)) {
                     $result[] = new ClientConnection($client, $connection);
 
-                    continue 1;
+                    continue 2;
                 }
             }
         }

src/DependencyInjection/CompilerPass/DataCollectorCompilerPass.php

@@ -26,7 +26,7 @@ public function __construct(bool $internal = false)
     public function process(ContainerBuilder $container): void
     {
         if (!$this->internal) {
-            trigger_deprecation('gos/web-socket-bundle', '3.1', 'The "%s" class is deprecated and will be removed in 4.0, use the symfony/messenger component instead.', DataCollectorCompilerPass::class);
+            trigger_deprecation('gos/web-socket-bundle', '3.1', 'The "%s" class is deprecated and will be removed in 4.0, use the symfony/messenger component instead.', self::class);
         }
 
         if (!$container->getParameter('kernel.debug') || !$container->hasDefinition('debug.stopwatch')) {

src/DependencyInjection/CompilerPass/PusherCompilerPass.php

@@ -28,7 +28,7 @@ public function __construct(bool $internal = false)
     public function process(ContainerBuilder $container): void
     {
         if (!$this->internal) {
-            trigger_deprecation('gos/web-socket-bundle', '3.1', 'The "%s" class is deprecated and will be removed in 4.0, use the symfony/messenger component instead.', PusherCompilerPass::class);
+            trigger_deprecation('gos/web-socket-bundle', '3.1', 'The "%s" class is deprecated and will be removed in 4.0, use the symfony/messenger component instead.', self::class);
         }
 
         if ($container->hasDefinition('gos_web_socket.registry.pusher')) {

src/DependencyInjection/CompilerPass/ServerPushHandlerCompilerPass.php

@@ -28,7 +28,7 @@ public function __construct(bool $internal = false)
     public function process(ContainerBuilder $container): void
     {
         if (!$this->internal) {
-            trigger_deprecation('gos/web-socket-bundle', '3.1', 'The "%s" class is deprecated and will be removed in 4.0, use the symfony/messenger component instead.', ServerPushHandlerCompilerPass::class);
+            trigger_deprecation('gos/web-socket-bundle', '3.1', 'The "%s" class is deprecated and will be removed in 4.0, use the symfony/messenger component instead.', self::class);
         }
 
         if ($container->hasDefinition('gos_web_socket.registry.server_push_handler')) {

src/DependencyInjection/GosWebSocketExtension.php

@@ -203,7 +203,7 @@ private function registerServerConfiguration(array $configs, ContainerBuilder $c
             // Adapt configuration based on the version of GosPubSubRouterBundle installed, if the XML loader is available the newer configuration structure is used
             if (isset($configs['server']['router']['resources'])) {
                 foreach ($configs['server']['router']['resources'] as $resource) {
-                    if (is_array($resource)) {
+                    if (\is_array($resource)) {
                         $routerConfig[] = $resource;
                     } else {
                         $routerConfig[] = [

src/EventListener/StartServerListener.php

@@ -59,11 +59,11 @@ public function bindPnctlEvent(ServerLaunchedEvent $event): void
         };
 
         if (\defined('SIGINT')) {
-            $loop->addSignal(SIGINT, $closer);
+            $loop->addSignal(\SIGINT, $closer);
         }
 
         if (\defined('SIGTERM')) {
-            $loop->addSignal(SIGTERM, $closer);
+            $loop->addSignal(\SIGTERM, $closer);
         }
     }
 }