From c63ecf436bf6cf288a1215c9c2ae00eba6face0f Mon Sep 17 00:00:00 2001 From: Mark Beech Date: Thu, 1 Jun 2017 20:14:50 +0100 Subject: [PATCH 1/5] Support Auto-Discovery https://github.com/laravel/framework/pull/19420 --- composer.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/composer.json b/composer.json index 5c335f8..78ffd71 100644 --- a/composer.json +++ b/composer.json @@ -22,5 +22,15 @@ "Jaybizzle\\LaravelCrawlerDetect\\": "src/" } }, + "extra": { + "laravel": { + "providers": [ + "Jaybizzle\\LaravelCrawlerDetect\\LaravelCrawlerDetectServiceProvider" + ], + "aliases": { + "Crawler": "Jaybizzle\\LaravelCrawlerDetect\\Facades\\LaravelCrawlerDetect" + } + } + }, "minimum-stability": "stable" } From d861c90c93f5ad7f57500d2ed95d28c562395216 Mon Sep 17 00:00:00 2001 From: Mark Beech Date: Thu, 1 Jun 2017 20:17:19 +0100 Subject: [PATCH 2/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cce5418..b1544d6 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ Add the following to the `providers` array in your `config/app.php` file.. 'Crawler' => 'Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect', ``` +Laravel 5.5 uses Package Auto-Discovery, so doesn't require you to manually add the ServiceProvider. + Usage ================== ```PHP From 5c33c60f40f7584c7e30900d0df2f12b0121cfb7 Mon Sep 17 00:00:00 2001 From: Mark Beech Date: Thu, 1 Jun 2017 21:01:07 +0100 Subject: [PATCH 3/5] Fix tests --- .travis.yml | 20 ++++++++++++++------ composer.json | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 159eb61..b438764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,21 @@ language: php -php: - - 5.5 - - 5.6 - - 7.0 - - 7.1 +matrix: + include: + - php: 5.3 + - php: 5.4 + - php: 5.5 + - php: 5.6 + - php: 7.0 + - php: 7.1 + - php: hhvm + - php: nightly + allow_failures: + - php: nightly + fast_finish: true before_script: - travis_retry composer self-update - travis_retry composer install --prefer-source --no-interaction --dev -script: phpunit +script: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 78ffd71..fa18c4d 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "jaybizzle/crawler-detect": "1.*" }, "require-dev": { - "orchestra/testbench": "3.1.*" + "orchestra/testbench": "3.1.*", + "phpunit/phpunit": "4.*" }, "autoload": { "psr-4": { From 28f97a481cb3e46b2c8063665ce771488671dad4 Mon Sep 17 00:00:00 2001 From: Mark Beech Date: Thu, 1 Jun 2017 21:17:04 +0100 Subject: [PATCH 4/5] Tweak matrix --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b438764..c10218d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,11 @@ language: php matrix: include: - - php: 5.3 - php: 5.4 - php: 5.5 - php: 5.6 - php: 7.0 - php: 7.1 - - php: hhvm - php: nightly allow_failures: - php: nightly From 2168368fa09ed17da799ee5d9c880d5f528654e6 Mon Sep 17 00:00:00 2001 From: Mark Beech Date: Thu, 1 Jun 2017 21:22:15 +0100 Subject: [PATCH 5/5] FFS! --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c10218d..b437a3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: php matrix: include: - - php: 5.4 - php: 5.5 - php: 5.6 - php: 7.0