Skip to content

Commit 51872e9

Browse files
authored
Merge pull request #23 from phpro/PHP83
Allow PHP83
2 parents 466aabf + 434f720 commit 51872e9

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/grumphp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.0', '8.1', '8.2']
10+
php-versions: ['8.1', '8.2', '8.3']
1111
composer-options: ['', '--prefer-lowest']
1212
fail-fast: false
1313
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}
@@ -39,4 +39,4 @@ jobs:
3939
- name: Run the tests
4040
run: php vendor/bin/grumphp run --no-interaction
4141
env:
42-
PHP_CS_FIXER_IGNORE_ENV: 1
42+
PHP_CS_FIXER_IGNORE_ENV: 1

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.0",
13+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
1414
"phpro/api-problem": "^1.0",
15-
"symfony/dependency-injection": "^5.4 || ^6.0",
16-
"symfony/event-dispatcher": "^5.4 || ^6.0",
17-
"symfony/http-kernel": "^5.4 || ^6.0"
15+
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
16+
"symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
17+
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
1818
},
1919
"require-dev": {
20-
"friendsofphp/php-cs-fixer": "^3.13",
20+
"friendsofphp/php-cs-fixer": "^3.39",
2121
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
22-
"phpro/grumphp-shim": "^1.14.0",
22+
"phpro/grumphp-shim": "^2.3",
2323
"phpspec/prophecy-phpunit": "^2.0",
24-
"phpspec/prophecy": "1.15",
24+
"phpspec/prophecy": "^1.17",
2525
"phpunit/phpunit": "^9.5",
26-
"symfony/security-core": "^5.4 || ^6.0"
26+
"symfony/security-core": "^5.4 || ^6.0 || ^7.0"
2727
},
2828
"config": {
2929
"sort-packages": true,

src/EventListener/JsonApiProblemExceptionListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function onKernelException(ExceptionEvent $event): void
3535
{
3636
$request = $event->getRequest();
3737
if (
38-
false === mb_strpos($request->getPreferredFormat(), 'json') &&
39-
false === mb_strpos((string) $request->getContentType(), 'json')
38+
false === mb_strpos($request->getPreferredFormat(), 'json')
39+
&& false === mb_strpos((string) $request->getContentType(), 'json')
4040
) {
4141
return;
4242
}

test/Transformer/ChainTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function it_transforms_to_basic_exception_problem_when_no_transformer_mat
5555
$this->assertInstanceOf(ExceptionApiProblem::class, $transformer->transform(new Exception()));
5656
}
5757

58-
private function mockTransformer(bool $accepts, ?ApiProblemInterface $apiProblem = null): ExceptionTransformerInterface
58+
private function mockTransformer(bool $accepts, ApiProblemInterface $apiProblem = null): ExceptionTransformerInterface
5959
{
6060
/** @var ExceptionTransformerInterface|ObjectProphecy $transformer */
6161
$transformer = $this->prophesize(ExceptionTransformerInterface::class);

0 commit comments

Comments
 (0)