test: compatibility with Symfony 6.4 (#5706)

* test: compatibility with Symfony 6.4 * fix deprec
api-platform · Jul 28, 2023 · e692071 · e692071
1 parent f0698a4
commit e692071
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 141 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
         "behat/mink": "^1.9",
         "doctrine/cache": "^1.11 || ^2.1",
         "doctrine/common": "^3.2.2",
-        "doctrine/data-fixtures": "^1.2.2",
         "doctrine/dbal": "^3.4.0",
         "doctrine/doctrine-bundle": "^1.12 || ^2.0",
         "doctrine/mongodb-odm": "^2.2",

diff --git a/tests/Fixtures/DummyCompoundValidatedEntity.php b/tests/Fixtures/DummyCompoundValidatedEntity.php
@@ -19,8 +19,7 @@ class DummyCompoundValidatedEntity
 {
     /**
      * @var string
-     *
-     * @DummyCompoundRequirements
      */
+    #[DummyCompoundRequirements]
     public $dummy;
 }
diff --git a/tests/Fixtures/DummyCountValidatedEntity.php b/tests/Fixtures/DummyCountValidatedEntity.php
@@ -19,22 +19,19 @@ class DummyCountValidatedEntity
 {
     /**
      * @var array
-     *
-     * @Assert\Count(min=1)
      */
+    #[Assert\Count(min: 1)]
     public $dummyMin;
 
     /**
      * @var array
-     *
-     * @Assert\Count(max=10)
      */
+    #[Assert\Count(max: 10)]
     public $dummyMax;
 
     /**
      * @var array
-     *
-     * @Assert\Count(min=1, max=10)
      */
+    #[Assert\Count(min: 1, max: 10)]
     public $dummyMinMax;
 }
diff --git a/tests/Fixtures/DummyIgnoreProperty.php b/tests/Fixtures/DummyIgnoreProperty.php
@@ -20,15 +20,10 @@ class DummyIgnoreProperty
 {
     public $visibleWithoutGroup;
 
-    /**
-     * @Groups({"dummy"})
-     */
+    #[Groups('dummy')]
     public $visibleWithGroup;
 
-    /**
-     * @Groups({"dummy"})
-     *
-     * @Ignore
-     */
+    #[Groups('dummy')]
+    #[Ignore]
     public $ignored;
 }
diff --git a/tests/Fixtures/DummyIriWithValidationEntity.php b/tests/Fixtures/DummyIriWithValidationEntity.php
@@ -22,73 +22,45 @@
  */
 class DummyIriWithValidationEntity
 {
-    /**
-     * @Assert\Url
-     */
+    #[Assert\Url]
     public $dummyUrl;
 
-    /**
-     * @Assert\Email
-     */
+    #[Assert\Email]
     public $dummyEmail;
 
-    /**
-     * @Assert\Uuid
-     */
+    #[Assert\Uuid]
     public $dummyUuid;
 
-    /**
-     * @Assert\CardScheme(schemes="MASTERCARD")
-     */
+    #[Assert\CardScheme(schemes: 'MASTERCARD')]
     public $dummyCardScheme;
 
-    /**
-     * @Assert\Bic
-     */
+    #[Assert\Bic]
     public $dummyBic;
 
-    /**
-     * @Assert\Iban
-     */
+    #[Assert\Iban]
     public $dummyIban;
 
-    /**
-     * @Assert\Date
-     */
+    #[Assert\Date]
     public $dummyDate;
 
-    /**
-     * @Assert\DateTime
-     */
+    #[Assert\DateTime]
     public $dummyDateTime;
 
-    /**
-     * @Assert\Time
-     */
+    #[Assert\Time]
     public $dummyTime;
 
-    /**
-     * @Assert\Image
-     */
+    #[Assert\Image]
     public $dummyImage;
 
-    /**
-     * @Assert\File
-     */
+    #[Assert\File]
     public $dummyFile;
 
-    /**
-     * @Assert\Currency
-     */
+    #[Assert\Currency]
     public $dummyCurrency;
 
-    /**
-     * @Assert\Isbn
-     */
+    #[Assert\Isbn]
     public $dummyIsbn;
 
-    /**
-     * @Assert\Issn
-     */
+    #[Assert\Issn]
     public $dummyIssn;
 }
diff --git a/tests/Fixtures/DummyNumericValidatedEntity.php b/tests/Fixtures/DummyNumericValidatedEntity.php
@@ -19,57 +19,49 @@ class DummyNumericValidatedEntity
 {
     /**
      * @var int
-     *
-     * @Assert\GreaterThan(value=10)
      */
+    #[Assert\GreaterThan(value: 10)]
     public $greaterThanMe;
 
     /**
      * @var float
-     *
-     * @Assert\GreaterThanOrEqual(value=10.99)
      */
+    #[Assert\GreaterThanOrEqual(value: '10.99')]
     public $greaterThanOrEqualToMe;
 
     /**
      * @var int
-     *
-     * @Assert\LessThan(value=99)
      */
+    #[Assert\LessThan(value: 99)]
     public $lessThanMe;
 
     /**
      * @var float
-     *
-     * @Assert\LessThanOrEqual(value=99.33)
      */
+    #[Assert\LessThanOrEqual(value: '99.33')]
     public $lessThanOrEqualToMe;
 
     /**
      * @var int
-     *
-     * @Assert\Positive
      */
+    #[Assert\Positive]
     public $positive;
 
     /**
      * @var int
-     *
-     * @Assert\PositiveOrZero
      */
+    #[Assert\PositiveOrZero]
     public $positiveOrZero;
 
     /**
      * @var int
-     *
-     * @Assert\Negative
      */
+    #[Assert\Negative]
     public $negative;
 
     /**
      * @var int
-     *
-     * @Assert\NegativeOrZero
      */
+    #[Assert\NegativeOrZero]
     public $negativeOrZero;
 }
diff --git a/tests/Fixtures/DummyRangeValidatedEntity.php b/tests/Fixtures/DummyRangeValidatedEntity.php
@@ -19,43 +19,37 @@ class DummyRangeValidatedEntity
 {
     /**
      * @var int
-     *
-     * @Assert\Range(min=1)
      */
+    #[Assert\Range(min: 1)]
     public $dummyIntMin;
 
     /**
      * @var int
-     *
-     * @Assert\Range(max=10)
      */
+    #[Assert\Range(max: 10)]
     public $dummyIntMax;
 
     /**
      * @var int
-     *
-     * @Assert\Range(min=1, max=10)
      */
+    #[Assert\Range(min: 1, max: 10)]
     public $dummyIntMinMax;
 
     /**
      * @var float
-     *
-     * @Assert\Range(min=1.5)
      */
+    #[Assert\Range(min: '1.5')]
     public $dummyFloatMin;
 
     /**
      * @var float
-     *
-     * @Assert\Range(max=10.5)
      */
+    #[Assert\Range(max: '10.5')]
     public $dummyFloatMax;
 
     /**
      * @var float
-     *
-     * @Assert\Range(min=1.5, max=10.5)
      */
+    #[Assert\Range(min: '1.5', max: '10.5')]
     public $dummyFloatMinMax;
 }
diff --git a/tests/Fixtures/DummyUniqueValidatedEntity.php b/tests/Fixtures/DummyUniqueValidatedEntity.php
@@ -19,8 +19,7 @@ class DummyUniqueValidatedEntity
 {
     /**
      * @var string[]
-     *
-     * @Assert\Unique
      */
+    #[Assert\Unique]
     public $dummyItems;
 }
diff --git a/tests/Fixtures/DummyValidatedChoiceEntity.php b/tests/Fixtures/DummyValidatedChoiceEntity.php
@@ -19,51 +19,44 @@ class DummyValidatedChoiceEntity
 {
     /**
      * @var string
-     *
-     * @Assert\Choice(choices={"a", "b"})
      */
+    #[Assert\Choice(choices: ['a', 'b'])]
     public $dummySingleChoice;
 
     /**
      * @var string
-     *
-     * @Assert\Choice(callback={DummyValidatedChoiceEntity::class, "getChoices"})
      */
+    #[Assert\Choice(callback: [self::class, 'getChoices'])]
     public $dummySingleChoiceCallback;
 
     /**
      * @var string[]
-     *
-     * @Assert\Choice(choices={"a", "b"}, multiple=true)
      */
+    #[Assert\Choice(choices: ['a', 'b'], multiple: true)]
     public $dummyMultiChoice;
 
     /**
      * @var string[]
-     *
-     * @Assert\Choice(callback={DummyValidatedChoiceEntity::class, "getChoices"}, multiple=true)
      */
+    #[Assert\Choice(callback: [self::class, 'getChoices'], multiple: true)]
     public $dummyMultiChoiceCallback;
 
     /**
      * @var string[]
-     *
-     * @Assert\Choice(choices={"a", "b", "c", "d"}, multiple=true, min=2)
      */
+    #[Assert\Choice(choices: ['a', 'b', 'c', 'd'], multiple: true, min: 2)]
     public $dummyMultiChoiceMin;
 
     /**
      * @var string[]
-     *
-     * @Assert\Choice(choices={"a", "b", "c", "d"}, multiple=true, max=4)
      */
+    #[Assert\Choice(choices: ['a', 'b', 'c', 'd'], multiple: true, max: 4)]
     public $dummyMultiChoiceMax;
 
     /**
      * @var string[]
-     *
-     * @Assert\Choice(choices={"a", "b", "c", "d"}, multiple=true, min=2, max=4)
      */
+    #[Assert\Choice(choices: ['a', 'b', 'c', 'd'], multiple: true, min: 2, max: 4)]
     public $dummyMultiChoiceMinMax;
 
     public static function getChoices(): array

diff --git a/tests/Fixtures/DummyValidatedHostnameEntity.php b/tests/Fixtures/DummyValidatedHostnameEntity.php
@@ -19,8 +19,7 @@ class DummyValidatedHostnameEntity
 {
     /**
      * @var string
-     *
-     * @Assert\Hostname
      */
+    #[Assert\Hostname]
     public $dummyHostname;
 }
diff --git a/tests/Fixtures/DummyValidatedUlidEntity.php b/tests/Fixtures/DummyValidatedUlidEntity.php
@@ -19,8 +19,7 @@ class DummyValidatedUlidEntity
 {
     /**
      * @var string
-     *
-     * @Assert\Ulid
      */
+    #[Assert\Ulid]
     public $dummyUlid;
 }
diff --git a/tests/Fixtures/NotAResource.php b/tests/Fixtures/NotAResource.php
@@ -23,13 +23,9 @@
 class NotAResource
 {
     public function __construct(
-        /**
-         * @Groups("contain_non_resource")
-         */
+        #[Groups('contain_non_resource')]
         private $foo,
-        /**
-         * @Groups("contain_non_resource")
-         */
+        #[Groups('contain_non_resource')]
         private $bar
     ) {
     }

diff --git a/tests/Fixtures/TestBundle/Controller/Common/CustomController.php b/tests/Fixtures/TestBundle/Controller/Common/CustomController.php
@@ -26,9 +26,8 @@ class CustomController extends AbstractController
 {
     /**
      * Custom route for a non API Platform route.
-     *
-     * @Route(methods={"GET"}, name="custom_external_route", path="/common/custom/object")
      */
+    #[Route(methods: ['GET'], name: 'custom_external_route', path: '/common/custom/object')]
     public function __invoke(): CustomObject
     {
         return new CustomObject(1, 'Lorem ipsum dolor sit amet');