Merge branch 'v1.x' into v2.x

Author: jpresutti

BaseMapper.php

@@ -266,9 +266,10 @@ public function fetchAll(Query $select = null): Set
      * Save model to database.
      *
      * @param BaseModel $record
+     * @param bool $forceUpdate
      * @throws Exception
      */
-    public function save(BaseModel $record): void
+    public function save(BaseModel $record, bool $forceUpdate = false): void
     {
         $recordArray = $this->getFieldsForSave($record);
         if (count($recordArray) == 0) {
@@ -278,7 +279,7 @@ public function save(BaseModel $record): void
         $primaryKey = static::PRIMARY_KEY;
         /** @var string|int|null $recordPrimaryKey */
         $recordPrimaryKey = $record->{$primaryKey} ?? null;
-        if (!empty($recordPrimaryKey) && !empty($record->getOriginalModel())) {
+        if (!empty($recordPrimaryKey) && (!empty($record->getOriginalModel()) || $forceUpdate)) {
             $update = $this->connection->update((string)static::TABLE_NAME, $recordArray)->where(
                 $primaryKey . ' = ?',
                 $recordPrimaryKey

BaseModel.php

@@ -120,9 +120,10 @@ public function getChangeField(BaseModel $oldModel, string $field): string
     /**
      * Save the current model.
      *
+     * @param bool $forceUpdate
      * @throws NotFoundException
      */
-    public function save(): void
+    public function save(bool $forceUpdate = false): void
     {
         /** @var ?class-string<BaseMapper> $mapperName */
         $mapperName = static::MAPPER_NAME;
@@ -131,6 +132,6 @@ public function save(): void
         }
         $mapper = new $mapperName();
 
-        $mapper->save($this);
+        $mapper->save($this, $forceUpdate);
     }
 }

FeastTests/JsonTest.php

@@ -93,14 +93,14 @@ public function testMarshal(): void
         $item->secondItem = $secondItem;
 
         $item->thirdItems = new \Feast\Collection\CollectionList(
-            'string', [
+                         'string', [
             'test' => 'theTest',
             'test2' => 'theTest2'
         ], preValidated: true
         );
 
         $item->thirdSet = new \Feast\Collection\Set(
-            'string', [
+                         'string', [
             'theTest',
             'theTest2'
         ], preValidated: true
@@ -133,7 +133,7 @@ public function testUnmarshalInvalidConstructor(): void
     public function testUnmarshalSkipConstructor(): void
     {
         $item = Json::unmarshal('{"last_name":"test"}', \Mocks\BadJsonItem::class, true);
-        $this->assertEquals('test',$item->lastName);
+        $this->assertEquals('test', $item->lastName);
     }
 
     public function testUnmarshalWithObject(): void
@@ -162,8 +162,8 @@ public function testUnmarshal(): void
         $result->otherTimestamp->setTimezone('America/New_York');
         $this->assertEquals('20210415', $result->timestamp->getFormattedDate('Ymd'));
         $this->assertEquals('20210405', $result->otherTimestamp->getFormattedDate('Ymd'));
-        $this->assertInstanceOf(\Mocks\SecondItem::class,$result->secondItem);
-        $this->assertInstanceOf(stdClass::class,$result->aClass);
+        $this->assertInstanceOf(\Mocks\SecondItem::class, $result->secondItem);
+        $this->assertInstanceOf(stdClass::class, $result->aClass);
         $this->assertEquals('ItWorks', $result->aClass->test);
     }
 

Json.php

@@ -106,7 +106,7 @@ public static function marshal(object $object, ?int $propertyTypesFlag = null):
     public static function unmarshal(string $data, string|object $objectOrClass, bool $skipConstructor = false): object
     {
         if (is_string($objectOrClass)) {
-            $object = self::getObjectFromClassString( $objectOrClass, $skipConstructor,);
+            $object = self::getObjectFromClassString($objectOrClass, $skipConstructor);
         } else {
             $object = $objectOrClass;
         }

docs/models.md

@@ -97,10 +97,14 @@ $models = $mapper->findAllByFields(['name' => 'Feast', 'status' => 'active']); /
 
 #### Saving Records
 
-To save a model, simply call either the `save` method on the mapper, passing in the model as an argument or for
+To save a model, call either the `save` method on the mapper, passing in the model as an argument or for
 convenience, simply call the `save()` method on the model. FEAST will automatically perform an insert if it is a new
-model, or an update (passing only the changed fields) if it is not a new model. When the save method is called, the
-primary key is updated on the model for inserts.
+model, or an update (passing only the changed fields) if it is was retrieved from the database.
+
+You can force an update by passing in `true` to the `save` method as the only parameter on the model method, or as the
+second parameter on the mapper method.
+
+When the save method is called, the primary key is updated on the model for inserts.
 
 Example:
 
@@ -116,6 +120,21 @@ $mapper = new \Mapper\TestMapper();
 $mapper->save($model); // Model saved indirectly after previous save, updated.
 ```
 
+Force update
+
+```php
+<?php
+$model = new \Model\Test();
+$model->id = 1;
+$model->name = 'Feast';
+
+$model->save(true); // Model saves directly, inserted.
+
+$model->name = 'NotFeast';
+$mapper = new \Mapper\TestMapper();
+$mapper->save($model, true); // Model saved indirectly after previous save, updated.
+```
+
 #### Deleting Records
 
 FEAST has many methods to delete records from the database. The main methods to delete data are listed below.