Merge pull request #2 from nasrulhazim/shift-17767

Laravel 6.0 Shift
nasrulhazim · Sep 5, 2019 · dc8e42f · dc8e42f
2 parents 60e8cc9 + 9840d08
commit dc8e42f
Show file tree

Hide file tree

Showing 23 changed files with 1,072 additions and 784 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -37,20 +37,20 @@ jobs:
       - save_cache:
           key: composer-v1-{{ checksum "composer.lock" }}
           paths:
-            - vendor
+            - $HOME/.composer/cache
 
       # node cache
 
-      - restore_cache:
-          keys:
-            - node-v4-{{ checksum "package.json" }}
-            - node-v4-
-      - run: npm install
-      - save_cache:
-          key: node-v4-{{ checksum "package.json" }}
-          paths:
-            - node_modules
-            - ~/.yarn
+      # - restore_cache:
+      #     keys:
+      #       - node-v4-{{ checksum "package.json" }}
+      #       - node-v4-
+      # - run: npm install
+      # - save_cache:
+      #     key: node-v4-{{ checksum "package.json" }}
+      #     paths:
+      #       - node_modules
+      #       - ~/.yarn
 
       # run tests with phpunit or codecept
       - run: ./vendor/bin/phpunit

diff --git a/.php_cs.cache b/.php_cs.cache
diff --git a/app/Console/Commands/Reload/ReloadCacheCommand.php b/app/Console/Commands/Reload/ReloadCacheCommand.php
@@ -37,7 +37,7 @@ public function handle()
     {
         $this->call('cache:clear');
         $this->call('config:cache');
-        $this->call('responsecache:flush');
+        $this->call('responsecache:clear');
         $this->call('route:cache');
         $this->call('view:clear');
 

diff --git a/app/Http/Datatables/AuditDatatable.php b/app/Http/Datatables/AuditDatatable.php
@@ -9,12 +9,12 @@ class AuditDatatable extends Datatable
      *
      * @var string
      */
-    protected $model = '\App\Models\Audit';
+    protected $model = \App\Models\Audit::class;
 
     /**
      * \App\Transformers\Datatable\AuditTransformer.
      *
      * @var string
      */
-    protected $transformer = '\App\Transformers\Datatable\AuditTransformer';
+    protected $transformer = \App\Transformers\Datatable\AuditTransformer::class;
 }
diff --git a/app/Http/Datatables/UserDatatable.php b/app/Http/Datatables/UserDatatable.php
@@ -9,12 +9,12 @@ class UserDatatable extends Datatable
      *
      * @var string
      */
-    protected $model = '\App\Models\User';
+    protected $model = \App\Models\User::class;
 
     /**
      * \App\Transformers\Datatable\UserTransformer.
      *
      * @var string
      */
-    protected $transformer = '\App\Transformers\Datatable\UserTransformer';
+    protected $transformer = \App\Transformers\Datatable\UserTransformer::class;
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -89,6 +89,7 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\Authenticate::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -4,7 +4,8 @@
 
 use App\Contracts\Datatable as DatatableContract;
 use App\Traits\HasDatatable;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Contracts\Auth\MustVerifyEmail  as MustVerifyEmailContract;
+use Illuminate\Auth\MustVerifyEmail as MustVerifyEmailTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -14,7 +15,7 @@
 use Spatie\Permission\Traits\HasRoles;
 use Yadahan\AuthenticationLog\AuthenticationLogable;
 
-class User extends Authenticatable implements Auditable, MustVerifyEmail, DatatableContract
+class User extends Authenticatable implements Auditable, MustVerifyEmailContract, DatatableContract
 {
     use HasDatatable;
     use HasApiTokens;
@@ -25,6 +26,7 @@ class User extends Authenticatable implements Auditable, MustVerifyEmail, Datata
     use
     Impersonate;
     use AuthenticationLogable;
+    use MustVerifyEmailTrait;
 
     /**
      * The attributes that show in datatable.

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2",
         "appstract/laravel-blade-directives": "^1.4",
         "cleaniquecoders/blade-plus-plus": "^1.0",
         "cleaniquecoders/blueprint-macro": "^2.3",
@@ -19,35 +19,34 @@
         "doctrine/dbal": "^2.9",
         "fideloper/proxy": "^4.0",
         "lab404/laravel-impersonate": "^1.3",
-        "laravel/framework": "5.8.*",
-        "laravel/horizon": "^3.0",
-        "laravel/passport": "^7.2",
+        "laravel/framework": "^6.0",
+        "laravel/horizon": "^3.2.7",
+        "laravel/passport": "^7.3.3",
         "laravel/telescope": "^2.0",
         "laravel/tinker": "^1.0",
-        "owen-it/laravel-auditing": "^9.0",
+        "owen-it/laravel-auditing": "dev-master",
         "predis/predis": "^1.1",
         "renatomarinho/laravel-page-speed": "^1.8",
-        "spatie/image-optimizer": "^1.1",
-        "spatie/laravel-medialibrary": "^7.6",
-        "spatie/laravel-permission": "^2.36",
-        "spatie/laravel-responsecache": "^5.0",
-        "tightenco/ziggy": "^0.6.9",
-        "uxweb/sweet-alert": "^2.0",
-        "yadahan/laravel-authentication-log": "^1.1",
+        "spatie/image-optimizer": "^1.2",
+        "spatie/laravel-medialibrary": "^7.12",
+        "spatie/laravel-permission": "^3.0",
+        "spatie/laravel-responsecache": "^6.3",
+        "tightenco/ziggy": "^0.8.0",
+        "uxweb/sweet-alert": "dev-master",
+        "yadahan/laravel-authentication-log": "^1.2",
         "yajra/laravel-datatables": "^1.0",
-        "yajra/laravel-datatables-oracle": "~9.0"
+        "yajra/laravel-datatables-oracle": "~9.6"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",
-        "beyondcode/laravel-dump-server": "^1.0",
-        "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
-        "laravel/dusk": "^5.1",
+        "laravel/dusk": "^5.5",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
         "nunomaduro/larastan": "^0.3.17",
-        "phpunit/phpunit": "^7.5",
-        "staudenmeir/dusk-updater": "^1.1"
+        "phpunit/phpunit": "^8.0",
+        "staudenmeir/dusk-updater": "^1.1",
+        "facade/ignition": "^1.4"
     },
     "config": {
         "optimize-autoloader": true,
@@ -57,7 +56,7 @@
     "extra": {
         "laravel": {
             "dont-discover": [
-               "laravel/dusk"
+                "laravel/dusk"
             ]
         }
     },
@@ -91,5 +90,12 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
-    }
-}
+    },
+    "repositories": [{
+        "type": "vcs",
+        "url": "https://github.com/backstageel/sweet-alert"
+    },{
+        "type": "vcs",
+        "url": "https://github.com/nasrulhazim/laravel-auditing"
+    }]
+}