Skip to content

Commit 5a25efe

Browse files
authored
IBX-8470: Upgraded codebase to Symfony 6 (#9)
* [Composer] Bumped Symfony packages requirements to ^6.4 * [Composer][CS] Bumped Ibexa Code Style to ~2.0.0 * [CS] Fixed outstanding CS issue in EndpointRequestDefinitionTest * [Composer] Bumped PHP requirement to >=8.3 * [CI] Switched GHA jobs to run on PHP 8.3 only * [CI] Bumped versions of 3rd party GHA actions * [Security] Refactored Symfony User mocking for Symfony 6
1 parent a212385 commit 5a25efe

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
strategy:
1515
matrix:
1616
php:
17-
- '8.0'
17+
- '8.3'
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Setup PHP Action
2222
uses: shivammathur/setup-php@v2
@@ -26,7 +26,7 @@ jobs:
2626
extensions: 'pdo_sqlite, gd'
2727
tools: cs2pr
2828

29-
- uses: ramsey/composer-install@v2
29+
- uses: ramsey/composer-install@v3
3030
with:
3131
dependency-versions: highest
3232

@@ -42,13 +42,10 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
php:
45-
- '7.4'
46-
- '8.0'
47-
- '8.1'
48-
- '8.2'
45+
- '8.3'
4946

5047
steps:
51-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
5249

5350
- name: Setup PHP Action
5451
uses: shivammathur/setup-php@v2
@@ -58,7 +55,7 @@ jobs:
5855
extensions: pdo_sqlite, gd
5956
tools: cs2pr
6057

61-
- uses: ramsey/composer-install@v2
58+
- uses: ramsey/composer-install@v3
6259
with:
6360
dependency-versions: highest
6461

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
"minimum-stability": "dev",
1010
"prefer-stable": true,
1111
"require": {
12-
"php": "^7.4 || ^8.0",
13-
"ext-json": "*",
12+
"php": ">=8.3",
1413
"ext-dom": "*",
14+
"ext-json": "*",
1515
"ibexa/test-core": "~5.0.x-dev",
1616
"justinrainbow/json-schema": "^5.2",
17-
"symfony/browser-kit": "^5.4",
18-
"symfony/mime": "^5.4",
19-
"symfony/proxy-manager-bridge": "^5.4",
20-
"symfony/translation": "^5.4",
21-
"symfony/validator": "^5.4"
17+
"symfony/browser-kit": "^6.4",
18+
"symfony/mime": "^6.4",
19+
"symfony/proxy-manager-bridge": "^6.4",
20+
"symfony/translation": "^6.4",
21+
"symfony/validator": "^6.4"
2222
},
2323
"require-dev": {
24-
"ibexa/code-style": "^1.1",
24+
"ibexa/code-style": "~2.0.0",
2525
"ibexa/core": "~5.0.x-dev",
2626
"ibexa/doctrine-schema": "~5.0.x-dev",
2727
"phpstan/phpstan": "^1.2",

src/contracts/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private function getUser(): UserWrapped
7070
$apiUser = $userService->loadUserByLogin('admin');
7171
$symfonyUser = $this->createMock(UserInterface::class);
7272
$symfonyUser->method('getRoles')->willReturn(['ROLE_USER']);
73-
$symfonyUser->method('getUsername')->willReturn('admin');
73+
$symfonyUser->method('getUserIdentifier')->willReturn('admin');
7474

7575
return new UserWrapped($symfonyUser, $apiUser);
7676
}

tests/lib/Request/Value/EndpointRequestDefinitionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
final class EndpointRequestDefinitionTest extends TestCase
1919
{
2020
/**
21-
* @return iterable<string, array{null|string, 'xml'|'json'}>
21+
* @return iterable<string, array{string|null, 'xml'|'json'}>
2222
*/
2323
public function getDataForTestExtractFormatFromAcceptHeader(): iterable
2424
{

0 commit comments

Comments
 (0)