Apply fixes from StyleCI

simon28082 · Jan 15, 2019 · f90ab9c · f90ab9c
1 parent 9a9f95e
commit f90ab9c
Show file tree

Hide file tree

Showing 24 changed files with 191 additions and 166 deletions.
diff --git a/config/config.php b/config/config.php
@@ -33,25 +33,25 @@
         'consul' => [
             'discover' => [
                 'driver' => 'http',
-                'host' => env('SERVICE_DISCOVER_HOST', '127.0.0.1'),
-                'port' => env('SERVICE_DISCOVER_PORT', 8500),
-                'uri' => 'agent/services',
+                'host'   => env('SERVICE_DISCOVER_HOST', '127.0.0.1'),
+                'port'   => env('SERVICE_DISCOVER_PORT', 8500),
+                'uri'    => 'agent/services',
             ],
         ],
 
         'local' => [
             'discover' => [
-                'path' => env('SERVICE_DISCOVER_PATH', storage_path('micorservice-discover.json'))
+                'path' => env('SERVICE_DISCOVER_PATH', storage_path('micorservice-discover.json')),
             ],
         ],
 
         'swarm' => [
             'discover' => [
                 'driver' => 'http',
-                'host' => env('SERVICE_DISCOVER_HOST', '127.0.0.1'),
-                'port' => env('SERVICE_DISCOVER_PORT', 2375),
+                'host'   => env('SERVICE_DISCOVER_HOST', '127.0.0.1'),
+                'port'   => env('SERVICE_DISCOVER_PORT', 2375),
             ],
-        ]
+        ],
     ],
 
     /*
@@ -92,13 +92,13 @@
 
     'clients' => [
         'restful' => [
-            'name' => 'restful',
-            'driver' => 'http',
+            'name'    => 'restful',
+            'driver'  => 'http',
             'options' => [
                 'timeout' => 1,
                 //'verify' => resource_path('ssl/cacert.pem'),
             ],
-        ]
+        ],
     ],
 
     /*
@@ -144,5 +144,5 @@
 
     'events' => [
 
-    ]
+    ],
 ];
diff --git a/src/Clients/Restful.php b/src/Clients/Restful.php
@@ -4,21 +4,19 @@
 
 use CrCms\Foundation\Client\ClientManager;
 use CrCms\Microservice\Client\Contracts\ClientContract;
-use Psr\Http\Message\ResponseInterface;
 
 /**
- * Class Restful
- * @package CrCms\Microservice\Client\Drivers
+ * Class Restful.
  */
 class Restful implements ClientContract
 {
     /**
      * @var array
      */
     protected $headers = [
-        'User-Agent' => 'CRCMS-Microservice PHP Client',
+        'User-Agent'      => 'CRCMS-Microservice PHP Client',
         'Accept-Encoding' => 'gzip,deflate,br',
-        'Connection' => 'keep-alive',
+        'Connection'      => 'keep-alive',
     ];
 
     /**
@@ -60,9 +58,10 @@ class Restful implements ClientContract
 
     /**
      * Restful constructor.
+     *
      * @param ClientManager $manager
-     * @param array $config
-     * @param array $options
+     * @param array         $config
+     * @param array         $options
      */
     public function __construct(ClientManager $manager, array $config, array $options)
     {
@@ -72,18 +71,19 @@ public function __construct(ClientManager $manager, array $config, array $option
     }
 
     /**
-     * @param array $service
-     * @param string $uri
+     * @param array        $service
+     * @param string       $uri
      * @param array|string $params
+     *
      * @return Restful
      */
     public function call(array $service, $params = []): ClientContract
     {
         $this->client->connection([
-            'name' => $service['name'],
-            'driver' => $this->config['driver'],
-            'host' => $service['host'],
-            'port' => $service['port'],
+            'name'     => $service['name'],
+            'driver'   => $this->config['driver'],
+            'host'     => $service['host'],
+            'port'     => $service['port'],
             'settings' => array_merge($this->defaultConfig, $this->config['options'] ?? [], $this->options[$service['name']] ?? []),
         ])->handle('/', ['headers' => $this->headers, 'method' => $this->method, 'payload' => $params]);
 
@@ -110,4 +110,4 @@ public function getContent()
     {
         return $this->content;
     }
-}
+}
diff --git a/src/Concerns/ServiceInstanceConcern.php b/src/Concerns/ServiceInstanceConcern.php
@@ -5,8 +5,7 @@
 use CrCms\Microservice\Client\Service;
 
 /**
- * Trait ServiceInstanceConcern
- * @package CrCms\Microservice\Client\Concerns
+ * Trait ServiceInstanceConcern.
  */
 trait ServiceInstanceConcern
 {
@@ -17,4 +16,4 @@ public function service(): Service
     {
         return app(Service::class);
     }
-}
+}
diff --git a/src/Contracts/CallEventContract.php b/src/Contracts/CallEventContract.php
@@ -6,23 +6,24 @@
 use Exception;
 
 /**
- * Interface CallEventContract
- * @package CrCms\Microservice\Client\Contracts
+ * Interface CallEventContract.
  */
 interface CallEventContract
 {
     /**
      * @param Service $service
-     * @param array $serverInfo
+     * @param array   $serverInfo
+     *
      * @return void
      */
     public function handle(Service $service, array $serverInfo): void;
 
     /**
-     * @param Service $service
+     * @param Service   $service
      * @param Exception $exception
-     * @param array $serverInfo
+     * @param array     $serverInfo
+     *
      * @return void
      */
     public function failed(Service $service, Exception $exception, array $serverInfo): void;
-}
+}
diff --git a/src/Contracts/ClientContract.php b/src/Contracts/ClientContract.php
@@ -3,7 +3,9 @@
 /**
  * @author simon <[email protected]>
  * @datetime 2018/6/23 18:36
+ *
  * @link http://crcms.cn/
+ *
  * @copyright Copyright &copy; 2018 Rights Reserved CRCMS
  */
 
@@ -12,12 +14,13 @@
 interface ClientContract
 {
     /**
-     * @param array $service
-     * @param string $uri
+     * @param array        $service
+     * @param string       $uri
      * @param array|string $params
+     *
      * @return ClientContract
      */
-    public function call(array $service, $params = []): ClientContract;
+    public function call(array $service, $params = []): self;
 
     /**
      * @return int
@@ -28,4 +31,4 @@ public function getStatusCode(): int;
      * @return mixed
      */
     public function getContent();
-}
+}
diff --git a/src/Contracts/SelectorContract.php b/src/Contracts/SelectorContract.php
@@ -3,7 +3,9 @@
 /**
  * @author simon <[email protected]>
  * @datetime 2018/6/25 6:31
+ *
  * @link http://crcms.cn/
+ *
  * @copyright Copyright &copy; 2018 Rights Reserved CRCMS
  */
 
@@ -13,7 +15,8 @@ interface SelectorContract
 {
     /**
      * @param string $service
+     *
      * @return array
      */
     public function select(string $service): array;
-}
+}
diff --git a/src/Contracts/ServiceDiscoverContract.php b/src/Contracts/ServiceDiscoverContract.php
@@ -3,14 +3,14 @@
 namespace CrCms\Microservice\Client\Contracts;
 
 /**
- * Interface ServiceDiscoverContract
- * @package CrCms\Microservice\Client\Contracts
+ * Interface ServiceDiscoverContract.
  */
 interface ServiceDiscoverContract
 {
     /**
      * @param $service
+     *
      * @return array
      */
     public function services(string $service): array;
-}
+}
diff --git a/src/Exceptions/ServiceException.php b/src/Exceptions/ServiceException.php
@@ -5,14 +5,12 @@
 use CrCms\Foundation\ConnectionPool\Exceptions\ConnectionException;
 use CrCms\Foundation\ConnectionPool\Exceptions\RequestException;
 use CrCms\Microservice\Client\Packer\Packer;
+use Exception;
 use Illuminate\Http\JsonResponse;
 use RuntimeException;
-use Exception;
-use UnexpectedValueException;
 
 /**
- * Class ServiceException
- * @package CrCms\Microservice\Client\Exceptions
+ * Class ServiceException.
  */
 class ServiceException extends RuntimeException
 {
@@ -33,6 +31,7 @@ class ServiceException extends RuntimeException
 
     /**
      * ServiceException constructor.
+     *
      * @param Exception $exception
      */
     public function __construct(Exception $exception)
@@ -82,6 +81,7 @@ protected function resolveException(Exception $exception)
 
     /**
      * @param string $message
+     *
      * @return array
      */
     protected function resolveMessage(string $message)
@@ -90,8 +90,9 @@ protected function resolveMessage(string $message)
     }
 
     /**
-     * @return JsonResponse
      * @throws Exception
+     *
+     * @return JsonResponse
      */
     public function render()
     {
@@ -105,4 +106,4 @@ public function render()
             throw $this->exception;
         }
     }
-}
+}
diff --git a/src/Facades/Service.php b/src/Facades/Service.php
@@ -2,9 +2,9 @@
 
 namespace CrCms\Microservice\Client\Facades;
 
-use Illuminate\Support\Facades\Facade;
 use CrCms\Microservice\Client\Service as ServiceInstance;
 use GuzzleHttp\Promise\Promise;
+use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static object call(string $service, $uri = '', array $params = [])
@@ -16,7 +16,6 @@
  * @method static ServiceInstance connection(?string $name = null)
  *
  * Class Service
- * @package CrCms\Microservice\Client\Facades
  */
 class Service extends Facade
 {
@@ -27,4 +26,4 @@ protected static function getFacadeAccessor(): string
     {
         return ServiceInstance::class;
     }
-}
+}