[feature] laravel 6.0 compatibility

- refactor to support Laravel 6.0

Author: mazim

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 7.1
+  - 7.2
 
 sudo: false
 
@@ -14,4 +14,4 @@ before_install:
 
 install: travis_retry composer install --no-interaction --prefer-dist --no-suggest
 
-script: vendor/bin/phpunit --verbose
+script: vendor/bin/phpunit --verbose

composer.json

@@ -16,21 +16,21 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.2",
     "doctrine/dbal": "^2.9",
-    "illuminate/bus": "~5.8.0",
-    "illuminate/console": "~5.8.0",
-    "illuminate/contracts": "~5.8.0",
-    "illuminate/database": "~5.8.0",
-    "illuminate/events": "~5.8.0",
-    "illuminate/notifications": "~5.8.0",
-    "laravelcollective/html": "^5.8"
+    "illuminate/bus": "~6.0.0",
+    "illuminate/console": "~6.0.0",
+    "illuminate/contracts": "~6.0.0",
+    "illuminate/database": "~6.0.0",
+    "illuminate/events": "~6.0.0",
+    "illuminate/notifications": "~6.0.0",
+    "laravelcollective/html": "^6.0"
   },
   "require-dev": {
     "mockery/mockery": "^1.0",
-    "orchestra/database": "^3.7",
-    "orchestra/testbench" : "^3.8",
-    "phpunit/phpunit": "^7.5"
+    "orchestra/database": "^4.0",
+    "orchestra/testbench" : "^4.0",
+    "phpunit/phpunit": "^8.3"
   },
   "suggest": {
     "nexmo/client": "Required for sms notifications."

database/factories/ModelFactory.php

@@ -19,7 +19,7 @@
         'name'           => $faker->name,
         'email'          => $faker->unique()->safeEmail,
         'password'       => $password ?: $password = bcrypt('secret'),
-        'remember_token' => str_random(10),
+        'remember_token' => \Illuminate\Support\Str::random(10),
     ];
 });
 

resources/views/partials/sidebar.blade.php

@@ -5,12 +5,12 @@
     </div>
     <hr>
     <ul class="uk-nav uk-nav-default">
-        <li class="{{ str_contains(url()->current(), 'tasks') ? 'uk-active' : '' }}">
+        <li class="{{ Str::contains(url()->current(), 'tasks') ? 'uk-active' : '' }}">
             <a href="{{route('totem.tasks.all')}}" class="uk-flex uk-flex-middle">
                 <span uk-icon="icon: clock; ratio: 1" class="uk-visible@m uk-margin-small-right"></span>
                 <span class="uk-vertical-align-middle">Tasks</span>
             </a>
         </li>
     </ul>
     <hr>
-</aside>
+</aside>

resources/views/tasks/view.blade.php

@@ -13,7 +13,7 @@
     <ul class="uk-list uk-list-striped">
         <li>
             <span class="uk-text-muted uk-float-right">Description</span>
-            <span class="uk-float-left">{{str_limit($task->description, 80)}}</span>
+            <span class="uk-float-left">{{Str::limit($task->description, 80)}}</span>
         </li>
         <li>
             <span class="uk-text-muted uk-float-right">Command</span>
@@ -128,4 +128,4 @@
             {{$results->links('totem::partials.pagination')}}
         </div>
     </div>
-@stop
+@stop

src/Console/Commands/ListSchedule.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Cron\CronExpression;
+use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use Illuminate\Console\Scheduling\Schedule;
 
@@ -52,7 +53,7 @@ public function handle()
             $events = collect($this->schedule->events())->map(function ($event) {
                 return [
                     'description'   => $event->description ?: 'N/A',
-                    'command'       => ltrim(strtok(str_after($event->command, "'artisan'"), ' ')),
+                    'command'       => ltrim(strtok(Str::after($event->command, "'artisan'"), ' ')),
                     'schedule'      => $event->expression,
                     'upcoming'      => $this->upcoming($event),
                     'timezone'      => $event->timezone ?: config('app.timezone'),

src/Http/Requests/TaskRequest.php

@@ -59,7 +59,7 @@ public function messages()
      *
      * @return array
      */
-    protected function validationData()
+    public function validationData()
     {
         if ($this->input('type') == 'frequency') {
             $this->merge(['expression' => null]);

src/Repositories/EloquentTaskRepository.php

@@ -4,6 +4,7 @@
 
 use Studio\Totem\Task;
 use Studio\Totem\Result;
+use Illuminate\Support\Arr;
 use Studio\Totem\Events\Created;
 use Studio\Totem\Events\Deleted;
 use Studio\Totem\Events\Updated;
@@ -97,7 +98,7 @@ public function store(array $input)
             return false;
         }
 
-        $task->fill(array_only($input, $task->getFillable()))->save();
+        $task->fill(Arr::only($input, $task->getFillable()))->save();
 
         Created::dispatch($task);
 
@@ -119,7 +120,7 @@ public function update(array $input, $task)
             return false;
         }
 
-        $task->fill(array_only($input, $task->getFillable()))->save();
+        $task->fill(Arr::only($input, $task->getFillable()))->save();
 
         Updated::dispatch($task);
 

src/Task.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Cron\CronExpression;
+use Illuminate\Support\Str;
 use Studio\Totem\Traits\HasFrequencies;
 use Illuminate\Notifications\Notifiable;
 use Studio\Totem\Traits\FrontendSortable;

src/TotemModel.php

@@ -2,6 +2,7 @@
 
 namespace Studio\Totem;
 
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
 
 class TotemModel extends Model
@@ -13,7 +14,7 @@ class TotemModel extends Model
      */
     public function getTable()
     {
-        if (str_contains(parent::getTable(), TOTEM_TABLE_PREFIX)) {
+        if (Str::contains(parent::getTable(), TOTEM_TABLE_PREFIX)) {
             return parent::getTable();
         }