From dd568be0a932524993e69b61f457646fd3638d50 Mon Sep 17 00:00:00 2001 From: Albert Chen Date: Sun, 15 Sep 2019 21:44:12 +0800 Subject: [PATCH 1/3] make date format compatible for hot relooad in different operating systems --- src/HotReload/FSEventParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HotReload/FSEventParser.php b/src/HotReload/FSEventParser.php index c0c35ef6..b37fbc8c 100644 --- a/src/HotReload/FSEventParser.php +++ b/src/HotReload/FSEventParser.php @@ -9,7 +9,7 @@ */ class FSEventParser { - protected const REGEX = '/^([\S+]{3}\s+[\S+]{3}\s+[\d+]{1,2}\s+[\d+]{2}:[\d+]{2}:{0,2}:[\d+]{2}:{0,2}\s+[\d+]{0,4})\s*(\/[\S+]*)\s+([\S+*\s+]*)/mi'; + protected const REGEX = '/^([\S+]{3}\s+[^\/]*)\s(\/[\S+]*)\s+([\S+*\s+]*)/mi'; protected const DATE = 1; protected const PATH = 2; From 9caffc74b838115d7a41c9b7c7f37db209108613 Mon Sep 17 00:00:00 2001 From: Albert Chen Date: Sun, 29 Sep 2019 19:51:24 +0800 Subject: [PATCH 2/3] add laravel 6.0 to composer.json and travis.yml --- .travis.yml | 2 ++ composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6af8a0c..a90e95ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ matrix: env: FRAMEWORK_VERSION=laravel/framework:5.7.* - php: 7.2 env: FRAMEWORK_VERSION=laravel/framework:5.8.* + - php: 7.2 + env: FRAMEWORK_VERSION=laravel/framework:6.0.* - php: 7.2 env: FRAMEWORK_VERSION=laravel/lumen-framework:5.5.* - php: 7.2 diff --git a/composer.json b/composer.json index 704f9890..dccf5daa 100644 --- a/composer.json +++ b/composer.json @@ -22,14 +22,14 @@ ], "require": { "php": "^7.2", - "illuminate/console": "~5.4", - "illuminate/contracts": "~5.4", - "illuminate/http": "~5.4", - "illuminate/support": "~5.4", + "illuminate/console": "~5.4|^6.0", + "illuminate/contracts": "~5.4|^6.0", + "illuminate/http": "~5.4|^6.0", + "illuminate/support": "~5.4|^6.0", "predis/predis": "^1.1" }, "require-dev": { - "laravel/lumen-framework": "~5.4", + "laravel/lumen-framework": "~5.4|^6.0", "phpunit/phpunit": "^7.5", "phpunit/php-code-coverage": "^6.1", "php-coveralls/php-coveralls": "^2.1", From eaa325e16bffd2b9da941a1dbf7429293bcc94d2 Mon Sep 17 00:00:00 2001 From: Albert Chen Date: Sun, 29 Sep 2019 20:13:09 +0800 Subject: [PATCH 3/3] fix composer.json for laravel 6 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index dccf5daa..4e7f11f1 100644 --- a/composer.json +++ b/composer.json @@ -22,14 +22,14 @@ ], "require": { "php": "^7.2", - "illuminate/console": "~5.4|^6.0", - "illuminate/contracts": "~5.4|^6.0", - "illuminate/http": "~5.4|^6.0", - "illuminate/support": "~5.4|^6.0", + "illuminate/console": "~5.4|~6.0", + "illuminate/contracts": "~5.4|~6.0", + "illuminate/http": "~5.4|~6.0", + "illuminate/support": "~5.4|~6.0", "predis/predis": "^1.1" }, "require-dev": { - "laravel/lumen-framework": "~5.4|^6.0", + "laravel/lumen-framework": "~5.4|~6.0", "phpunit/phpunit": "^7.5", "phpunit/php-code-coverage": "^6.1", "php-coveralls/php-coveralls": "^2.1",