From 6949ab466bb7f4b1f5e180956998d3987da69119 Mon Sep 17 00:00:00 2001 From: Nicolas MURE Date: Sat, 2 Dec 2017 20:45:06 +0100 Subject: [PATCH 1/2] symfony4 support --- .travis.yml | 7 ++----- README.md | 6 ++++++ Resources/config/services.xml | 2 +- Tests/bootstrap.php | 2 ++ composer.json | 4 ++-- phpunit.xml.dist | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 677fb95..8aa444a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,9 @@ language: php matrix: include: - - php: 5.3 + - php: 7.1 env: - - SYMFONY_VERSION='2.5.*' - - php: 7.0 - env: - - SYMFONY_VERSION='3.0.*' + - SYMFONY_VERSION='4.0.*' before_install: - mkdir -p build/logs diff --git a/README.md b/README.md index 3ee2659..85336b7 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,12 @@ class as a service (`crawler_detect`) to make it easier to use with Symfony Download the bundle using composer : +```bash +$ composer require nmure/crawler-detect-bundle "^2.0.0" +``` + +For Symfony < 4.0, run : + ```bash $ composer require nmure/crawler-detect-bundle "^1.0.0" ``` diff --git a/Resources/config/services.xml b/Resources/config/services.xml index 4ad10ca..35ebdfd 100644 --- a/Resources/config/services.xml +++ b/Resources/config/services.xml @@ -9,7 +9,7 @@ - + diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index 12d5d7d..08e809e 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -1,5 +1,7 @@ =5.3.0", - "symfony/framework-bundle": "~2.5|~3.0", + "php": ">=7.1", + "symfony/framework-bundle": "~4.0", "jaybizzle/crawler-detect": "1.*" }, "autoload": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e683f2c..06df347 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -28,6 +28,6 @@ - + From 256f7e0f1e754579713eea7f6840ff46eec1417c Mon Sep 17 00:00:00 2001 From: Nicolas MURE Date: Sat, 2 Dec 2017 21:46:21 +0100 Subject: [PATCH 2/2] update composer.json dev dependencies --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index d1e3569..031e83c 100644 --- a/composer.json +++ b/composer.json @@ -18,5 +18,9 @@ }, "autoload": { "psr-4": { "Nmure\\CrawlerDetectBundle\\": "" } + }, + "require-dev": { + "phpunit/phpunit": "^6.5", + "symfony/yaml": "^4.0" } }