Skip to content

Commit

Permalink
Merge pull request #1 from informeren/feature/symfony-5
Browse files Browse the repository at this point in the history
Feature/symfony 5
  • Loading branch information
proeinfo authored Dec 16, 2019
2 parents ec512fa + d230e66 commit cc2b689
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
14 changes: 3 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ language: php

sudo: false

php:
- 7.3

cache:
directories:
- vendor
- $HOME/.composer/cache/files

matrix:
fast_finish: true
include:
- php: 7.3
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
env: DEPENDENCIES=dev

before_install:
- if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi;

install: travis_retry composer update $COMPOSER_FLAGS

script: ./vendor/bin/simple-phpunit
10 changes: 7 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "nelmio/solarium-bundle",
"name": "informeren/solarium-bundle",
"description": "Integration with solarium solr client.",
"keywords": ["solr", "solarium", "search"],
"type": "symfony-bundle",
Expand All @@ -12,15 +12,19 @@
{
"name": "Symfony Community",
"homepage": "https://github.com/nelmio/NelmioSolariumBundle/contributors"
},
{
"name": "Dagbladet Information",
"homepage": "https://information.dk"
}
],
"require": {
"php": "^7.2",
"symfony/framework-bundle": "^3.4 || ^4.2",
"symfony/framework-bundle": "^5.0",
"solarium/solarium": "^5.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^4.3"
"symfony/phpunit-bridge": "^5.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit cc2b689

Please sign in to comment.