::get() now take a flag as second parameter to force empty instance when no result (instead of null)

Author: ByScripts

src/StaticEntity.php

@@ -30,13 +30,14 @@ abstract class StaticEntity implements StaticEntityInterface
     /**
      * Get a static entity instance
      *
-     * @param mixed $identifier
+     * @param mixed   $id
+     * @param boolean $forceInstance Whether returns an empty instance when no result
      *
      * @return mixed
      */
-    static public function get($identifier)
+    static public function get($id, $forceInstance = false)
     {
-        return self::getManager()->get($identifier);
+        return self::getManager()->get($id, $forceInstance);
     }
 
     /**

src/StaticEntityManager.php

@@ -50,16 +50,18 @@ public function __construct($staticEntityClass)
     }
 
     /**
-     * @param mixed $id
+     * @param mixed   $id
+     * @param boolean $forceInstance Whether returns an empty instance when no result
      *
      * @return StaticEntity|null
      */
-    public function get($id)
+    public function get($id, $forceInstance = false)
     {
         if (array_key_exists($id, $this->instances)) {
-            return $this->instances[$id];
+            return null === $this->instances[$id] ? $this->reflection->newInstance() : $this->instances[$id];
         } elseif (!$data = $this->getData($id)) {
-            return $this->instances[$id] = null;
+            $this->instances[$id] = null;
+            return $forceInstance ? $this->reflection->newInstance() : null;
         }
 
         $this->instances[$id] = $this->reflection->newInstance();

tests/StaticEntityBuilderTest.php

@@ -37,6 +37,15 @@ public function testNotFound()
         $this->assertNull($civility);
     }
 
+    public function testNotFoundForceInstance()
+    {
+        $builder = new StaticEntityManager('\Byscripts\StaticEntity\Tests\Fixtures\Civility');
+        $civility = $builder->get('not-exists', true);
+
+        $this->assertInstanceOf('\Byscripts\StaticEntity\Tests\Fixtures\Civility', $civility);
+        $this->assertNull($civility->getId());
+    }
+
     public function testSameInstances()
     {
         $builder = new StaticEntityManager('\Byscripts\StaticEntity\Tests\Fixtures\Civility');

tests/StaticEntityTest.php

@@ -33,6 +33,14 @@ public function testNotFound()
         $this->assertNull($civility);
     }
 
+    public function testNotFoundForceInstance()
+    {
+        $civility = Civility::get('not-exists', true);
+
+        $this->assertInstanceOf('\Byscripts\StaticEntity\Tests\Fixtures\Civility', $civility);
+        $this->assertNull($civility->getId());
+    }
+
     public function testSameInstances()
     {
         $civility1 = Civility::get('mr');