wip

Author: brendt

composer.json

@@ -50,7 +50,7 @@
         "aws/aws-sdk-php": "^3.338.0",
         "azure-oss/storage-blob-flysystem": "^1.2",
         "brianium/paratest": "^7.14",
-        "carthage-software/mago": "1.0.0-beta.28",
+        "carthage-software/mago": "1.0.0-rc.9",
         "depotwarehouse/oauth2-twitch": "^1.3",
         "guzzlehttp/psr7": "^2.6.1",
         "league/flysystem-aws-s3-v3": "^3.25.1",

packages/container/src/GenericContainer.php

@@ -635,6 +635,30 @@ public function __clone(): void
         $this->chain = $this->chain?->clone();
     }
 
+    public function deepClone(): self
+    {
+        $clonedSingletons = new ArrayIterator();
+
+        foreach ($this->singletons as $index => $singleton) {
+            $clonedSingletons[$index] = is_object($singleton) ? clone $singleton : $singleton;
+        }
+
+        $clonedDefinitions = new ArrayIterator();
+
+        foreach ($this->definitions as $index => $definition) {
+            $clonedDefinitions[$index] = is_object($definition) ? clone $definition : $definition;
+        }
+
+        $clone = clone ($this, [
+            'singletons' => $clonedSingletons,
+            'definitions' => $clonedDefinitions,
+        ]);
+
+        $clone->singleton(Container::class, $clone);
+
+        return $clone;
+    }
+
     private function resolveTaggedName(string $className, null|string|UnitEnum $tag): string
     {
         if ($tag instanceof UnitEnum) {

packages/container/tests/ContainerTest.php

@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use Tempest\Container\Container;
 use Tempest\Container\Exceptions\CircularDependencyEncountered;
 use Tempest\Container\Exceptions\DecoratorDidNotImplementInterface;
 use Tempest\Container\Exceptions\DependencyCouldNotBeAutowired;
@@ -39,6 +40,7 @@
 use Tempest\Container\Tests\Fixtures\DecoratorInvalid;
 use Tempest\Container\Tests\Fixtures\DecoratorSecondClass;
 use Tempest\Container\Tests\Fixtures\DecoratorWithoutConstructor;
+use Tempest\Container\Tests\Fixtures\DependencyForDeepClone;
 use Tempest\Container\Tests\Fixtures\DependencyWithBuiltinDependencies;
 use Tempest\Container\Tests\Fixtures\DependencyWithTaggedDependency;
 use Tempest\Container\Tests\Fixtures\EnumTag;
@@ -689,4 +691,17 @@ public function test_returns_decorator_without_constructor(): void
 
         $this->assertInstanceOf(DecoratorWithoutConstructor::class, $instance);
     }
+
+    public function test_deep_clone_container(): void
+    {
+        $dependencyA = new DependencyForDeepClone();
+        $container = new GenericContainer();
+        $container->singleton(DependencyForDeepClone::class, $dependencyA);
+        $container->singleton(Container::class, $container);
+
+        $clone = $container->deepClone();
+
+        $this->assertNotSame($clone->get(Container::class), $container->get(Container::class));
+        $this->assertNotSame($clone->get(DependencyForDeepClone::class), $container->get(DependencyForDeepClone::class));
+    }
 }

packages/container/tests/Fixtures/DependencyForDeepClone.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Tempest\Container\Tests\Fixtures;
+
+final class DependencyForDeepClone
+{
+
+}