Merge pull request #250 from n41tik/master

Laravel 7.0 compatibility updates
kodeine · Apr 1, 2020 · 0906171 · 0906171
2 parents bd2628f + 328c4ad
commit 0906171
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -20,11 +20,11 @@
     ],
     "require": {
         "php": ">=7.2",
-        "illuminate/support": "^6.0"
+        "illuminate/support": "^6.0|^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",
-        "orchestra/testbench": "^4.0",
+        "orchestra/testbench": "^4.0|^5.0",
         "doctrine/dbal": "^2.9"
     },
     "autoload": {

diff --git a/src/Kodeine/Acl/Models/Eloquent/Role.php b/src/Kodeine/Acl/Models/Eloquent/Role.php
@@ -2,6 +2,7 @@
 
 namespace Kodeine\Acl\Models\Eloquent;
 
+use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 use Kodeine\Acl\Traits\HasPermission;
 
@@ -30,6 +31,17 @@ public function __construct(array $attributes = [])
         parent::__construct($attributes);
     }
 
+    /**
+     * Prepare a date for array / JSON serialization.
+     *
+     * @param  DateTimeInterface  $date
+     * @return string
+     */
+    protected function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+
     /**
      * Use the slug of the Role
      * instead of the ID.