Merge pull request #98 from thesunrise1983/master

Add support for Symfony v5
nelmio · May 8, 2020 · b449fb5 · b449fb5
2 parents 3facc96 + 8ca0ab3
commit b449fb5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,9 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.2
       env: DEPENDENCIES=dev
-
+    - php: 7.4
+      env: SYMFONY_REQUIRE=5.0.*
+
 before_install:
     - if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi;
     - composer global require --no-progress --no-scripts --no-plugins symfony/flex

diff --git a/composer.json b/composer.json
@@ -16,11 +16,11 @@
     ],
     "require": {
         "php": "^7.2",
-        "symfony/framework-bundle": "^3.4 || ^4.2",
+        "symfony/framework-bundle": "^3.4 || ^4.2 || ^5.0",
         "solarium/solarium": "^5.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.3"
+        "symfony/phpunit-bridge": "^5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Logger.php b/src/Logger.php
@@ -61,7 +61,7 @@ public function log(SolariumRequest $request, $response, SolariumEndpoint $endpo
         );
     }
 
-    public function collect(HttpRequest $request, HttpResponse $response, \Exception $exception = null)
+    public function collect(HttpRequest $request, HttpResponse $response, /** \Throwable */ $exception = null)
     {
         if (isset($this->currentRequest)) {
             $this->failCurrentRequest();