Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support symfony 5 #75

Merged
merged 10 commits into from
Jul 26, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ language: php
php:
- 7.1
- 7.2
- 7.4

env:
- SYMFONY_VERSION=3.4.0
- SYMFONY_VERSION=4.0.*
- SYMFONY_VERSION=4.4.0
- SYMFONY_VERSION=5.*.*

before_script:
- wget http://getcomposer.org/composer.phar
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ StatsdBundle [![Build Status](https://travis-ci.org/M6Web/StatsdBundle.png?branc

## Bundle easing the [statsd](https://github.com/etsy/statsd/) usage.

This bundle currently supports `php >=7.1.3` and `symfony 3.4/4.x`.
This bundle currently supports `php >=7.1.3` and `symfony 4.4/5.x`.

If you need support for `symfony 3.4/<4.4`, use version [v3.0.0](https://github.com/M6Web/StatsdBundle/tree/v3.0.0).
If you need support for `php >=5.4.0` and `symfony 2.x/3.x`, use version [v2.15.1](https://github.com/M6Web/StatsdBundle/tree/v2.15.1).

* [about](doc/about.md)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
},
"require": {
"php": "^7.1.3",
"symfony/property-access": "^3.4 || ^4.0",
"symfony/property-access": "^4.4 || ^5.0",
"m6web/statsd": "^1.3"
},
"require-dev": {
"atoum/atoum": "^2.8|^3.0",
"symfony/symfony": "^3.4 || ^4.0 || ^5.0",
"symfony/symfony": "^4.4 || ^5.0",
"m6web/coke" : "~1.2",
"m6web/symfony2-coding-standard" : "~1.2"
},
Expand Down
4 changes: 2 additions & 2 deletions src/DataCollector/StatsdDataCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ public function addStatsdClient($clientAlias, $statsdClient)
*
* @param Request $request The request object
* @param Response $response The response object
* @param \Exception $exception An exception
* @param \Throwable $exception An exception
*/
public function collect(Request $request, Response $response, \Exception $exception = null)
public function collect(Request $request, Response $response, \Throwable $exception = null)
{
}

Expand Down