Merge pull request #6 from nicolasmure/feature/symfony4-support

symfony4 support
nicolasmure · Dec 2, 2017 · b7fe6ba · b7fe6ba
2 parents f57e2e3 + 256f7e0
commit b7fe6ba
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git 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
@@ -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
@@ -9,7 +9,7 @@
     </parameters>
 
     <services>
-        <service id="crawler_detect" class="%crawler_detect.class%">
+        <service id="crawler_detect" class="%crawler_detect.class%" public="true">
             <argument type="service" id="request_stack" />
         </service>
     </services>

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+include __DIR__.'/Functional/Fixtures/app/AppKernel.php';
+
 if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
     throw new \LogicException('Could not find autoload.php in vendor/. Try to run "composer install"');
 }

diff --git a/composer.json b/composer.json
@@ -12,11 +12,15 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "symfony/framework-bundle": "~2.5|~3.0",
+        "php": ">=7.1",
+        "symfony/framework-bundle": "~4.0",
         "jaybizzle/crawler-detect": "1.*"
     },
     "autoload": {
         "psr-4": { "Nmure\\CrawlerDetectBundle\\": "" }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^6.5",
+        "symfony/yaml": "^4.0"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -28,6 +28,6 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="./Tests/Functional/Fixtures/app" />
+        <server name="KERNEL_CLASS" value="\AppKernel" />
     </php>
 </phpunit>