Merge pull request #1255 from ulue/dev2

inhere · web-flow · commit 211adeaab2cc · 2020-04-15T15:11:15.000+08:00
Fix code style
diff --git a/.php_cs b/.php_cs
@@ -14,17 +14,20 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@PSR2' => true,
         'header_comment' => [
-            'commentType' => 'PHPDoc',
-            'header' => $header,
-            'separate' => 'none'
+            'comment_type' => 'PHPDoc',
+            'header'       => $header,
+            'separate'     => 'bottom'
         ],
         'array_syntax' => [
             'syntax' => 'short'
         ],
+        'encoding' => true, // MUST use only UTF-8 without BOM
         'single_quote' => true,
         'class_attributes_separation' => true,
         'no_unused_imports' => true,
+        'global_namespace_import' => true,
         'standardize_not_equals' => true,
+        'declare_strict_types' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
diff --git a/.travis.yml b/.travis.yml
@@ -13,18 +13,19 @@ install:
   - |
     echo "no" | pecl install -f redis
   - |
-    wget https://github.com/swoole/swoole-src/archive/v4.4.15.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure && make -j$(nproc) && make install && cd - && rm -rf swoole
+    wget https://github.com/swoole/swoole-src/archive/v4.4.17.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure && make -j$(nproc) && make install && cd - && rm -rf swoole
     echo "extension = swoole.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - |
     wget -O bin/php-cs-fixer "https://cs.symfony.com/download/php-cs-fixer-v2.phar"
     chmod +x bin/php-cs-fixer
 
 before_script:
   - phpenv config-rm xdebug.ini
+  - bin/php-cs-fixer -V
   - composer config -g process-timeout 900 && composer update
   - composer require --dev phpstan/phpstan
 
 script:
-  - composer cs-fix
+  - composer check-cs
   - composer test
 #  - php bin/swoft dinfo:env
diff --git a/app/Annotation/Parser/AlphaDashParser.php b/app/Annotation/Parser/AlphaDashParser.php
@@ -10,10 +10,10 @@
 
 namespace App\Annotation\Parser;
 
+use App\Annotation\Mapping\AlphaDash;
 use ReflectionException;
 use Swoft\Annotation\Annotation\Mapping\AnnotationParser;
 use Swoft\Annotation\Annotation\Parser\Parser;
-use App\Annotation\Mapping\AlphaDash;
 use Swoft\Validator\Exception\ValidatorException;
 use Swoft\Validator\ValidatorRegister;
 
@@ -25,7 +25,7 @@
 class AlphaDashParser extends Parser
 {
     /**
-     * @param int $type
+     * @param int    $type
      * @param object $annotationObject
      *
      * @return array
diff --git a/app/Aspect/BeanAspect.php b/app/Aspect/BeanAspect.php
@@ -10,10 +10,10 @@
 
 namespace App\Aspect;
 
+use App\Common\MyBean;
 use Swoft\Aop\Annotation\Mapping\Aspect;
 use Swoft\Aop\Annotation\Mapping\Before;
 use Swoft\Aop\Annotation\Mapping\PointBean;
-use App\Common\MyBean;
 use function vdump;
 
 /**
diff --git a/app/Common/MyBean.php b/app/Common/MyBean.php
@@ -1,4 +1,12 @@
 <?php declare(strict_types=1);
+/**
+ * This file is part of Swoft.
+ *
+ * @link     https://swoft.org
+ * @document https://swoft.org/docs
+ * @contact  group@swoft.org
+ * @license  https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
 
 namespace App\Common;
 
diff --git a/app/Exception/ApiException.php b/app/Exception/ApiException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * This file is part of Swoft.
  *
@@ -7,13 +7,16 @@
  * @contact  group@swoft.org
  * @license  https://github.com/swoft-cloud/swoft/blob/master/LICENSE
  */
+
 namespace App\Exception;
 
+use Exception;
+
 /**
  * Class ApiException
  *
  * @since 2.0
  */
-class ApiException extends \Exception
+class ApiException extends Exception
 {
 }
diff --git a/app/Helper/Functions.php b/app/Helper/Functions.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * This file is part of Swoft.
  *
diff --git a/app/Http/Controller/HomeController.php b/app/Http/Controller/HomeController.php
@@ -18,6 +18,7 @@
 use Swoft\Http\Server\Annotation\Mapping\RequestMapping;
 use Swoft\View\Renderer;
 use Throwable;
+use function bean;
 use function context;
 
 /**
@@ -79,6 +80,6 @@ public function wsTest(): Response
      */
     public function dataConfig(): array
     {
-        return \bean(GoodsData::class)->getConfig();
+        return bean(GoodsData::class)->getConfig();
     }
 }
diff --git a/app/Http/Controller/SessionController.php b/app/Http/Controller/SessionController.php
@@ -89,7 +89,7 @@ public function get(): array
     public function del(): array
     {
         $sess = HttpSession::current();
-        $ok = $sess->delete('testKey');
+        $ok   = $sess->delete('testKey');
 
         return ['delete' => $ok];
     }
diff --git a/app/Http/Controller/TimerController.php b/app/Http/Controller/TimerController.php
@@ -12,13 +12,13 @@
 
 use App\Model\Entity\User;
 use Exception;
-use function random_int;
 use Swoft\Http\Server\Annotation\Mapping\Controller;
 use Swoft\Http\Server\Annotation\Mapping\RequestMapping;
 use Swoft\Log\Helper\Log;
 use Swoft\Redis\Redis;
 use Swoft\Stdlib\Helper\JsonHelper;
 use Swoft\Timer;
+use function random_int;
 
 /**
  * Class TimerController
diff --git a/app/Listener/RegisterServiceListener.php b/app/Listener/RegisterServiceListener.php
@@ -16,7 +16,6 @@
 use Swoft\Event\EventHandlerInterface;
 use Swoft\Event\EventInterface;
 use Swoft\Http\Server\HttpServer;
-use Swoft\Log\Helper\CLog;
 use Swoft\Server\SwooleEvent;
 
 /**
@@ -63,7 +62,7 @@ public function handle(EventInterface $event): void
 
 
         // Register
-//        $this->agent->registerService($service);
-//        CLog::info('Swoft http register service success by consul!');
+        //        $this->agent->registerService($service);
+        //        CLog::info('Swoft http register service success by consul!');
     }
 }
diff --git a/app/Model/Data/GoodsData.php b/app/Model/Data/GoodsData.php
@@ -1,4 +1,12 @@
 <?php declare(strict_types=1);
+/**
+ * This file is part of Swoft.
+ *
+ * @link     https://swoft.org
+ * @document https://swoft.org/docs
+ * @contact  group@swoft.org
+ * @license  https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
 
 namespace App\Model\Data;
 
diff --git a/app/Model/Logic/MonitorLogic.php b/app/Model/Logic/MonitorLogic.php
@@ -42,11 +42,11 @@ public function monitor(Process $process): void
 
             // Database
             $user = User::find(1)->toArray();
-            CLog::info('user='.json_encode($user));
+            CLog::info('user=' . json_encode($user));
 
             // Redis
             Redis::set('test', 'ok');
-            CLog::info('test='.Redis::get('test'));
+            CLog::info('test=' . Redis::get('test'));
 
             Coroutine::sleep(3);
         }
diff --git a/app/Model/Logic/RequestBean.php b/app/Model/Logic/RequestBean.php
@@ -21,6 +21,9 @@
  */
 class RequestBean
 {
+    /**
+     * @var array
+     */
     public $temp = [];
 
     /**
@@ -36,7 +39,7 @@ public function getData(): array
      *
      * @return string
      */
-    public function getName(string $type):string
+    public function getName(string $type): string
     {
         return 'name';
     }
diff --git a/app/Process/Worker2Process.php b/app/Process/Worker2Process.php
@@ -40,13 +40,13 @@ public function run(Pool $pool, int $workerId): void
 
             // Database
             $user = User::find(1)->toArray();
-            CLog::info('user='.json_encode($user));
+            CLog::info('user=' . json_encode($user));
 
             // Redis
             Redis::set('test', 'ok');
-            CLog::info('test='.Redis::get('test'));
+            CLog::info('test=' . Redis::get('test'));
 
-            CLog::info('worker-' . $workerId.' context='.context()->getWorkerId());
+            CLog::info('worker-' . $workerId . ' context=' . context()->getWorkerId());
 
             Coroutine::sleep(3);
         }
diff --git a/app/Rpc/Lib/UserInterface.php b/app/Rpc/Lib/UserInterface.php
@@ -41,7 +41,7 @@ public function getBigContent(): string;
     /**
      * @return void
      */
-    public function returnNull():void ;
+    public function returnNull(): void;
 
     /**
      * Exception
diff --git a/app/Rpc/Service/UserService.php b/app/Rpc/Service/UserService.php
@@ -12,6 +12,7 @@
 
 use App\Rpc\Lib\UserInterface;
 use Exception;
+use RuntimeException;
 use Swoft\Co;
 use Swoft\Rpc\Server\Annotation\Mapping\Service;
 
@@ -51,25 +52,24 @@ public function delete(int $id): bool
      */
     public function returnNull(): void
     {
-        return;
     }
 
     /**
      * @return string
      */
     public function getBigContent(): string
     {
-        $content = Co::readFile(__DIR__ . '/big.data');
-        return $content;
+        return Co::readFile(__DIR__ . '/big.data');
     }
 
     /**
      * Exception
+     *
      * @throws Exception
      */
     public function exception(): void
     {
-        throw new Exception('exception version');
+        throw new RuntimeException('exception version');
     }
 
     /**
diff --git a/app/Rpc/Service/UserServiceV2.php b/app/Rpc/Service/UserServiceV2.php
@@ -68,6 +68,7 @@ public function getBigContent(): string
 
     /**
      * Exception
+     *
      * @throws Exception
      */
     public function exception(): void
diff --git a/app/Task/Listener/FinishListener.php b/app/Task/Listener/FinishListener.php
@@ -10,12 +10,12 @@
 
 namespace App\Task\Listener;
 
-use function context;
 use Swoft\Event\Annotation\Mapping\Listener;
 use Swoft\Event\EventHandlerInterface;
 use Swoft\Event\EventInterface;
 use Swoft\Log\Helper\CLog;
 use Swoft\Task\TaskEvent;
+use function context;
 
 /**
  * Class FinishListener
diff --git a/app/Tcp/Middleware/DemoMiddleware.php b/app/Tcp/Middleware/DemoMiddleware.php
@@ -12,8 +12,8 @@
 
 use Swoft\Bean\Annotation\Mapping\Bean;
 use Swoft\Log\Helper\CLog;
-use Swoft\Tcp\Server\Contract\RequestHandlerInterface;
 use Swoft\Tcp\Server\Contract\MiddlewareInterface;
+use Swoft\Tcp\Server\Contract\RequestHandlerInterface;
 use Swoft\Tcp\Server\Contract\RequestInterface;
 use Swoft\Tcp\Server\Contract\ResponseInterface;
 
diff --git a/app/Tcp/Middleware/GlobalTcpMiddleware.php b/app/Tcp/Middleware/GlobalTcpMiddleware.php
@@ -12,8 +12,8 @@
 
 use Swoft\Bean\Annotation\Mapping\Bean;
 use Swoft\Log\Helper\CLog;
-use Swoft\Tcp\Server\Contract\RequestHandlerInterface;
 use Swoft\Tcp\Server\Contract\MiddlewareInterface;
+use Swoft\Tcp\Server\Contract\RequestHandlerInterface;
 use Swoft\Tcp\Server\Contract\RequestInterface;
 use Swoft\Tcp\Server\Contract\ResponseInterface;
 
diff --git a/app/Validator/CustomerValidator.php b/app/Validator/CustomerValidator.php
@@ -33,7 +33,7 @@ class CustomerValidator implements ValidatorInterface
     public function validate(array $data, array $params): array
     {
         $start = $data['start'] ?? null;
-        $end = $data['end'] ?? null;
+        $end   = $data['end'] ?? null;
         if ($start === null && $end === null) {
             throw new ValidatorException('Start time and end time cannot be empty');
         }
diff --git a/app/WebSocket/EchoModule.php b/app/WebSocket/EchoModule.php
@@ -17,7 +17,6 @@
 use Swoft\WebSocket\Server\Annotation\Mapping\WsModule;
 use Swoole\WebSocket\Frame;
 use Swoole\WebSocket\Server;
-use function server;
 
 /**
  * Class EchoModule
diff --git a/app/WebSocket/Test/TestController.php b/app/WebSocket/Test/TestController.php
@@ -42,6 +42,7 @@ public function index(): void
 
     /**
      * Message command is: 'test.index'
+     *
      * @param Message $msg
      *
      * @return void
diff --git a/app/bean.php b/app/bean.php
diff --git a/bin/bootstrap.php b/bin/bootstrap.php
diff --git a/composer.cn.json b/composer.cn.json
diff --git a/composer.json b/composer.json
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
diff --git a/test/bootstrap.php b/test/bootstrap.php
diff --git a/test/run.php b/test/run.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php`
	`1`	`+<?php declare(strict_types=1);`
`2`	`2`	`/**`
`3`	`3`	`* This file is part of Swoft.`
`4`	`4`	`*`
`@@ -7,13 +7,16 @@`
`7`	`7`	`* @contact group@swoft.org`
`8`	`8`	`* @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE`
`9`	`9`	`*/`
	`10`	`+`
`10`	`11`	`namespace App\Exception;`
`11`	`12`
	`13`	`+use Exception;`
	`14`	`+`
`12`	`15`	`/**`
`13`	`16`	`* Class ApiException`
`14`	`17`	`*`
`15`	`18`	`* @since 2.0`
`16`	`19`	`*/`
`17`		`-class ApiException extends \Exception`
	`20`	`+class ApiException extends Exception`
`18`	`21`	`{`
`19`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`use Swoft\Http\Server\Annotation\Mapping\RequestMapping;`
`19`	`19`	`use Swoft\View\Renderer;`
`20`	`20`	`use Throwable;`
	`21`	`+use function bean;`
`21`	`22`	`use function context;`
`22`	`23`
`23`	`24`	`/**`
`@@ -79,6 +80,6 @@ public function wsTest(): Response`
`79`	`80`	`*/`
`80`	`81`	`public function dataConfig(): array`
`81`	`82`	`{`
`82`		`- return \bean(GoodsData::class)->getConfig();`
	`83`	`+ return bean(GoodsData::class)->getConfig();`
`83`	`84`	`}`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function get(): array`
`89`	`89`	`public function del(): array`
`90`	`90`	`{`
`91`	`91`	`$sess = HttpSession::current();`
`92`		`- $ok = $sess->delete('testKey');`
	`92`	`+ $ok = $sess->delete('testKey');`
`93`	`93`
`94`	`94`	`return ['delete' => $ok];`
`95`	`95`	`}`