Upgrade friendsofphp/php-cs-fixer to ^3.0

Author: limingxinleo

.php_cs renamed to .php-cs-fixer.php

@@ -9,15 +9,15 @@
 @license https://github.com/hyperf/hyperf/blob/master/LICENSE
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
  ->setRiskyAllowed(true)
  ->setRules([
  '@PSR2' => true,
  '@Symfony' => true,
  '@DoctrineAnnotation' => true,
  '@PhpCsFixer' => true,
  'header_comment' => [
- 'commentType' => 'PHPDoc',
+ 'comment_type' => 'PHPDoc',
  'header' => $header,
  'separate' => 'none',
  'location' => 'after_declare_strict',
@@ -62,11 +62,19 @@
  'multiline_whitespace_before_semicolons' => [
  'strategy' => 'no_multi_line',
  ],
+ 'constant_case' => [
+ 'case' => 'lower',
+ ],
+ 'global_namespace_import' => [
+ 'import_classes' => true,
+ 'import_constants' => true,
+ 'import_functions' => true,
+ ],
+ 'phpdoc_to_comment' => false,
  'class_attributes_separation' => true,
  'combine_consecutive_unsets' => true,
  'declare_strict_types' => true,
  'linebreak_after_opening_tag' => true,
- 'lowercase_constants' => true,
  'lowercase_static_reference' => true,
  'no_useless_else' => true,
  'no_unused_imports' => true,

composer.json

@@ -26,8 +26,7 @@
  "symfony/event-dispatcher": "^5.1"
  },
  "require-dev": {
- "ext-mongodb": "*",
- "friendsofphp/php-cs-fixer": "^2.14",
+ "friendsofphp/php-cs-fixer": "^3.0",
  "hyperf/command": "^2.0.0",
  "hyperf/config": "^2.0.0",
  "hyperf/di": "^2.0.0",

example/config/main.php

@@ -19,6 +19,7 @@
 use Hyperf\GoTask\IPC\SocketIPCReceiver;
 use Hyperf\Utils\ApplicationContext;
 use Swoole\Process;
+
 use function Swoole\Coroutine\run;
 
 require __DIR__ . '/../../vendor/autoload.php';

example/go2php/main.php

@@ -11,6 +11,7 @@
  */
 use Hyperf\GoTask\IPC\SocketIPCReceiver;
 use Swoole\Process;
+
 use function Swoole\Coroutine\run;
 
 require __DIR__ . '/../../vendor/autoload.php';

example/main.php

@@ -12,6 +12,7 @@
 use Hyperf\GoTask\GoTask;
 use Hyperf\GoTask\IPC\SocketIPCSender;
 use Swoole\Process;
+
 use function Swoole\Coroutine\run;
 
 require __DIR__ . '/../vendor/autoload.php';

example/mongo_client/main.php

@@ -9,12 +9,12 @@
  * @contact guxi99@gmail.com
  * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
-
 use Hyperf\Config\Config;
 use Hyperf\GoTask\IPC\SocketIPCSender;
 use Hyperf\GoTask\MongoClient\MongoClient;
 use Hyperf\GoTask\MongoClient\MongoProxy;
 use Swoole\Process;
+
 use function Swoole\Coroutine\run;
 
 require __DIR__ . '/../../vendor/autoload.php';

src/ConfigProvider.php

@@ -71,7 +71,7 @@ public function __invoke(): array
 
  public static function address()
  {
- if (defined("BASE_PATH")) {
+ if (defined('BASE_PATH')) {
  $root = BASE_PATH . '/runtime';
  } else {
  $root = '/tmp';

src/Exception/GoBuildException.php

@@ -11,6 +11,8 @@
  */
 namespace Hyperf\GoTask\Exception;
 
-class GoBuildException extends \RuntimeException
+use RuntimeException;
+
+class GoBuildException extends RuntimeException
 {
 }

src/Exception/InvalidGoTaskConnectionException.php

@@ -11,6 +11,8 @@
  */
 namespace Hyperf\GoTask\Exception;
 
-class InvalidGoTaskConnectionException extends \RuntimeException
+use RuntimeException;
+
+class InvalidGoTaskConnectionException extends RuntimeException
 {
 }

src/GoTaskConnection.php

@@ -18,6 +18,7 @@
 use Hyperf\Pool\Pool;
 use Psr\Container\ContainerInterface;
 use Spiral\Goridge\RPC;
+use Throwable;
 
 /**
  * Class GoTaskConnection.
@@ -46,7 +47,7 @@ public function __call($name, $arguments)
  {
  try {
  $result = $this->connection->{$name}(...$arguments);
- } catch (\Throwable $exception) {
+ } catch (Throwable $exception) {
  $result = $this->retry($name, $arguments, $exception);
  }
 
@@ -79,15 +80,15 @@ public function getActiveConnection()
  return $this;
  }
 
- protected function retry($name, $arguments, \Throwable $exception)
+ protected function retry($name, $arguments, Throwable $exception)
  {
  $logger = $this->container->get(StdoutLoggerInterface::class);
  $logger->warning(sprintf('RemoteGoTask::__call failed, because ' . $exception->getMessage()));
 
  try {
  $this->reconnect();
  $result = $this->connection->{$name}(...$arguments);
- } catch (\Throwable $exception) {
+ } catch (Throwable $exception) {
  $this->lastUseTime = 0.0;
  throw $exception;
  }