Skip to content

Commit 60d9a0c

Browse files
hlecorchehlecorche
committed
Add Symfony 8.0 support
1 parent 1bcfa44 commit 60d9a0c

File tree

7 files changed

+48
-34
lines changed

7 files changed

+48
-34
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ jobs:
2626
symfony-version: '7.4.*'
2727
composer-flags: '--prefer-stable --prefer-lowest'
2828
description: 'with SF 7.4.* lowest'
29+
- php-version: '8.4'
30+
symfony-version: '8.0.*'
31+
composer-flags: '--prefer-stable --prefer-lowest'
32+
description: 'with SF 8.0.* lowest'
2933

3034
#Symfony versions
3135
- php-version: '8.5'
@@ -46,6 +50,15 @@ jobs:
4650
- php-version: '8.5'
4751
symfony-version: '7.4.*@dev'
4852
description: 'with SF 7.4.* dev'
53+
- php-version: '8.5'
54+
symfony-version: '8.0.*'
55+
description: 'with SF 8.0.*'
56+
- php-version: '8.5'
57+
symfony-version: '8.0.*@dev'
58+
description: 'with SF 8.0.* dev'
59+
- php-version: '8.5'
60+
symfony-version: '8.1.*@dev'
61+
description: 'with SF 8.1.* dev'
4962

5063
#PHP versions
5164
- php-version: '8.1'
@@ -142,6 +155,7 @@ jobs:
142155
if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
143156
run: |
144157
sed -i 's/protected function doRequest(\$request)/protected function doRequest(object $request): object/' vendor/symfony/panther/src/Client.php
158+
sed -i 's#public function closest(string $selector): ?self#public function closest(string $selector): ?static#' vendor/symfony/panther/src/DomCrawler/Crawler.php
145159
146160
- name: Run PHPUnit
147161
if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true

‎composer.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,29 @@
2222
"ecommit/paginator": "^1.0",
2323
"ecommit/scalar-values": "^1.0",
2424
"psr/container": "^1.1|^2.0",
25-
"symfony/asset": "^6.4|^7.3",
26-
"symfony/config": "^6.4|^7.3",
27-
"symfony/dependency-injection": "^6.4|^7.3",
28-
"symfony/doctrine-bridge": "^6.4|^7.3",
29-
"symfony/form": "^6.4|^7.3",
30-
"symfony/framework-bundle": "^6.4|^7.3",
31-
"symfony/http-client": "^6.4|^7.3",
25+
"symfony/asset": "^6.4|^7.3|^8.0",
26+
"symfony/config": "^6.4|^7.3|^8.0",
27+
"symfony/dependency-injection": "^6.4|^7.3|^8.0",
28+
"symfony/doctrine-bridge": "^6.4|^7.3|^8.0",
29+
"symfony/form": "^6.4|^7.3|^8.0",
30+
"symfony/framework-bundle": "^6.4|^7.3|^8.0",
31+
"symfony/http-client": "^6.4|^7.3|^8.0",
3232
"symfony/http-client-contracts": "^2.4|^3.0",
33-
"symfony/http-foundation": "^6.4|^7.3",
34-
"symfony/http-kernel": "^6.4|^7.3",
35-
"symfony/intl": "^6.4|^7.3",
36-
"symfony/options-resolver": "^6.4|^7.3",
37-
"symfony/property-access": "^6.4|^7.3",
38-
"symfony/routing": "^6.4|^7.3",
39-
"symfony/security-bundle": "^6.4|^7.3",
40-
"symfony/security-core": "^6.4|^7.3",
41-
"symfony/security-csrf": "^6.4|^7.3",
33+
"symfony/http-foundation": "^6.4|^7.3|^8.0",
34+
"symfony/http-kernel": "^6.4|^7.3|^8.0",
35+
"symfony/intl": "^6.4|^7.3|^8.0",
36+
"symfony/options-resolver": "^6.4|^7.3|^8.0",
37+
"symfony/property-access": "^6.4|^7.3|^8.0",
38+
"symfony/routing": "^6.4|^7.3|^8.0",
39+
"symfony/security-bundle": "^6.4|^7.3|^8.0",
40+
"symfony/security-core": "^6.4|^7.3|^8.0",
41+
"symfony/security-csrf": "^6.4|^7.3|^8.0",
4242
"symfony/service-contracts": "^1.1.6|^2|^3",
43-
"symfony/translation": "^6.4|^7.3",
43+
"symfony/translation": "^6.4|^7.3|^8.0",
4444
"symfony/translation-contracts": "^2.3|^3.0",
45-
"symfony/twig-bridge": "^6.4|^7.3",
46-
"symfony/twig-bundle": "^6.4|^7.3",
47-
"symfony/validator": "^6.4|^7.3",
45+
"symfony/twig-bridge": "^6.4|^7.3|^8.0",
46+
"symfony/twig-bundle": "^6.4|^7.3|^8.0",
47+
"symfony/validator": "^6.4|^7.3|^8.0",
4848
"twig/twig": "^2.12.0|^3.0"
4949
},
5050
"require-dev": {
@@ -54,10 +54,10 @@
5454
"doctrine/doctrine-fixtures-bundle": "^3.4.2",
5555
"friendsofphp/php-cs-fixer": "^3.0",
5656
"phpunit/phpunit": "^9.0",
57-
"symfony/dom-crawler": "^6.4|^7.3",
57+
"symfony/dom-crawler": "^6.4|^7.3|^8.0",
5858
"symfony/panther": "^2.0.1",
5959
"symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
60-
"symfony/yaml": "^6.4|^7.3",
60+
"symfony/yaml": "^6.4|^7.3|^8.0",
6161
"vimeo/psalm": "^5.0"
6262
},
6363
"autoload": {

‎src/Form/Filter/CollectionFilterTrait.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ protected function getCollectionTypeOptions(array $options): array
2525
$constraints = [];
2626
if ($options['multiple']) {
2727
$constraints = [
28-
new Assert\Count([
29-
'min' => $options['min'],
30-
'max' => $options['max'],
31-
]),
28+
new Assert\Count(
29+
min: $options['min'],
30+
max: $options['max'],
31+
),
3232
];
3333
}
3434

‎src/Form/Filter/TextFilter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
2424
{
2525
$typeOptions = $this->getTypeOptions($options, [
2626
'constraints' => [
27-
new Assert\Length([
28-
'min' => $options['min_length'],
29-
'max' => $options['max_length'],
30-
]),
27+
new Assert\Length(
28+
min: $options['min_length'],
29+
max: $options['max_length'],
30+
),
3131
],
3232
]);
3333
$builder->addField($property, $options['type'], $typeOptions);

‎src/Form/Type/DisplaySettingsType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
5050
'label' => 'display_settings.displayed_columns',
5151
'translation_domain' => 'EcommitCrudBundle',
5252
'choice_translation_domain' => 'messages',
53-
'constraints' => [new NotBlank(), new Count(['min' => 1])],
53+
'constraints' => [new NotBlank(), new Count(min: 1)],
5454
]);
5555

5656
$builder->add('reset', ButtonType::class, [
@@ -81,7 +81,7 @@ public function configureOptions(OptionsResolver $resolver): void
8181
]);
8282
}
8383

84-
public function getBlockPrefix()
84+
public function getBlockPrefix(): string
8585
{
8686
return 'crud_display_settings';
8787
}

‎src/Form/Type/EntityAjaxType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function configureOptions(OptionsResolver $resolver): void
135135
$resolver->setNormalizer('identifier', $identifierNormalizer);
136136
}
137137

138-
public function getBlockPrefix()
138+
public function getBlockPrefix(): string
139139
{
140140
return 'ecommit_crud_entity_ajax';
141141
}

‎src/Form/Type/FormSearchType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function configureOptions(OptionsResolver $resolver): void
3131
]);
3232
}
3333

34-
public function getBlockPrefix()
34+
public function getBlockPrefix(): string
3535
{
3636
return 'crud_search';
3737
}

0 commit comments

Comments
 (0)