[5.5] Changing events property to avoid any conflicts with relations

Related to: #17960
laravel · Feb 16, 2017 · b3d3243 · b3d3243
1 parent c16061d
commit b3d3243
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php b/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php
@@ -13,7 +13,7 @@ trait HasEvents
      *
      * @var array
      */
-    protected $events = [];
+    protected $observableEvents = [];
 
     /**
      * User exposed observable events.
@@ -152,11 +152,11 @@ protected function fireModelEvent($event, $halt = true)
      */
     protected function fireCustomModelEvent($event, $method)
     {
-        if (! isset($this->events[$event])) {
+        if (! isset($this->observableEvents[$event])) {
             return;
         }
 
-        $result = static::$dispatcher->$method(new $this->events[$event]($this));
+        $result = static::$dispatcher->$method(new $this->observableEvents[$event]($this));
 
         if (! is_null($result)) {
             return $result;

diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -1954,7 +1954,7 @@ class EloquentModelSavingEventStub
 
 class EloquentModelEventObjectStub extends \Illuminate\Database\Eloquent\Model
 {
-    protected $events = [
+    protected $observableEvents = [
         'saving' => EloquentModelSavingEventStub::class,
     ];
 }