Remove Model::newInstance

Author: mvorisek

src/Model.php

@@ -338,6 +338,10 @@ public function __construct(Persistence $persistence = null, array $defaults = [
         $this->setDefaults($defaults);
 
         if ($persistence !== null) {
+            $this->persistence = $persistence;
+        }
+
+        if ($this->persistence !== null) {
             $persistence->add($this);
         }
     }
@@ -1313,10 +1317,12 @@ public function saveAndUnload(array $data = [])
     /**
      * This will cast Model into another class without
      * loosing state of your active record.
+     *
+     * @param class-string<self> $class
      */
     public function asModel(string $class, array $options = []): self
     {
-        $m = $this->newInstance($class, $options);
+        $m = new $class(null, $options);
 
         foreach ($this->data as $field => $value) {
             $m->set($field, $value);
@@ -1328,23 +1334,6 @@ public function asModel(string $class, array $options = []): self
         return $m;
     }
 
-    /**
-     * Create new model from the same base class
-     * as $this.
-     *
-     * @return static
-     */
-    public function newInstance(string $class = null, array $options = [])
-    {
-        $model = (self::class)::fromSeed([$class ?? static::class], $options);
-
-        if ($this->persistence) {
-            return $this->persistence->add($model); // @phpstan-ignore-line
-        }
-
-        return $model;
-    }
-
     /**
      * Create new model from the same base class
      * as $this. If you omit $id then when saving

tests/RandomTest.php

@@ -480,20 +480,6 @@ public function testExport()
         ], $m2->export(['code', 'name'], 'code'));
     }
 
-    public function testNewInstance()
-    {
-        // model without persistence
-        $m = new Model(null, ['table' => 'order']);
-        $a = $m->newInstance();
-        $this->assertFalse(isset($a->persistence));
-
-        // model with persistence
-        $db = new Persistence\Array_();
-        $m = new Model($db, ['table' => 'order']);
-        $a = $m->newInstance();
-        $this->assertTrue(isset($a->persistence));
-    }
-
     public function testDuplicateSaveNew()
     {
         $this->setDb([