Merge branch 'release/0.2.0'

Author: sebastiaanluca

CHANGELOG.md

@@ -6,6 +6,16 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ##  Unreleased
 
+##  0.2.0 (2018-07-26)
+
+### Changed
+
+- Allow using mutators and other features for boolean dates
+
+### Fixed
+
+- Allow multiple traits with the same methods (e.g. `getAttribute`)
+
 ##  0.1.1 (2018-07-26)
 
 ### Fixed

README.md

@@ -1,4 +1,4 @@
-# Laravel Boolean Dates
+# Easily convert Eloquent model booleans to dates and back
 
 [![Latest stable release][version-badge]][link-packagist]
 [![Software license][license-badge]](LICENSE.md)
@@ -10,9 +10,7 @@
 [![Follow @sebastiaanluca on Twitter][twitter-profile-badge]][link-twitter]
 [![Share this package on Twitter][twitter-share-badge]][link-twitter-share]
 
-__Easily convert Eloquent model booleans to dates and back with Laravel Boolean Dates.__
-
-Sets the date of fields to the current date and time if an inputted counterpart boolean field is true-ish. Ideal for those terms and conditions checkboxes on user registration pages! Now you know _when_ they were accepted and not just _if_ (GDPR anyone?).
+__Sets the date of fields to the current date and time if an inputted counterpart boolean field is true-ish.__ Ideal for those terms and conditions checkboxes on user registration pages! Now you know _when_ they were accepted and not just _if_ (GDPR anyone?).
 
 ## Table of contents
 

src/BooleanDates.php

@@ -46,7 +46,7 @@ public function getAttribute($key)
         }
 
         if ($this->hasBooleanDate($key)) {
-            return $this->attributes[$this->getBooleanDateField($key)] !== null;
+            return $this->getBooleanDate($key);
         }
 
         return parent::getAttribute($key);
@@ -82,33 +82,37 @@ public function getBooleanDates() : array
     /**
      * @return array
      */
-    public function getBooleanDateAttributes() : array
+    protected function getBooleanDateAttributes() : array
     {
         return array_intersect_key(
-            $this->attributes,
+            $this->getAttributes(),
             array_flip($this->getBooleanDates())
         );
     }
 
     /**
-     * @param string $key
+     * @param mixed $key
      *
      * @return bool
      */
-    public function hasBooleanDate(string $key) : bool
+    protected function getBooleanDate($key) : bool
     {
-        return array_key_exists($key, $this->getBooleanDates());
+        return parent::getAttribute($this->getBooleanDateField($key)) !== null;
     }
 
     /**
      * @param string $key
      * @param mixed $value
      */
-    public function setBooleanDate(string $key, $value) : void
+    protected function setBooleanDate(string $key, $value) : void
     {
         // Only update the timestamp if the value is true and if it's not yet set
         // or if the value is false and we need to unset the field.
         if (! $value || ($value && $this->currentBooleanDateFieldValueIsNotYetSet($key))) {
+            // Set the value directly on the attributes array, don't use
+            // setAttribute, and don't receive $200. (\) (°,,,°) (/)
+            // This allows us to format and set the datetime ourselves,
+            // and makes using the $dates field optional.
             $this->attributes[$this->getBooleanDateField($key)] = $this->getNewBooleanDateValue($value);
         }
     }
@@ -118,21 +122,31 @@ public function setBooleanDate(string $key, $value) : void
      *
      * @return bool
      */
-    public function currentBooleanDateFieldValueIsNotYetSet(string $key) : bool
+    protected function hasBooleanDate(string $key) : bool
     {
-        if (! array_key_exists($this->getBooleanDateField($key), $this->attributes)) {
+        return array_key_exists($key, $this->getBooleanDates());
+    }
+
+    /**
+     * @param mixed $key
+     *
+     * @return bool
+     */
+    protected function currentBooleanDateFieldValueIsNotYetSet($key) : bool
+    {
+        if (! array_key_exists($this->getBooleanDateField($key), $this->getAttributes())) {
             return true;
         }
 
-        return $this->attributes[$this->getBooleanDateField($key)] === null;
+        return parent::getAttribute($this->getBooleanDateField($key)) === null;
     }
 
     /**
-     * @param string $key
+     * @param mixed $key
      *
      * @return string
      */
-    public function getBooleanDateField(string $key) : string
+    protected function getBooleanDateField($key) : string
     {
         return $this->booleanDates[$key];
     }
@@ -142,7 +156,7 @@ public function getBooleanDateField(string $key) : string
      *
      * @return string|null
      */
-    public function getNewBooleanDateValue($value) : ?string
+    protected function getNewBooleanDateValue($value) : ?string
     {
         return $value ? $this->fromDateTime(Carbon::now()) : null;
     }