Merge pull request #13 from Billtec/fix/event-issue

n0nag0n · web-flow · commit d099872de42f · 2024-05-19T14:22:40.000-06:00
fix: beforeUpdate &amp; beforeSave is not working
diff --git a/src/ActiveRecord.php b/src/ActiveRecord.php
@@ -473,11 +473,13 @@ public function update(): ActiveRecord
         if (count($this->dirty) === 0) {
             return $this->resetQueryData();
         }
+
+        $this->processEvent([ 'beforeUpdate', 'beforeSave' ], [ $this ]);
+
         foreach ($this->dirty as $field => $value) {
             $this->addCondition($field, '=', $value, ',', 'set');
         }
 
-        $this->processEvent([ 'beforeUpdate', 'beforeSave' ], [ $this ]);
         $this->execute($this->eq($this->primaryKey, $this->{$this->primaryKey})->buildSql(['update', 'set', 'where']), $this->params);
 
         $this->processEvent([ 'afterUpdate', 'afterSave' ], [ $this ]);

Original file line number	Diff line number	Diff line change
`@@ -473,11 +473,13 @@ public function update(): ActiveRecord`
`473`	`473`	`if (count($this->dirty) === 0) {`
`474`	`474`	`return $this->resetQueryData();`
`475`	`475`	`}`
	`476`	`+`
	`477`	`+ $this->processEvent([ 'beforeUpdate', 'beforeSave' ], [ $this ]);`
	`478`	`+`
`476`	`479`	`foreach ($this->dirty as $field => $value) {`
`477`	`480`	`$this->addCondition($field, '=', $value, ',', 'set');`
`478`	`481`	`}`
`479`	`482`
`480`		`- $this->processEvent([ 'beforeUpdate', 'beforeSave' ], [ $this ]);`
`481`	`483`	`$this->execute($this->eq($this->primaryKey, $this->{$this->primaryKey})->buildSql(['update', 'set', 'where']), $this->params);`
`482`	`484`
`483`	`485`	`$this->processEvent([ 'afterUpdate', 'afterSave' ], [ $this ]);`