Fix bug when calling get() twice with non existing key

ByScripts · ByScripts · commit 947e46705cd8 · 2016-02-02T12:51:20.000+01:00
diff --git a/src/StaticEntityManager.php b/src/StaticEntityManager.php
@@ -58,9 +58,8 @@ public function __construct($staticEntityClass)
     public function get($id, $forceInstance = false)
     {
         if (array_key_exists($id, $this->instances)) {
-            return null === $this->instances[$id] ? $this->reflection->newInstance() : $this->instances[$id];
+            return $this->instances[$id];
         } elseif (!$data = $this->getData($id)) {
-            $this->instances[$id] = null;
             return $forceInstance ? $this->reflection->newInstance() : null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,8 @@ public function __construct($staticEntityClass)`
`58`	`58`	`public function get($id, $forceInstance = false)`
`59`	`59`	`{`
`60`	`60`	`if (array_key_exists($id, $this->instances)) {`
`61`		`- return null === $this->instances[$id] ? $this->reflection->newInstance() : $this->instances[$id];`
	`61`	`+ return $this->instances[$id];`
`62`	`62`	`} elseif (!$data = $this->getData($id)) {`
`63`		`- $this->instances[$id] = null;`
`64`	`63`	`return $forceInstance ? $this->reflection->newInstance() : null;`
`65`	`64`	`}`
`66`	`65`