POC for laravel/framework#31778 cr

Pantea Marius-ciclistu · Pantea Marius-ciclistu · commit 6b5cdf065566 · 2025-11-04T12:45:35.000+02:00
diff --git a/src/Models/BaseModel.php b/src/Models/BaseModel.php
@@ -689,7 +689,7 @@ public function save(array $options = []): bool
                 - updating event can do changes so, $this->getDirtyForUpdate() and $this->syncChanges() will call
                     $this->getDirty(),
                 - updated/saved events can do changes so, $this->syncOriginal() will call $this->getAttributes() */
-                if (!$this->getEventDispatcher()->hasListeners($this::class . '.updating')) {
+                if (!$this->getEventDispatcher()->hasListeners('eloquent.updating: ' . $this::class)) {
                     $this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = $dirty;
                     unset($dirty);
                 }
@@ -737,7 +737,7 @@ protected function finishSave(array $options): void
     {
         if (
             isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)
-            && $this->getEventDispatcher()->hasListeners($this::class . '.saved')
+            && $this->getEventDispatcher()->hasListeners('eloquent.saved: ' . $this::class)
         ) {
             $this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;
         }
@@ -783,7 +783,7 @@ protected function performUpdate(Builder $query): bool
 
             if (
                 isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)
-                && $this->getEventDispatcher()->hasListeners($this::class . '.updated')
+                && $this->getEventDispatcher()->hasListeners('eloquent.updated: ' . $this::class)
             ) {
                 $this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;
             }
diff --git a/src/Models/ExcessiveSetOptimizerOnSaveTrait.php b/src/Models/ExcessiveSetOptimizerOnSaveTrait.php
@@ -154,7 +154,7 @@ public function save(array $options = []): bool
                 - updating event can do changes so, $this->getDirtyForUpdate() and $this->syncChanges() will call
                     $this->getDirty(),
                 - updated/saved events can do changes so, $this->syncOriginal() will call $this->getAttributes() */
-                if (!$this->getEventDispatcher()->hasListeners($this::class . '.updating')) {
+                if (!$this->getEventDispatcher()->hasListeners('eloquent.updating: ' . $this::class)) {
                     $this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = $dirty;
                     unset($dirty);
                 }
@@ -202,7 +202,7 @@ protected function finishSave(array $options): void
     {
         if (
             isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)
-            && $this->getEventDispatcher()->hasListeners($this::class . '.saved')
+            && $this->getEventDispatcher()->hasListeners('eloquent.saved: ' . $this::class)
         ) {
             $this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;
         }
@@ -248,7 +248,7 @@ protected function performUpdate(Builder $query): bool
 
             if (
                 isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)
-                && $this->getEventDispatcher()->hasListeners($this::class . '.updated')
+                && $this->getEventDispatcher()->hasListeners('eloquent.updated: ' . $this::class)
             ) {
                 $this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;
             }

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ public function save(array $options = []): bool`
`689`	`689`	`- updating event can do changes so, $this->getDirtyForUpdate() and $this->syncChanges() will call`
`690`	`690`	`$this->getDirty(),`
`691`	`691`	`- updated/saved events can do changes so, $this->syncOriginal() will call $this->getAttributes() */`
`692`		`- if (!$this->getEventDispatcher()->hasListeners($this::class . '.updating')) {`
	`692`	`+ if (!$this->getEventDispatcher()->hasListeners('eloquent.updating: ' . $this::class)) {`
`693`	`693`	`$this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = $dirty;`
`694`	`694`	`unset($dirty);`
`695`	`695`	`}`
`@@ -737,7 +737,7 @@ protected function finishSave(array $options): void`
`737`	`737`	`{`
`738`	`738`	`if (`
`739`	`739`	`isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)`
`740`		`- && $this->getEventDispatcher()->hasListeners($this::class . '.saved')`
	`740`	`+ && $this->getEventDispatcher()->hasListeners('eloquent.saved: ' . $this::class)`
`741`	`741`	`) {`
`742`	`742`	`$this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;`
`743`	`743`	`}`
`@@ -783,7 +783,7 @@ protected function performUpdate(Builder $query): bool`
`783`	`783`
`784`	`784`	`if (`
`785`	`785`	`isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)`
`786`		`- && $this->getEventDispatcher()->hasListeners($this::class . '.updated')`
	`786`	`+ && $this->getEventDispatcher()->hasListeners('eloquent.updated: ' . $this::class)`
`787`	`787`	`) {`
`788`	`788`	`$this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;`
`789`	`789`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function save(array $options = []): bool`
`154`	`154`	`- updating event can do changes so, $this->getDirtyForUpdate() and $this->syncChanges() will call`
`155`	`155`	`$this->getDirty(),`
`156`	`156`	`- updated/saved events can do changes so, $this->syncOriginal() will call $this->getAttributes() */`
`157`		`- if (!$this->getEventDispatcher()->hasListeners($this::class . '.updating')) {`
	`157`	`+ if (!$this->getEventDispatcher()->hasListeners('eloquent.updating: ' . $this::class)) {`
`158`	`158`	`$this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = $dirty;`
`159`	`159`	`unset($dirty);`
`160`	`160`	`}`
`@@ -202,7 +202,7 @@ protected function finishSave(array $options): void`
`202`	`202`	`{`
`203`	`203`	`if (`
`204`	`204`	`isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)`
`205`		`- && $this->getEventDispatcher()->hasListeners($this::class . '.saved')`
	`205`	`+ && $this->getEventDispatcher()->hasListeners('eloquent.saved: ' . $this::class)`
`206`	`206`	`) {`
`207`	`207`	`$this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;`
`208`	`208`	`}`
`@@ -248,7 +248,7 @@ protected function performUpdate(Builder $query): bool`
`248`	`248`
`249`	`249`	`if (`
`250`	`250`	`isset($this->tmpDirtyIfAttributesAreSyncedFromCashedCasts)`
`251`		`- && $this->getEventDispatcher()->hasListeners($this::class . '.updated')`
	`251`	`+ && $this->getEventDispatcher()->hasListeners('eloquent.updated: ' . $this::class)`
`252`	`252`	`) {`
`253`	`253`	`$this->tmpDirtyIfAttributesAreSyncedFromCashedCasts = null;`
`254`	`254`	`}`