Remove Model::newInstance

Author: mvorisek

docs/persistence.rst

@@ -482,7 +482,7 @@ Start by creating a beforeSave handler for Order::
         if ($this->isDirty('ref')) {
 
             if (
-                $this->newInstance()
+                (new static())
                     ->addCondition('client_id', $this->get('client_id'))  // same client
                     ->addCondition($this->id_field, '!=', $this->getId()) // has another order
                     ->tryLoadBy('ref', $this->get('ref'))                 // with same ref
@@ -537,7 +537,7 @@ The other, more appropriate option is to re-use a vanilla Order record::
     function archive() {
         $this->save(); // just to be sure, no dirty stuff is left over
 
-        $archive = $this->newInstance();
+        $archive = (new static());
         $archive->load($this->getId());
         $archive->set('is_archived', true);
 
@@ -546,23 +546,6 @@ The other, more appropriate option is to re-use a vanilla Order record::
         return $archive;
     }
 
-This method may still not work if you extend and use "ActiveOrder" as your
-model. In this case you should pass the class to newInstance()::
-
-    $archive = $this->newInstance('Order');
-    // or
-    $archive = $this->newInstance(new Order());
-    // or with passing some default properties:
-    $archive = $this->newInstance([new Order(), 'audit'=>true]);
-
-
-In this case newInstance() would just associate passed class with the
-persistence pretty much identical to::
-
-    $archive = new Order($this->persistence);
-
-The use of newInstance() however requires you to load the model which is
-an extra database query.
 
 Using Model casting and saveAs
 ------------------------------

src/Model.php

@@ -1313,10 +1313,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 +1330,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([

tests/ReferenceTest.php

@@ -98,11 +98,11 @@ public function testRefName3()
         $db = new Persistence\Array_();
         $order = new Model($db, ['table' => 'order']);
         $order->addRef('archive', ['model' => function ($m) {
-            return $m->newInstance(null, ['table' => $m->table . '_archive']);
+            return new $m(null, ['table' => $m->table . '_archive']);
         }]);
         $this->expectException(Exception::class);
         $order->addRef('archive', ['model' => function ($m) {
-            return $m->newInstance(null, ['table' => $m->table . '_archive']);
+            return new $m(null, ['table' => $m->table . '_archive']);
         }]);
     }
 
@@ -112,7 +112,7 @@ public function testCustomRef()
 
         $m = new Model($p, ['table' => 'user']);
         $m->addRef('archive', ['model' => function ($m) {
-            return $m->newInstance(null, ['table' => $m->table . '_archive']);
+            return new $m(null, ['table' => $m->table . '_archive']);
         }]);
 
         $this->assertSame('user_archive', $m->ref('archive')->table);