Merge pull request #29 from hmazter/laravel-58

Allow Laravel 5.8

.gitignore

@@ -1,4 +1,5 @@
 .idea/
 vendor/
 build/
-composer.lock
+composer.lock
+.phpunit.result.cache

.travis.yml

@@ -3,22 +3,17 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
+
+env:
+  - ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.6
+  - ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.7
+  - ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.8
 
 cache:
   directories:
     - $HOME/.composer/cache
 
-matrix:
-  include:
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.6
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.7
-    - php: 7.2
-      env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.6
-    - php: 7.2
-      env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=7.* ORCHESTRA_TESTBENCH_VERSION=3.7
-
 before_install:
   - if [ -n "$ILLUMINATE_VERSION" ] ; then composer require illuminate/support:${ILLUMINATE_VERSION} illuminate/console:${ILLUMINATE_VERSION} --no-update; fi
   - if [ -n "$PHPUNIT_VERSION" ] ; then composer require --dev phpunit/phpunit:${PHPUNIT_VERSION} --no-update; fi

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - Unreleased
+### Other
+- Support Laravel 5.8
+- Test against PHP 7.3
+
 ## [1.2.0] - 2019-02-09
 ### Other
 - Remove support Laravel 5.5 (it did not actually work)

composer.json

@@ -11,13 +11,13 @@
   ],
   "require": {
     "php": "^7.1.3",
-    "illuminate/support": "5.6.*|5.7.*",
-    "illuminate/console": "5.6.*|5.7.*",
-    "dragonmantank/cron-expression": "~2.0"
+    "illuminate/support": "5.6.*|5.7.*|5.8.*",
+    "illuminate/console": "5.6.*|5.7.*|5.8.*",
+    "dragonmantank/cron-expression": "^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.0|^6.0|^7.0",
-    "orchestra/testbench": "~3.3"
+    "phpunit/phpunit": "^7.0",
+    "orchestra/testbench": "~3.6"
   },
   "autoload": {
     "psr-4": {

tests/Function/ScheduleEventTest.php

@@ -56,7 +56,7 @@ public function getNextRunDate_withTimezone_returnsRunDateAdjustedForTheTimezone
         // 8 am GMT+2 should be 6 am from a UTC perspective
         // Meaning the server (hypothetically running UTC) should trigger the job at 6 am
         // that happens at 8 am GMT+2 then.
-        self::assertContains('06:00:00', $scheduleEvent->getNextRunDate()->format('Y-m-d H:i:s'));
+        self::assertEquals('06:00:00', $scheduleEvent->getNextRunDate()->format('H:i:s'));
     }
 
     /**

tests/Integration/ListSchedulerNoScheduleTest.php

@@ -7,6 +7,6 @@ public function testListSchedulerCommand_withNoTasks()
         \Illuminate\Support\Facades\Artisan::call('schedule:list');
         $consoleOutput = trim(\Illuminate\Support\Facades\Artisan::output());
 
-        self::assertContains('No tasks scheduled', $consoleOutput);
+        self::assertEquals('No tasks scheduled', trim($consoleOutput));
     }
 }