Core: fix scope discarding when resolving a service from Autowire object

src/Core/src/Container/Autowire.php

@@ -24,8 +24,8 @@ final class Autowire
      * @param non-empty-string|class-string<TObject> $alias
      */
     public function __construct(
-        private readonly string $alias,
-        private readonly array $parameters = []
+        public readonly string $alias,
+        public readonly array $parameters = []
     ) {
     }
 

src/Core/src/Internal/Factory.php

@@ -239,9 +239,13 @@ private function resolveAutowire(
         Stringable|string|null $context,
         array $arguments,
     ): mixed {
-        $instance = $binding->autowire->resolve($this, $arguments);
+        $target = $binding->autowire->alias;
+        $ctx = new Ctx(alias: $alias, class: $target, context: $context, singleton: $binding->singleton);
+
+        $instance = $alias === $target
+            ? $this->autowire($ctx, \array_merge($binding->autowire->parameters, $arguments))
+            : $binding->autowire->resolve($this, $arguments);
 
-        $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
         return $this->validateNewInstance($instance, $ctx, $arguments);
     }
 

src/Core/tests/Scope/SideEffectTest.php

@@ -4,13 +4,15 @@
 
 namespace Spiral\Tests\Core\Scope;
 
+use Spiral\Core\Config\Alias;
 use Spiral\Core\Container;
 use Spiral\Core\Scope;
 use Spiral\Tests\Core\Scope\Stub\Factory;
 use Spiral\Tests\Core\Scope\Stub\FileLogger;
 use Spiral\Tests\Core\Scope\Stub\KVLogger;
 use Spiral\Tests\Core\Scope\Stub\LoggerCarrier;
 use Spiral\Tests\Core\Scope\Stub\LoggerInterface;
+use Spiral\Tests\Core\Scope\Stub\ScopeIndicatorLogger;
 
 final class SideEffectTest extends BaseTestCase
 {
@@ -49,4 +51,34 @@ public function testFactory(): void
             );
         });
     }
+
+    public function testAutowireWithScope(): void
+    {
+        $root = new Container();
+        $root
+            ->getBinder('test')
+            ->bind(ScopeIndicatorLogger::class, new Container\Autowire(ScopeIndicatorLogger::class));
+
+        $logger = $root->runScope(new Scope('test'), static function (?ScopeIndicatorLogger $logger) {
+            return $logger;
+        });
+
+        $this->assertNotNull($logger);
+        $this->assertSame('test', $logger->getName());
+    }
+
+    public function testAliasWithScope(): void
+    {
+        $root = new Container();
+        $root
+            ->getBinder('test')
+            ->bind(ScopeIndicatorLogger::class, new Alias(ScopeIndicatorLogger::class));
+
+        $logger = $root->runScope(new Scope('test'), static function (?ScopeIndicatorLogger $logger) {
+            return $logger;
+        });
+
+        $this->assertNotNull($logger);
+        $this->assertSame('test', $logger->getName());
+    }
 }

src/Core/tests/Scope/Stub/ScopeIndicatorLogger.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\Tests\Core\Scope\Stub;
+
+use Psr\Container\ContainerInterface;
+use Spiral\Core\Internal\Introspector;
+
+/**
+ * Returns the scope name where it was created
+ */
+final class ScopeIndicatorLogger implements LoggerInterface
+{
+    private ?string $scope;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->scope = Introspector::scopeName($container);
+    }
+
+    public function getName(): string
+    {
+        return $this->scope ?? '-NULL-';
+    }
+}