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.

Sign up for GitHub

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

Add Symfony 7 support #139

Merged
merged 41 commits into from
Jul 3, 2024
Merged

Add Symfony 7 support #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
6b6e7ef
Update Dependecies
May 21, 2024
f16a0d5
Set TreeBuilder Interface
May 21, 2024
d1db4bd
Update php versions in tests
May 21, 2024
939d737
Update composer.json
TheCadien May 21, 2024
89b5c56
Remove 5.0 support of php-matcher
May 22, 2024
fbed77a
Fix tests
May 22, 2024
157ff4d
Remove old php versions
May 22, 2024
77d84e2
Update PHPUnit
May 22, 2024
c6e1c23
Update PHPStan
May 22, 2024
f118784
update phpstan-prophecy
May 22, 2024
b98bc88
update phpstan-strict-rules
May 22, 2024
42fe066
Fix lint
May 22, 2024
d92c588
Change Tests for different Sulu Versions
May 28, 2024
5e5e398
Add min release for php matcher
May 28, 2024
fb023ac
set php matcher to 6.0.15
May 28, 2024
f273908
test again
May 28, 2024
849c5d8
Set Min version to 13
May 28, 2024
a9e4c42
Remove empty line
May 28, 2024
b63bf87
Run CS fixer
May 28, 2024
3d7f9f4
try higher phpunit version
May 28, 2024
ca4e743
Update phpunit
May 28, 2024
cb78135
try massiv search 2.9.1
May 28, 2024
9874ca4
Change Tests and minimum to php 8
May 30, 2024
10de126
Fix version typo
May 30, 2024
9fc87f3
Allow lower phper matcher
May 30, 2024
ce5fbb4
downgrade phpunit
May 30, 2024
119b136
try special php version
May 30, 2024
378dc46
try php 9.6
May 30, 2024
fccc294
Add Symfony 7 support
Jun 10, 2024
52bd36d
Test against Symfony 7 compatibility
alexander-schranz Jun 10, 2024
e3701ee
Test Symfony 7
alexander-schranz Jun 10, 2024
059da68
Fix test for dev branch
alexander-schranz Jun 10, 2024
0da65f9
Test 8.2 and 8.3 PHP against Symfony 7 rest against stable branches
alexander-schranz Jun 10, 2024
84b5bf6
Fix failing Symfony 6.0 tests by require atleast 5.4 or 6.3
alexander-schranz Jun 10, 2024
588eafd
Fix PHP 8.0 compatibility for tests to avoid mixed versions there
alexander-schranz Jun 10, 2024
7d14e43
Remove not required security bundle requirement
alexander-schranz Jun 10, 2024
d19f9cf
Merge branch 'symfony-7-support' of github.com:TheCadien/SuluHeadless…
Jun 19, 2024
6e3bd27
Remove fork
alexander-schranz Jun 27, 2024
6c378d7
Remove fork branch installation
alexander-schranz Jun 28, 2024
958213b
Upgrade jackalope for symfony/console 7.0
alexander-schranz Jul 2, 2024
ba3f34c
Fix PHP 7.3 compatibility
alexander-schranz Jul 3, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/test-application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
runs-on: ubuntu-latest

env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DATABASE_URL: mysql://root:root@127.0.0.1:3306/su_headless_test?serverVersion=5.7
DATABASE_CHARSET: utf8mb4
DATABASE_COLLATE: utf8mb4_unicode_ci
Expand Down Expand Up @@ -111,6 +112,7 @@ jobs:
runs-on: ubuntu-latest

env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DATABASE_URL: mysql://root:root@127.0.0.1:3306/su_headless_test?serverVersion=5.7
DATABASE_CHARSET: utf8mb4
DATABASE_COLLATE: utf8mb4_unicode_ci
Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

class Configuration implements ConfigurationInterface
{
public function getConfigTreeBuilder()
public function getConfigTreeBuilder(): TreeBuilder
{
$treeBuilder = new TreeBuilder('sulu_headless');
$rootNode = $treeBuilder->getRootNode();
Expand Down
7 changes: 6 additions & 1 deletion Tests/Functional/Controller/NavigationControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,13 @@ protected function setUp(): void
public function provideAttributes(): \Generator
{
$path = '';

$suluSuluVersion = \Composer\InstalledVersions::getVersion('sulu/sulu');

/* Todo Can be removed after ending support of sulu 2.5 */
if (\version_compare(\Composer\InstalledVersions::getVersion('sulu/sulu') ?? '999.999.999', '2.6.0', '<')
if ($suluSuluVersion
&& \version_compare($suluSuluVersion, '2.6.0', '<')
&& 0 !== \strpos($suluSuluVersion, 'dev-')
) {
$path = '/legacy/';
}
Expand Down
20 changes: 10 additions & 10 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"require": {
"php": "^7.3 || ^8.0",
"sulu/sulu": "^2.4 || ^2.5@dev",
"symfony/config": "^4.4 || ^5.0 || ^6.0",
"symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
"symfony/http-foundation": "^4.4 || ^5.0 || ^6.0",
"symfony/http-kernel": "^4.4 || ^5.0 || ^6.0"
"symfony/config": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/framework-bundle": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.3 || ^7.0"
},
"require-dev": {
"coduo/php-matcher": "^5.0 || ^6.0",
"handcraftedinthealps/code-coverage-checker": "^0.2.1",
"handcraftedinthealps/zendsearch": "^2.0",
"jackalope/jackalope-doctrine-dbal": "^1.3.4",
"jackalope/jackalope-doctrine-dbal": "^1.3.4 || ^2.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheCadien PS: the jackalope versions need also be upgrade to support Symfony 7 else you still will get Symfony 6.4 for example for symfony/console.

"jangregor/phpstan-prophecy": "^1.0",
"php-cs-fixer/shim": "^3.0",
"phpspec/prophecy": "^1.8",
Expand All @@ -26,10 +26,10 @@
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^9.6",
"symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
"symfony/console": "^4.4 || ^5.0 || ^6.0",
"symfony/dotenv": "^4.4 || ^5.0 || ^6.0",
"symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
"symfony/browser-kit": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/console": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/dotenv": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/error-handler": "^4.4 || ^5.4 || ^6.3 || ^7.0",
"symfony/monolog-bundle": "^3.1",
"thecodingmachine/phpstan-strict-rules": "^1.0"
},
Expand Down