Skip to content

Commit e692071

Browse files
authored
test: compatibility with Symfony 6.4 (#5706)
* test: compatibility with Symfony 6.4 * fix deprec
1 parent f0698a4 commit e692071

18 files changed

+73
-141
lines changed

composer.json

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"behat/mink": "^1.9",
3232
"doctrine/cache": "^1.11 || ^2.1",
3333
"doctrine/common": "^3.2.2",
34-
"doctrine/data-fixtures": "^1.2.2",
3534
"doctrine/dbal": "^3.4.0",
3635
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
3736
"doctrine/mongodb-odm": "^2.2",

tests/Fixtures/DummyCompoundValidatedEntity.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class DummyCompoundValidatedEntity
1919
{
2020
/**
2121
* @var string
22-
*
23-
* @DummyCompoundRequirements
2422
*/
23+
#[DummyCompoundRequirements]
2524
public $dummy;
2625
}

tests/Fixtures/DummyCountValidatedEntity.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,19 @@ class DummyCountValidatedEntity
1919
{
2020
/**
2121
* @var array
22-
*
23-
* @Assert\Count(min=1)
2422
*/
23+
#[Assert\Count(min: 1)]
2524
public $dummyMin;
2625

2726
/**
2827
* @var array
29-
*
30-
* @Assert\Count(max=10)
3128
*/
29+
#[Assert\Count(max: 10)]
3230
public $dummyMax;
3331

3432
/**
3533
* @var array
36-
*
37-
* @Assert\Count(min=1, max=10)
3834
*/
35+
#[Assert\Count(min: 1, max: 10)]
3936
public $dummyMinMax;
4037
}

tests/Fixtures/DummyIgnoreProperty.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@ class DummyIgnoreProperty
2020
{
2121
public $visibleWithoutGroup;
2222

23-
/**
24-
* @Groups({"dummy"})
25-
*/
23+
#[Groups('dummy')]
2624
public $visibleWithGroup;
2725

28-
/**
29-
* @Groups({"dummy"})
30-
*
31-
* @Ignore
32-
*/
26+
#[Groups('dummy')]
27+
#[Ignore]
3328
public $ignored;
3429
}

tests/Fixtures/DummyIriWithValidationEntity.php

+14-42
Original file line numberDiff line numberDiff line change
@@ -22,73 +22,45 @@
2222
*/
2323
class DummyIriWithValidationEntity
2424
{
25-
/**
26-
* @Assert\Url
27-
*/
25+
#[Assert\Url]
2826
public $dummyUrl;
2927

30-
/**
31-
* @Assert\Email
32-
*/
28+
#[Assert\Email]
3329
public $dummyEmail;
3430

35-
/**
36-
* @Assert\Uuid
37-
*/
31+
#[Assert\Uuid]
3832
public $dummyUuid;
3933

40-
/**
41-
* @Assert\CardScheme(schemes="MASTERCARD")
42-
*/
34+
#[Assert\CardScheme(schemes: 'MASTERCARD')]
4335
public $dummyCardScheme;
4436

45-
/**
46-
* @Assert\Bic
47-
*/
37+
#[Assert\Bic]
4838
public $dummyBic;
4939

50-
/**
51-
* @Assert\Iban
52-
*/
40+
#[Assert\Iban]
5341
public $dummyIban;
5442

55-
/**
56-
* @Assert\Date
57-
*/
43+
#[Assert\Date]
5844
public $dummyDate;
5945

60-
/**
61-
* @Assert\DateTime
62-
*/
46+
#[Assert\DateTime]
6347
public $dummyDateTime;
6448

65-
/**
66-
* @Assert\Time
67-
*/
49+
#[Assert\Time]
6850
public $dummyTime;
6951

70-
/**
71-
* @Assert\Image
72-
*/
52+
#[Assert\Image]
7353
public $dummyImage;
7454

75-
/**
76-
* @Assert\File
77-
*/
55+
#[Assert\File]
7856
public $dummyFile;
7957

80-
/**
81-
* @Assert\Currency
82-
*/
58+
#[Assert\Currency]
8359
public $dummyCurrency;
8460

85-
/**
86-
* @Assert\Isbn
87-
*/
61+
#[Assert\Isbn]
8862
public $dummyIsbn;
8963

90-
/**
91-
* @Assert\Issn
92-
*/
64+
#[Assert\Issn]
9365
public $dummyIssn;
9466
}

tests/Fixtures/DummyNumericValidatedEntity.php

+8-16
Original file line numberDiff line numberDiff line change
@@ -19,57 +19,49 @@ class DummyNumericValidatedEntity
1919
{
2020
/**
2121
* @var int
22-
*
23-
* @Assert\GreaterThan(value=10)
2422
*/
23+
#[Assert\GreaterThan(value: 10)]
2524
public $greaterThanMe;
2625

2726
/**
2827
* @var float
29-
*
30-
* @Assert\GreaterThanOrEqual(value=10.99)
3128
*/
29+
#[Assert\GreaterThanOrEqual(value: '10.99')]
3230
public $greaterThanOrEqualToMe;
3331

3432
/**
3533
* @var int
36-
*
37-
* @Assert\LessThan(value=99)
3834
*/
35+
#[Assert\LessThan(value: 99)]
3936
public $lessThanMe;
4037

4138
/**
4239
* @var float
43-
*
44-
* @Assert\LessThanOrEqual(value=99.33)
4540
*/
41+
#[Assert\LessThanOrEqual(value: '99.33')]
4642
public $lessThanOrEqualToMe;
4743

4844
/**
4945
* @var int
50-
*
51-
* @Assert\Positive
5246
*/
47+
#[Assert\Positive]
5348
public $positive;
5449

5550
/**
5651
* @var int
57-
*
58-
* @Assert\PositiveOrZero
5952
*/
53+
#[Assert\PositiveOrZero]
6054
public $positiveOrZero;
6155

6256
/**
6357
* @var int
64-
*
65-
* @Assert\Negative
6658
*/
59+
#[Assert\Negative]
6760
public $negative;
6861

6962
/**
7063
* @var int
71-
*
72-
* @Assert\NegativeOrZero
7364
*/
65+
#[Assert\NegativeOrZero]
7466
public $negativeOrZero;
7567
}

tests/Fixtures/DummyRangeValidatedEntity.php

+6-12
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,37 @@ class DummyRangeValidatedEntity
1919
{
2020
/**
2121
* @var int
22-
*
23-
* @Assert\Range(min=1)
2422
*/
23+
#[Assert\Range(min: 1)]
2524
public $dummyIntMin;
2625

2726
/**
2827
* @var int
29-
*
30-
* @Assert\Range(max=10)
3128
*/
29+
#[Assert\Range(max: 10)]
3230
public $dummyIntMax;
3331

3432
/**
3533
* @var int
36-
*
37-
* @Assert\Range(min=1, max=10)
3834
*/
35+
#[Assert\Range(min: 1, max: 10)]
3936
public $dummyIntMinMax;
4037

4138
/**
4239
* @var float
43-
*
44-
* @Assert\Range(min=1.5)
4540
*/
41+
#[Assert\Range(min: '1.5')]
4642
public $dummyFloatMin;
4743

4844
/**
4945
* @var float
50-
*
51-
* @Assert\Range(max=10.5)
5246
*/
47+
#[Assert\Range(max: '10.5')]
5348
public $dummyFloatMax;
5449

5550
/**
5651
* @var float
57-
*
58-
* @Assert\Range(min=1.5, max=10.5)
5952
*/
53+
#[Assert\Range(min: '1.5', max: '10.5')]
6054
public $dummyFloatMinMax;
6155
}

tests/Fixtures/DummyUniqueValidatedEntity.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class DummyUniqueValidatedEntity
1919
{
2020
/**
2121
* @var string[]
22-
*
23-
* @Assert\Unique
2422
*/
23+
#[Assert\Unique]
2524
public $dummyItems;
2625
}

tests/Fixtures/DummyValidatedChoiceEntity.php

+7-14
Original file line numberDiff line numberDiff line change
@@ -19,51 +19,44 @@ class DummyValidatedChoiceEntity
1919
{
2020
/**
2121
* @var string
22-
*
23-
* @Assert\Choice(choices={"a", "b"})
2422
*/
23+
#[Assert\Choice(choices: ['a', 'b'])]
2524
public $dummySingleChoice;
2625

2726
/**
2827
* @var string
29-
*
30-
* @Assert\Choice(callback={DummyValidatedChoiceEntity::class, "getChoices"})
3128
*/
29+
#[Assert\Choice(callback: [self::class, 'getChoices'])]
3230
public $dummySingleChoiceCallback;
3331

3432
/**
3533
* @var string[]
36-
*
37-
* @Assert\Choice(choices={"a", "b"}, multiple=true)
3834
*/
35+
#[Assert\Choice(choices: ['a', 'b'], multiple: true)]
3936
public $dummyMultiChoice;
4037

4138
/**
4239
* @var string[]
43-
*
44-
* @Assert\Choice(callback={DummyValidatedChoiceEntity::class, "getChoices"}, multiple=true)
4540
*/
41+
#[Assert\Choice(callback: [self::class, 'getChoices'], multiple: true)]
4642
public $dummyMultiChoiceCallback;
4743

4844
/**
4945
* @var string[]
50-
*
51-
* @Assert\Choice(choices={"a", "b", "c", "d"}, multiple=true, min=2)
5246
*/
47+
#[Assert\Choice(choices: ['a', 'b', 'c', 'd'], multiple: true, min: 2)]
5348
public $dummyMultiChoiceMin;
5449

5550
/**
5651
* @var string[]
57-
*
58-
* @Assert\Choice(choices={"a", "b", "c", "d"}, multiple=true, max=4)
5952
*/
53+
#[Assert\Choice(choices: ['a', 'b', 'c', 'd'], multiple: true, max: 4)]
6054
public $dummyMultiChoiceMax;
6155

6256
/**
6357
* @var string[]
64-
*
65-
* @Assert\Choice(choices={"a", "b", "c", "d"}, multiple=true, min=2, max=4)
6658
*/
59+
#[Assert\Choice(choices: ['a', 'b', 'c', 'd'], multiple: true, min: 2, max: 4)]
6760
public $dummyMultiChoiceMinMax;
6861

6962
public static function getChoices(): array

tests/Fixtures/DummyValidatedHostnameEntity.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class DummyValidatedHostnameEntity
1919
{
2020
/**
2121
* @var string
22-
*
23-
* @Assert\Hostname
2422
*/
23+
#[Assert\Hostname]
2524
public $dummyHostname;
2625
}

tests/Fixtures/DummyValidatedUlidEntity.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class DummyValidatedUlidEntity
1919
{
2020
/**
2121
* @var string
22-
*
23-
* @Assert\Ulid
2422
*/
23+
#[Assert\Ulid]
2524
public $dummyUlid;
2625
}

tests/Fixtures/NotAResource.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@
2323
class NotAResource
2424
{
2525
public function __construct(
26-
/**
27-
* @Groups("contain_non_resource")
28-
*/
26+
#[Groups('contain_non_resource')]
2927
private $foo,
30-
/**
31-
* @Groups("contain_non_resource")
32-
*/
28+
#[Groups('contain_non_resource')]
3329
private $bar
3430
) {
3531
}

tests/Fixtures/TestBundle/Controller/Common/CustomController.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ class CustomController extends AbstractController
2626
{
2727
/**
2828
* Custom route for a non API Platform route.
29-
*
30-
* @Route(methods={"GET"}, name="custom_external_route", path="/common/custom/object")
3129
*/
30+
#[Route(methods: ['GET'], name: 'custom_external_route', path: '/common/custom/object')]
3231
public function __invoke(): CustomObject
3332
{
3433
return new CustomObject(1, 'Lorem ipsum dolor sit amet');

0 commit comments

Comments
 (0)