Merge pull request #1221: optimize container

Author: roxblnfk

psalm-baseline.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="6.9.6@61488aa2849793acfb72411829d114b4aa670941">
+  <file src="src/Core/src/Internal/Actor.php">
+    <InvalidReturnStatement>
+      <code><![CDATA[$actor->registerInstance($ctx, $instance)]]></code>
+    </InvalidReturnStatement>
+    <NoValue>
+      <code><![CDATA[$injector]]></code>
+      <code><![CDATA[$singleton]]></code>
+    </NoValue>
+    <TooManyArguments>
+      <code><![CDATA[make]]></code>
+    </TooManyArguments>
+    <UnnecessaryVarAnnotation>
+      <code><![CDATA[Attribute\Scope]]></code>
+    </UnnecessaryVarAnnotation>
+  </file>
+  <file src="src/Filters/src/Attribute/Input/AbstractInput.php">
+    <UndefinedThisPropertyFetch>
+      <code><![CDATA[$this->key]]></code>
+    </UndefinedThisPropertyFetch>
+  </file>
+  <file src="src/Queue/src/RetryPolicy.php">
+    <InvalidOperand>
+      <code><![CDATA[$this->delay * $this->multiplier ** $attempts]]></code>
+      <code><![CDATA[$this->multiplier ** $attempts]]></code>
+    </InvalidOperand>
+  </file>
+</files>

psalm.xml

@@ -13,6 +13,7 @@
     addParamDefaultToDocblockType="true"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src/*/src" />
@@ -22,6 +23,7 @@
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <MissingOverrideAttribute errorLevel="suppress" />
         <UnusedClosureParam errorLevel="suppress" />
         <UnusedPsalmSuppress errorLevel="suppress" />
         <UnsupportedPropertyReferenceUsage errorLevel="suppress" />

src/Core/src/Config.php

@@ -9,6 +9,7 @@
 use Spiral\Core\Internal\Binder;
 use Spiral\Core\Internal\Container;
 use Spiral\Core\Internal\Factory;
+use Spiral\Core\Internal\Actor;
 use Spiral\Core\Internal\Invoker;
 use Spiral\Core\Internal\Resolver;
 use Spiral\Core\Internal\Scope;
@@ -22,7 +23,7 @@
  *
  * @implements IteratorAggregate<
  *     non-empty-string,
- *     class-string<State>|class-string<ResolverInterface>|class-string<FactoryInterface>|class-string<ContainerInterface>|class-string<BinderInterface>|class-string<InvokerInterface>|class-string<Tracer>|class-string<Scope>
+ *     class-string<State>|class-string<ResolverInterface>|class-string<FactoryInterface>|class-string<ContainerInterface>|class-string<BinderInterface>|class-string<InvokerInterface>|class-string<Actor>|class-string<Scope>
  * >
  */
 class Config implements \IteratorAggregate
@@ -32,6 +33,7 @@ class Config implements \IteratorAggregate
 
     public readonly Internal\Config\StateStorage $scopedBindings;
     private bool $rootLocked = true;
+    public readonly string $actor;
 
     /**
      * @param class-string<State> $state
@@ -40,7 +42,6 @@ class Config implements \IteratorAggregate
      * @param class-string<ContainerInterface> $container
      * @param class-string<BinderInterface> $binder
      * @param class-string<InvokerInterface> $invoker
-     * @param class-string<Tracer> $tracer
      */
     public function __construct(
         public readonly string $state = State::class,
@@ -49,10 +50,10 @@ public function __construct(
         public readonly string $container = Container::class,
         public readonly string $binder = Binder::class,
         public readonly string $invoker = Invoker::class,
-        public readonly string $tracer = Tracer::class,
     ) {
         $this->scope = Scope::class;
         $this->scopedBindings = new Internal\Config\StateStorage();
+        $this->actor = Actor::class;
     }
 
     public function getIterator(): \Traversable
@@ -63,8 +64,8 @@ public function getIterator(): \Traversable
         yield 'container' => $this->container;
         yield 'binder' => $this->binder;
         yield 'invoker' => $this->invoker;
-        yield 'tracer' => $this->tracer;
         yield 'scope' => $this->scope;
+        yield 'actor' => $this->actor;
     }
 
     /**

src/Core/src/Config/Binding.php

@@ -7,4 +7,17 @@
 /**
  * @internal
  */
-abstract class Binding implements \Stringable {}
+abstract class Binding implements \Stringable
+{
+    /**
+     * Get the class or interface name of the object that should be returned.
+     * May return null if the return type was not detected or is not a class.
+     *
+     * @return class-string|null
+     * @internal
+     */
+    public function getReturnClass(): ?string
+    {
+        return null;
+    }
+}

src/Core/src/Config/DeprecationProxy.php

@@ -28,6 +28,7 @@ public function __construct(
 
     /**
      * @return class-string
+     * @deprecated
      */
     public function getInterface(): string
     {

src/Core/src/Config/Factory.php

@@ -4,13 +4,17 @@
 
 namespace Spiral\Core\Config;
 
+use Spiral\Core\Exception\Traits\ClosureRendererTrait;
+
 /**
  * Make a value using a closure.
  */
 final class Factory extends Binding
 {
-    use \Spiral\Core\Exception\Traits\ClosureRendererTrait;
+    use ClosureRendererTrait;
 
+    /** @var class-string|null */
+    private readonly ?string $returnClass;
     public readonly \Closure $factory;
     private readonly int $parametersCount;
     private ?string $definition;
@@ -20,7 +24,13 @@ public function __construct(
         public readonly bool $singleton = false,
     ) {
         $this->factory = $callable(...);
-        $this->parametersCount = (new \ReflectionFunction($this->factory))->getNumberOfParameters();
+        $reflection = new \ReflectionFunction($this->factory);
+        $this->parametersCount = $reflection->getNumberOfParameters();
+
+        // Detect the return type of the factory
+        $returnType = (string) $reflection->getReturnType();
+        $this->returnClass = \class_exists($returnType) ? $returnType : null;
+
         /** @psalm-suppress TypeDoesNotContainType */
         $this->definition = match (true) {
             \is_string($callable) => $callable,
@@ -48,4 +58,13 @@ public function __toString(): string
             $this->definition,
         );
     }
+
+    /**
+     * @return class-string|null
+     * @internal
+     */
+    public function getReturnClass(): ?string
+    {
+        return $this->returnClass;
+    }
 }

src/Core/src/Config/Proxy.php

@@ -29,12 +29,22 @@ public function __construct(
 
     /**
      * @return class-string
+     * @deprecated Use {@see getReturnClass()} instead.
      */
     public function getInterface(): string
     {
         return $this->interface;
     }
 
+    /**
+     * @return class-string
+     * @internal
+     */
+    public function getReturnClass(): string
+    {
+        return $this->interface;
+    }
+
     public function __toString(): string
     {
         return \sprintf('Proxy to `%s`', $this->interface);

src/Core/src/Config/Shared.php

@@ -18,4 +18,13 @@ public function __toString(): string
     {
         return 'Shared object of class ' . $this->value::class;
     }
+
+    /**
+     * @return class-string
+     * @internal
+     */
+    public function getReturnClass(): string
+    {
+        return $this->value::class;
+    }
 }

src/Core/src/Container.php

@@ -54,6 +54,7 @@ final class Container implements
     private BinderInterface|Internal\Binder $binder;
     private InvokerInterface|Internal\Invoker $invoker;
     private Internal\Scope $scope;
+    private Internal\Actor $actor;
 
     /**
      * Container constructor.
@@ -392,7 +393,7 @@ private function runIsolatedScope(Scope $config, callable $closure): mixed
         $container = new self($this->config, $config->name, $this->options);
 
         // Configure scope
-        $container->scope->setParent($this, $this->scope, $this->factory);
+        $container->scope->setParent($this, $this->scope, $this->actor);
 
         // Add specific bindings
         foreach ($config->bindings as $alias => $resolver) {

src/Core/src/Exception/Container/ArgumentException.php

@@ -5,7 +5,7 @@
 namespace Spiral\Core\Exception\Container;
 
 /**
- * Unable to resolve argument value.
+ * @deprecated
  */
 class ArgumentException extends AutowireException
 {