Optimized phpdoc for @deprecated

friendsofhyperf · Oct 24, 2024 · 25ca9dd · 25ca9dd
1 parent 6f007c3
commit 25ca9dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/Tracing/Aspect/GuzzleHttpClientAspect.php b/src/Tracing/Aspect/GuzzleHttpClientAspect.php
@@ -55,12 +55,10 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         $instance = $proceedingJoinPoint->getInstance();
         $arguments = $proceedingJoinPoint->arguments['keys'];
         $options = $arguments['options'] ?? [];
-        $guzzleConfig = (function () {
-            if (method_exists($this, 'getConfig')) { // @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
-                return $this->getConfig();
-            }
-
-            return $this->config ?? [];
+        $guzzleConfig = (fn () => match (true) {
+            method_exists($this, 'getConfig') => $this->getConfig(), // @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
+            property_exists($this, 'config') => $this->config,
+            default => [],
         })->call($instance);
 
         if (

diff --git a/src/Tracing/Aspect/RpcAspect.php b/src/Tracing/Aspect/RpcAspect.php
@@ -95,7 +95,7 @@ private function handleGenerateRpcPath(ProceedingJoinPoint $proceedingJoinPoint)
             'rpc.service' => $service,
         ];
 
-        Context::set(static::DATA, $data); // will be removed in v3.2
+        Context::set(static::DATA, $data); // @deprecated since v3.1, will be removed in v3.2
         Context::set(static::SPAN, $span->setData($data));
 
         if ($this->container->has(Rpc\Context::class)) {

diff --git a/src/Tracing/TagManager.php b/src/Tracing/TagManager.php
@@ -14,7 +14,7 @@
 use Hyperf\Contract\ConfigInterface;
 
 /**
- * @deprecated since v3.1, will remove in v3.2
+ * @deprecated since v3.1, will be removed in v3.2
  */
 class TagManager
 {