Format code by the latest cs-fixer. (#6617)

hyperf · Mar 23, 2024 · 2f52ab4 · 2f52ab4
1 parent 974b51c
commit 2f52ab4
Show file tree

Hide file tree

Showing 40 changed files with 91 additions and 34 deletions.
diff --git a/class_map/GlobalTracer.php b/class_map/GlobalTracer.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace OpenTracing;
 
 use Hyperf\Tracer\TracerContext;

diff --git a/class_map/Map.php b/class_map/Map.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Zipkin\Propagation;
 
 use ArrayAccess;
@@ -56,7 +57,6 @@ public function get($carrier, string $key): ?string
     }
 
     /**
-     * {@inheritdoc}
      * @param array|ArrayAccess $carrier
      */
     public function put(&$carrier, string $key, string $value): void

diff --git a/class_map/ThriftUdpTransport.php b/class_map/ThriftUdpTransport.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Jaeger;
 
 use Hyperf\Context\ApplicationContext;

diff --git a/publish/opentracing.php b/publish/opentracing.php
@@ -9,6 +9,12 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use Hyperf\Tracer\Adapter\JaegerTracerFactory;
+use Hyperf\Tracer\Adapter\NoOpTracerFactory;
+use Hyperf\Tracer\Adapter\Reporter\Kafka;
+use Hyperf\Tracer\Adapter\ZipkinTracerFactory;
+use Zipkin\Reporters\Http;
+use Zipkin\Reporters\Noop;
 use Zipkin\Samplers\BinarySampler;
 
 use function Hyperf\Support\env;
@@ -30,7 +36,7 @@
     ],
     'tracer' => [
         'zipkin' => [
-            'driver' => Hyperf\Tracer\Adapter\ZipkinTracerFactory::class,
+            'driver' => ZipkinTracerFactory::class,
             'app' => [
                 'name' => env('APP_NAME', 'skeleton'),
                 // Hyperf will detect the system info automatically as the value if ipv4, ipv6, port is null
@@ -42,7 +48,7 @@
             'reporters' => [
                 // options for http reporter
                 'http' => [
-                    'class' => \Zipkin\Reporters\Http::class,
+                    'class' => Http::class,
                     'constructor' => [
                         'options' => [
                             'endpoint_url' => env('ZIPKIN_ENDPOINT_URL', 'http://localhost:9411/api/v2/spans'),
@@ -52,7 +58,7 @@
                 ],
                 // options for kafka reporter
                 'kafka' => [
-                    'class' => \Hyperf\Tracer\Adapter\Reporter\Kafka::class,
+                    'class' => Kafka::class,
                     'constructor' => [
                         'options' => [
                             'topic' => env('ZIPKIN_KAFKA_TOPIC', 'zipkin'),
@@ -64,13 +70,13 @@
                     ],
                 ],
                 'noop' => [
-                    'class' => \Zipkin\Reporters\Noop::class,
+                    'class' => Noop::class,
                 ],
             ],
             'sampler' => BinarySampler::createAsAlwaysSample(),
         ],
         'jaeger' => [
-            'driver' => Hyperf\Tracer\Adapter\JaegerTracerFactory::class,
+            'driver' => JaegerTracerFactory::class,
             'name' => env('APP_NAME', 'skeleton'),
             'options' => [
                 /*
@@ -90,7 +96,7 @@
             ],
         ],
         'noop' => [
-            'driver' => Hyperf\Tracer\Adapter\NoOpTracerFactory::class,
+            'driver' => NoOpTracerFactory::class,
         ],
     ],
     'tags' => [

diff --git a/src/Adapter/HttpClientFactory.php b/src/Adapter/HttpClientFactory.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter;
 
 /**

diff --git a/src/Adapter/JaegerTracerFactory.php b/src/Adapter/JaegerTracerFactory.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter;
 
 use Hyperf\Contract\ConfigInterface;

diff --git a/src/Adapter/NoOpTracerFactory.php b/src/Adapter/NoOpTracerFactory.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter;
 
 use Hyperf\Tracer\Contract\NamedFactoryInterface;

diff --git a/src/Adapter/Reporter/HttpClientFactory.php b/src/Adapter/Reporter/HttpClientFactory.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter\Reporter;
 
 use Closure;

diff --git a/src/Adapter/Reporter/Kafka.php b/src/Adapter/Reporter/Kafka.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter\Reporter;
 
 use Psr\Log\LoggerInterface;

diff --git a/src/Adapter/Reporter/KafkaClientFactory.php b/src/Adapter/Reporter/KafkaClientFactory.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter\Reporter;
 
 use Closure;

diff --git a/src/Adapter/Reporter/ReporterFactory.php b/src/Adapter/Reporter/ReporterFactory.php
@@ -9,12 +9,14 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter\Reporter;
 
 use Hyperf\Contract\StdoutLoggerInterface;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
 use Zipkin\Reporter;
+use Zipkin\Reporters\Http;
 
 use function Hyperf\Support\make;
 
@@ -38,7 +40,7 @@ public function make(array $option = []): Reporter
             throw new RuntimeException('Unsupported reporter.');
         }
 
-        if ($class === \Zipkin\Reporters\Http::class) {
+        if ($class === Http::class) {
             $constructor['requesterFactory'] = $this->container->get(HttpClientFactory::class);
         }
 

diff --git a/src/Adapter/ZipkinTracerFactory.php b/src/Adapter/ZipkinTracerFactory.php
@@ -9,12 +9,14 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Adapter;
 
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Tracer\Adapter\Reporter\ReporterFactory;
 use Hyperf\Tracer\Contract\NamedFactoryInterface;
 use Zipkin\Endpoint;
+use Zipkin\Reporters\Http;
 use Zipkin\Samplers\BinarySampler;
 use Zipkin\TracingBuilder;
 use ZipkinOpenTracing\Tracer;
@@ -56,7 +58,7 @@ private function parseConfig(): array
             ]),
             $this->getConfig('sampler', BinarySampler::createAsAlwaysSample()),
             $this->getConfig('reporters.' . $reporter, [
-                'class' => \Zipkin\Reporters\Http::class,
+                'class' => Http::class,
                 'constructor' => [
                     'options' => $this->getConfig('options', []),
                 ],

diff --git a/src/Annotation/Trace.php b/src/Annotation/Trace.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Annotation;
 
 use Attribute;

diff --git a/src/Aspect/CoroutineAspect.php b/src/Aspect/CoroutineAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

diff --git a/src/Aspect/CreateTraceContextAspect.php b/src/Aspect/CreateTraceContextAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

diff --git a/src/Aspect/DbAspect.php b/src/Aspect/DbAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\DB\DB;

diff --git a/src/Aspect/ElasticserachAspect.php b/src/Aspect/ElasticserachAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Elasticsearch\Client;

diff --git a/src/Aspect/GrpcAspect.php b/src/Aspect/GrpcAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Context\Context as CT;

diff --git a/src/Aspect/HttpClientAspect.php b/src/Aspect/HttpClientAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use GuzzleHttp\Client;

diff --git a/src/Aspect/JsonRpcAspect.php b/src/Aspect/JsonRpcAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 /**

diff --git a/src/Aspect/MethodAspect.php b/src/Aspect/MethodAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

diff --git a/src/Aspect/RedisAspect.php b/src/Aspect/RedisAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

diff --git a/src/Aspect/RpcAspect.php b/src/Aspect/RpcAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Context\Context as CT;

diff --git a/src/Aspect/TraceAnnotationAspect.php b/src/Aspect/TraceAnnotationAspect.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer;
 
 use GuzzleHttp\Client;

diff --git a/src/Contract/NamedFactoryInterface.php b/src/Contract/NamedFactoryInterface.php
@@ -9,12 +9,15 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Contract;
 
+use OpenTracing\Tracer;
+
 interface NamedFactoryInterface
 {
     /**
      * Create the object from factory.
      */
-    public function make(string $name): \OpenTracing\Tracer;
+    public function make(string $name): Tracer;
 }
diff --git a/src/Exception/ConnectionClosedException.php b/src/Exception/ConnectionClosedException.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Exception;
 
 use RuntimeException;

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException

diff --git a/src/Exception/TimeoutException.php b/src/Exception/TimeoutException.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Exception;
 
 use RuntimeException;

diff --git a/src/Listener/DbQueryExecutedListener.php b/src/Listener/DbQueryExecutedListener.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Listener;
 
 use Hyperf\Collection\Arr;

diff --git a/src/Listener/RequestTraceListener.php b/src/Listener/RequestTraceListener.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Listener;
 
 use Hyperf\Coroutine\Coroutine;

diff --git a/src/Middleware/TraceMiddleware.php b/src/Middleware/TraceMiddleware.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer\Middleware;
 
 use Hyperf\Coroutine\Coroutine;
@@ -48,7 +49,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         defer(function () use ($tracer) {
             try {
                 $tracer->flush();
-            } catch (\Throwable) {
+            } catch (Throwable) {
             }
         });
         try {

diff --git a/src/SpanStarter.php b/src/SpanStarter.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer;
 
 use Hyperf\Context\ApplicationContext;

diff --git a/src/SpanTagManager.php b/src/SpanTagManager.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer;
 
 class SpanTagManager

diff --git a/src/SpanTagManagerFactory.php b/src/SpanTagManagerFactory.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Tracer;
 
 use Hyperf\Contract\ConfigInterface;