Merge pull request #4 from doctrine/hotfix/cloneables-uniqueness-guar…

…antee Cloneables uniqueness guarantee
doctrine · Aug 14, 2014 · e2b3294 · e2b3294
2 parents 7547e2c + c0302f3
commit e2b3294
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Doctrine/Instantiator/Instantiator.php b/src/Doctrine/Instantiator/Instantiator.php
@@ -71,7 +71,7 @@ public function instantiate($className)
 
         // not cloneable if it implements `__clone`, as we want to avoid calling it
         if (! $reflection->hasMethod('__clone')) {
-            self::$cachedCloneables[$className] = $instance;
+            self::$cachedCloneables[$className] = clone $instance;
         }
 
         return $instance;

diff --git a/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php b/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php
@@ -139,6 +139,21 @@ public function testInstantiationFromNonExistingClass($invalidClassName)
         $this->instantiator->instantiate($invalidClassName);
     }
 
+    public function testInstancesAreNotCloned()
+    {
+        $className = 'TemporaryClass' . uniqid();
+
+        eval('namespace ' . __NAMESPACE__ . '; class ' . $className . '{}');
+
+        $instance = $this->instantiator->instantiate(__NAMESPACE__ . '\\' . $className);
+
+        $instance->foo = 'bar';
+
+        $instance2 = $this->instantiator->instantiate(__NAMESPACE__ . '\\' . $className);
+
+        $this->assertObjectNotHasAttribute('foo', $instance2);
+    }
+
     /**
      * Provides a list of instantiable classes (existing)
      *