Skip to content

Commit c590470

Browse files
XuruDragondunglas
authored andcommitted
fix compatibility with Sf5.0 Symfony\Component\HttpKernel\DataCollectorInterface (#18)
* fix compatibility with Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface::collect * Fix Composer deps and PHPStan * Revert useless return type removal
1 parent 77df93d commit c590470

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/config": "^3.4|^4.3|^5.0",
21-
"symfony/dependency-injection": "^3.4|^4.3|^5.0",
22-
"symfony/http-kernel": "^3.4|^4.3|^5.0",
20+
"symfony/config": "^4.3.7|^5.0",
21+
"symfony/dependency-injection": "^4.3.7|^5.0",
22+
"symfony/http-kernel": "^4.3.7|^5.0",
2323
"symfony/mercure": "^0.3"
2424
},
2525
"autoload": {
@@ -37,9 +37,9 @@
3737
"sort-packages": true
3838
},
3939
"require-dev": {
40-
"symfony/phpunit-bridge": "^4.2.4|^5.0",
41-
"symfony/stopwatch": "^3.4|^4.3|^5.0",
42-
"symfony/var-dumper": "^3.4|^4.3|^5.0"
40+
"symfony/phpunit-bridge": "^4.3.7|^5.0",
41+
"symfony/stopwatch": "^4.3.7|^5.0",
42+
"symfony/var-dumper": "^4.3.7|^5.0"
4343
},
4444
"suggest": {
4545
"symfony/messenger": "To use the Messenger integration"

phpstan.neon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
autoload_files:
3-
- vendor/bin/.phpunit/phpunit-7.4/vendor/autoload.php
3+
- vendor/bin/.phpunit/phpunit-8.3-0/vendor/autoload.php
44
ignoreErrors:
55
# Intended
6-
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::.*\.#'
6+
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder::root\(\)\.#'

src/DataCollector/MercureDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(iterable $publishers)
3030
$this->publishers = $publishers;
3131
}
3232

33-
public function collect(Request $request, Response $response, \Exception $exception = null): void
33+
public function collect(Request $request, Response $response, \Throwable $exception = null): void
3434
{
3535
$this->data = [
3636
'count' => 0,

0 commit comments

Comments
 (0)