Add Laravel 5.8 support (#46)

* Add Laravel 5.8 support

* Add methods return types

* Drop PHP 5.6 & PHP 7.0 support

* Use Support Carbon

Author: antonkomarev

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - 7.3

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to `laravel-eloquent-flag` will be documented in this file.
 
+## [5.0.0] - WIP
+
+### Added
+
+- Laravel 5.8 support
+
+### Changed
+
+- All methods are strict typed now
+- `Carbon\Carbon` replaced with `Illuminate\Support\Carbon`
+
+### Removed
+
+- PHP 5.6, 7.0 support
+- Laravel 5.2, 5.3, 5.4 support
+
 ## [4.0.0] - 2018-09-09
 
 ### Added
@@ -172,6 +188,7 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
 
 - `is_active` boolean flag added.
 
+[5.0.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/4.0.0...v5.0.0
 [4.0.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.13.0...4.0.0
 [3.13.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.12.0...3.13.0
 [3.12.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.11.0...3.12.0

README.md

@@ -1,4 +1,6 @@
-![cog-laravel-eloquent-flag-3](https://cloud.githubusercontent.com/assets/1849174/21735581/feb857cc-d47b-11e6-80fa-126be1a1d871.png)
+# Laravel Eloquent Flag
+
+![cog-laravel-eloquent-flag](https://user-images.githubusercontent.com/1849174/53454214-7d38d680-3a37-11e9-953d-8daee98fb087.png)
 
 <p align="center">
 <a href="https://github.com/cybercog/laravel-eloquent-flag/releases"><img src="https://img.shields.io/github/release/cybercog/laravel-eloquent-flag.svg?style=flat-square" alt="Releases"></a>
@@ -10,7 +12,7 @@
 
 ## Introduction
 
-Eloquent boolean & timestamp flagged attributes behavior. Enhance eloquent models with commonly used state flags like `Active`, `Published`, `Approved` and others in a minutes!
+Eloquent boolean & timestamp flagged attributes behavior. Enhance Eloquent Models with commonly used state flags like `Active`, `Published`, `Approved` and others in a minutes!
 
 ## Contents
 
@@ -32,7 +34,7 @@ Eloquent boolean & timestamp flagged attributes behavior. Enhance eloquent model
 ## Features
 
 - Designed to work with Laravel Eloquent models.
-- Each model can has as many flags as required.
+- Each model can has many flags.
 - Each flag adds global query scopes to models.
 - 2 logical groups of flags: `Classic`, `Inverse`.
 - 2 types of flags: `Boolean`, `Timestamp`.
@@ -134,15 +136,12 @@ If you discover any security related issues, please email open@cybercog.su inste
 
 ## Alternatives
 
-*Not found.*
-
 *Feel free to add more alternatives as Pull Request.*
 
 ## License
 
-- `Laravel Eloquent Flag` package is open-sourced software licensed under the [MIT license](LICENSE) by Anton Komarev.
-- `Check Mark` image licensed under [Creative Commons 3.0](https://creativecommons.org/licenses/by/3.0/us/) by Kimmi Studio.
-- `Clock Check` image licensed under [Creative Commons 3.0](https://creativecommons.org/licenses/by/3.0/us/) by Harsha Rai.
+- `Laravel Eloquent Flag` package is open-sourced software licensed under the [MIT license](LICENSE) by [Anton Komarev](https://github.com/antonkomarev).
+- `Clock` image licensed under [Creative Commons 3.0](https://creativecommons.org/licenses/by/3.0/us/) by Rudez Studio.
 
 ## About CyberCog
 

composer.json

@@ -53,14 +53,14 @@
         "docs": "https://github.com/cybercog/laravel-eloquent-flag/wiki"
     },
     "require": {
-        "php": "^5.6|^7.0",
-        "illuminate/database": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
+        "php": "^7.1.3",
+        "illuminate/database": "5.5.*|5.6.*|5.7.*|5.8.*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.10",
         "mockery/mockery": "^1.0",
-        "orchestra/database": "~3.4.0|~3.5.0|~3.6.0|~3.7.0",
-        "orchestra/testbench": "~3.4.0|~3.5.0|~3.6.0|~3.7.0",
+        "orchestra/database": "~3.5.0|~3.6.0|~3.7.0|~3.8.0",
+        "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0|~3.8.0",
         "phpunit/phpunit": "^5.7|^6.2|^7.0|^8.0"
     },
     "autoload": {

src/Providers/FlagServiceProvider.php

@@ -9,12 +9,14 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Cog\Flag\Scopes\Classic;
 
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Support\Carbon;
 
 class AcceptedAtScope implements Scope
 {
@@ -36,11 +38,11 @@ class AcceptedAtScope implements Scope
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return void
      */
-    public function apply(Builder $builder, Model $model)
+    public function apply(Builder $builder, Model $model): void
     {
-        return $builder->whereNotNull('accepted_at');
+        $builder->whereNotNull('accepted_at');
     }
 
     /**
@@ -49,7 +51,7 @@ public function apply(Builder $builder, Model $model)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    public function extend(Builder $builder)
+    public function extend(Builder $builder): void
     {
         foreach ($this->extensions as $extension) {
             $this->{"add{$extension}"}($builder);
@@ -62,7 +64,7 @@ public function extend(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addAccept(Builder $builder)
+    protected function addAccept(Builder $builder): void
     {
         $builder->macro('accept', function (Builder $builder) {
             $builder->withRejected();
@@ -77,7 +79,7 @@ protected function addAccept(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addReject(Builder $builder)
+    protected function addReject(Builder $builder): void
     {
         $builder->macro('reject', function (Builder $builder) {
             return $builder->update(['accepted_at' => null]);
@@ -90,7 +92,7 @@ protected function addReject(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithRejected(Builder $builder)
+    protected function addWithRejected(Builder $builder): void
     {
         $builder->macro('withRejected', function (Builder $builder) {
             return $builder->withoutGlobalScope($this);
@@ -103,7 +105,7 @@ protected function addWithRejected(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithoutRejected(Builder $builder)
+    protected function addWithoutRejected(Builder $builder): void
     {
         $builder->macro('withoutRejected', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->whereNotNull('accepted_at');
@@ -116,7 +118,7 @@ protected function addWithoutRejected(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addOnlyRejected(Builder $builder)
+    protected function addOnlyRejected(Builder $builder): void
     {
         $builder->macro('onlyRejected', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->whereNull('accepted_at');

src/Scopes/Classic/AcceptedAtScope.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Cog\Flag\Scopes\Classic;
 
 use Illuminate\Database\Eloquent\Builder;
@@ -35,11 +37,11 @@ class AcceptedFlagScope implements Scope
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return void
      */
-    public function apply(Builder $builder, Model $model)
+    public function apply(Builder $builder, Model $model): void
     {
-        return $builder->where('is_accepted', 1);
+        $builder->where('is_accepted', 1);
     }
 
     /**
@@ -48,7 +50,7 @@ public function apply(Builder $builder, Model $model)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    public function extend(Builder $builder)
+    public function extend(Builder $builder): void
     {
         foreach ($this->extensions as $extension) {
             $this->{"add{$extension}"}($builder);
@@ -61,7 +63,7 @@ public function extend(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addAccept(Builder $builder)
+    protected function addAccept(Builder $builder): void
     {
         $builder->macro('accept', function (Builder $builder) {
             $builder->withRejected();
@@ -76,7 +78,7 @@ protected function addAccept(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addReject(Builder $builder)
+    protected function addReject(Builder $builder): void
     {
         $builder->macro('reject', function (Builder $builder) {
             return $builder->update(['is_accepted' => 0]);
@@ -89,7 +91,7 @@ protected function addReject(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithRejected(Builder $builder)
+    protected function addWithRejected(Builder $builder): void
     {
         $builder->macro('withRejected', function (Builder $builder) {
             return $builder->withoutGlobalScope($this);
@@ -102,7 +104,7 @@ protected function addWithRejected(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithoutRejected(Builder $builder)
+    protected function addWithoutRejected(Builder $builder): void
     {
         $builder->macro('withoutRejected', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_accepted', 1);
@@ -115,7 +117,7 @@ protected function addWithoutRejected(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addOnlyRejected(Builder $builder)
+    protected function addOnlyRejected(Builder $builder): void
     {
         $builder->macro('onlyRejected', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_accepted', 0);

src/Scopes/Classic/AcceptedFlagScope.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Cog\Flag\Scopes\Classic;
 
 use Illuminate\Database\Eloquent\Builder;
@@ -35,11 +37,11 @@ class ActiveFlagScope implements Scope
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return void
      */
-    public function apply(Builder $builder, Model $model)
+    public function apply(Builder $builder, Model $model): void
     {
-        return $builder->where('is_active', 1);
+        $builder->where('is_active', 1);
     }
 
     /**
@@ -48,7 +50,7 @@ public function apply(Builder $builder, Model $model)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    public function extend(Builder $builder)
+    public function extend(Builder $builder): void
     {
         foreach ($this->extensions as $extension) {
             $this->{"add{$extension}"}($builder);
@@ -61,7 +63,7 @@ public function extend(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addActivate(Builder $builder)
+    protected function addActivate(Builder $builder): void
     {
         $builder->macro('activate', function (Builder $builder) {
             $builder->withDeactivated();
@@ -76,7 +78,7 @@ protected function addActivate(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addDeactivate(Builder $builder)
+    protected function addDeactivate(Builder $builder): void
     {
         $builder->macro('deactivate', function (Builder $builder) {
             return $builder->update(['is_active' => 0]);
@@ -89,7 +91,7 @@ protected function addDeactivate(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithDeactivated(Builder $builder)
+    protected function addWithDeactivated(Builder $builder): void
     {
         $builder->macro('withDeactivated', function (Builder $builder) {
             return $builder->withoutGlobalScope($this);
@@ -102,7 +104,7 @@ protected function addWithDeactivated(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithoutDeactivated(Builder $builder)
+    protected function addWithoutDeactivated(Builder $builder): void
     {
         $builder->macro('withoutDeactivated', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_active', 1);
@@ -115,7 +117,7 @@ protected function addWithoutDeactivated(Builder $builder)
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addOnlyDeactivated(Builder $builder)
+    protected function addOnlyDeactivated(Builder $builder): void
     {
         $builder->macro('onlyDeactivated', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_active', 0);