From 52e55bd5036f0f24f33e9ef6ec232874d516941b Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 1 Jul 2015 16:47:07 +0930
Subject: [PATCH] Cleanup, fix static date property error

---
 framework/core/src/Core/Models/Discussion.php |  2 +-
 .../core/src/Core/Models/DiscussionState.php  | 23 ++++++++++++++-----
 framework/core/src/Core/Models/Model.php      | 10 ++++----
 framework/core/src/Extend/Model.php           |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/framework/core/src/Core/Models/Discussion.php b/framework/core/src/Core/Models/Discussion.php
index 385a82edf..6dc133146 100755
--- a/framework/core/src/Core/Models/Discussion.php
+++ b/framework/core/src/Core/Models/Discussion.php
@@ -45,7 +45,7 @@ class Discussion extends Model
      *
      * @var array
      */
-    protected static $dates = ['start_time', 'last_time'];
+    protected static $dateAttributes = ['start_time', 'last_time'];
 
     /**
      * The user for which the state relationship should be loaded.
diff --git a/framework/core/src/Core/Models/DiscussionState.php b/framework/core/src/Core/Models/DiscussionState.php
index 971396649..52d6c0045 100644
--- a/framework/core/src/Core/Models/DiscussionState.php
+++ b/framework/core/src/Core/Models/DiscussionState.php
@@ -1,9 +1,20 @@
 <?php namespace Flarum\Core\Models;
 
 use Flarum\Core\Events\DiscussionWasRead;
+use Flarum\Core\Support\EventGenerator;
+use Illuminate\Database\Eloquent\Builder;
 
+/**
+ * Models a discussion-user state record in the database.
+ *
+ * Stores information about how much of a discussion a user has read. Can also
+ * be used to store other information, if the appropriate columns are added to
+ * the database, like a user's subscription status for a discussion.
+ */
 class DiscussionState extends Model
 {
+    use EventGenerator;
+
     /**
      * The table associated with the model.
      *
@@ -16,13 +27,13 @@ class DiscussionState extends Model
      *
      * @var array
      */
-    protected $dates = ['read_time'];
+    protected static $dateAttributes = ['read_time'];
 
     /**
-     * Mark the discussion as read to a certain point by updating that state's
-     * data.
+     * Mark the discussion as being read up to a certain point. Raises the
+     * DiscussionWasRead event.
      *
-     * @param  int  $number
+     * @param int $number
      * @return $this
      */
     public function read($number)
@@ -60,10 +71,10 @@ class DiscussionState extends Model
     /**
      * Set the keys for a save update query.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    protected function setKeysForSaveQuery(\Illuminate\Database\Eloquent\Builder $query)
+    protected function setKeysForSaveQuery(Builder $query)
     {
         $query->where('discussion_id', $this->discussion_id)
               ->where('user_id', $this->user_id);
diff --git a/framework/core/src/Core/Models/Model.php b/framework/core/src/Core/Models/Model.php
index e3964d162..6350ca969 100755
--- a/framework/core/src/Core/Models/Model.php
+++ b/framework/core/src/Core/Models/Model.php
@@ -35,14 +35,14 @@ abstract class Model extends Eloquent
      *
      * @var array
      */
-    public static $dates = [];
+    protected static $dateAttributes = [];
 
     /**
      * The validation rules for this model.
      *
      * @var array
      */
-    protected static $rules = [];
+    public static $rules = [];
 
     /**
      * An array of custom relation methods, grouped by subclass.
@@ -176,7 +176,7 @@ abstract class Model extends Eloquent
      */
     public function getDates()
     {
-        return static::$dates;
+        return array_merge(static::$dateAttributes, $this->dates);
     }
 
     /**
@@ -184,9 +184,9 @@ abstract class Model extends Eloquent
      *
      * @param string $attribute
      */
-    public static function addDate($attribute)
+    public static function addDateAttribute($attribute)
     {
-        static::$dates[] = $attribute;
+        static::$dateAttributes[] = $attribute;
     }
 
     /**
diff --git a/framework/core/src/Extend/Model.php b/framework/core/src/Extend/Model.php
index 4b8695a34..d7fe120e5 100644
--- a/framework/core/src/Extend/Model.php
+++ b/framework/core/src/Extend/Model.php
@@ -90,7 +90,7 @@ class Model implements ExtenderInterface
         }
 
         foreach ($this->dates as $attribute) {
-            $model::addDate($attribute);
+            $model::addDateAttribute($attribute);
         }
     }
 }