Hotfixes from 3.15.8 (#1226)

(cherry picked from commit bc58ee7)

Author: roxblnfk

CHANGELOG.md

@@ -1,5 +1,34 @@
 # CHANGELOG
 
+## 3.15.8 - 2025-04-22
+
+- **Bug Fixes**
+  - [spiral/telemetry] Fixed `SpanInterface` singleton rebinding
+  - [spiral/prototype] Fixed working of Prototype in container scopes
+
+## 3.15.7 - 2025-03-31
+
+- **Bug Fixes**
+  - [spiral/core] Fixed proxy class generator failure when the proxied interface contains static return type
+  - [spiral/core] Added resolving trace to Resolver exceptions
+
+## 3.15.6 - 2025-03-29
+
+- **Bug Fixes**
+  - [spiral/core] Invoker::invoke() does not try to instantiate class to call a static function.
+  - [spiral/core] Reworked resolving traces in container exceptions
+
+## 3.15.5 - 2025-03-12
+
+- **Bug Fixes**
+  - [spiral/router] Fix issue when group prefix is not applied to routes
+
+## 3.15.4 - 2025-02-17
+
+- **Bug Fixes**
+  - [spiral/telemetry] Removed ID from a Queue consumed job span
+    It allows proper grouping of traces by job name
+
 ## 3.15.3 - 2025-02-11
 
 - **Bug Fixes**

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.9.6@61488aa2849793acfb72411829d114b4aa670941">
+<files psalm-version="6.10.1@f9fd6bc117e9ce1e854c2ed6777e7135aaa4966b">
   <file src="src/Core/src/Internal/Actor.php">
     <InvalidReturnStatement>
       <code><![CDATA[$actor->registerInstance($ctx, $instance)]]></code>

src/Prototype/src/ClassNode/Type.php

@@ -4,17 +4,26 @@
 
 namespace Spiral\Prototype\ClassNode;
 
+use phpDocumentor\Reflection\Types\ClassString;
 use Spiral\Prototype\Utils;
 
 final class Type
 {
+    /** @var non-empty-string|null */
     public ?string $alias = null;
 
+    /**
+     * @param non-empty-string $shortName
+     * @param non-empty-string|null $fullName
+     */
     private function __construct(
         public readonly string $shortName,
         public readonly ?string $fullName = null,
     ) {}
 
+    /**
+     * @param non-empty-string $name
+     */
     public static function create(string $name): Type
     {
         $fullName = null;
@@ -26,11 +35,17 @@ public static function create(string $name): Type
         return new self($name, $fullName);
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function getAliasOrShortName(): string
     {
         return $this->alias ?: $this->shortName;
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function getSlashedShortName(bool $builtIn): string
     {
         $type = $this->shortName;
@@ -41,6 +56,9 @@ public function getSlashedShortName(bool $builtIn): string
         return $type;
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function name(): string
     {
         return $this->fullName ?? $this->shortName;

src/Prototype/src/Dependency.php

@@ -14,6 +14,10 @@ final class Dependency
 
     private function __construct() {}
 
+    /**
+     * @param non-empty-string $name
+     * @param non-empty-string $type
+     */
     public static function create(string $name, string $type): Dependency
     {
         $dependency = new self();

src/Prototype/src/PrototypeRegistry.php

@@ -6,6 +6,7 @@
 
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Spiral\Core\Attribute\Proxy;
 use Spiral\Core\Attribute\Singleton;
 
 /**
@@ -14,23 +15,27 @@
 #[Singleton]
 final class PrototypeRegistry
 {
-    /** @var Dependency[] */
+    /** @var array<non-empty-string, Dependency> */
     private array $dependencies = [];
 
     public function __construct(
+        #[Proxy]
         private readonly ContainerInterface $container,
     ) {}
 
     /**
      * Assign class to prototype property.
+     *
+     * @param non-empty-string $property
+     * @param non-empty-string $type
      */
     public function bindProperty(string $property, string $type): void
     {
         $this->dependencies[$property] = Dependency::create($property, $type);
     }
 
     /**
-     * @return Dependency[]
+     * @return array<non-empty-string, Dependency>
      */
     public function getPropertyBindings(): array
     {
@@ -39,6 +44,8 @@ public function getPropertyBindings(): array
 
     /**
      * Resolves the name of prototype dependency into target class name.
+     *
+     * @param non-empty-string $name
      */
     public function resolveProperty(string $name): Dependency|ContainerExceptionInterface|null
     {

src/Telemetry/src/AbstractTracer.php

@@ -70,9 +70,10 @@ final protected function runScope(SpanInterface $span, callable $callback): mixe
                 )
                 : $invoker->invoke($callback);
         } finally {
+            /** @psalm-suppress TooManyArguments */
             $prevSpan === null
                 ? $binder->removeBinding(SpanInterface::class)
-                : $binder->bindSingleton(SpanInterface::class, $prevSpan);
+                : $binder->bindSingleton(SpanInterface::class, $prevSpan, true);
         }
     }
 }