Merge branch 'master' into 2212-type-info

# Conflicts: # .github/workflows/continuous-integration.yml
nelmio · Jan 8, 2025 · f52013f · f52013f
2 parents bed716e + 13408ab
commit f52013f
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 31 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -38,26 +38,44 @@ jobs:
           - php-version: 8.1
             symfony-require: "5.4"
             doctrine-annotations: true
+          - php-version: 8.2
+            symfony-require: "5.4"
+            doctrine-annotations: true
           - php-version: 8.3
             symfony-require: "5.4"
             doctrine-annotations: true
+          - php-version: 8.4
+            symfony-require: "5.4"
+            doctrine-annotations: true
           - php-version: 8.1
             symfony-require: "6.4"
             doctrine-annotations: true
+          - php-version: 8.2
+            symfony-require: "6.4"
+            doctrine-annotations: true
           - php-version: 8.3
             symfony-require: "6.4"
             doctrine-annotations: true
+          - php-version: 8.4
+            symfony-require: "6.4"
+            doctrine-annotations: true
           - php-version: 8.2
-            symfony-require: "7.0"
+            symfony-require: "7.1"
             doctrine-annotations: false
           - php-version: 8.3
-            symfony-require: "7.0"
+            symfony-require: "7.1"
             doctrine-annotations: false
-          - php-version: 8.2
+          - php-version: 8.4
             symfony-require: "7.1"
             doctrine-annotations: false
+          - php-version: 8.2
+            symfony-require: "7.2"
+            doctrine-annotations: false
           - php-version: 8.3
-            symfony-require: "7.1"
+            symfony-require: "7.2"
+            doctrine-annotations: false
+          - php-version: 8.4
+            symfony-require: "7.2"
             doctrine-annotations: false
     steps:
       - name: Checkout
@@ -147,7 +165,7 @@ jobs:
       - name: Setup dependencies
         uses: ./.github/workflows/common/composer-install
         with:
-          symfony-version: "7.0.*"
+          symfony-version: "7.2.*"
           install-doctrine-annotations: false
 
       - name: Run PHP-CS-Fixer
@@ -173,7 +191,7 @@ jobs:
       - name: Setup dependencies
         uses: ./.github/workflows/common/composer-install
         with:
-          symfony-version: "7.1.*"
+          symfony-version: "7.2.*"
           install-doctrine-annotations: false
 
       - name: Run PHPStan

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 4.34.0
+* Changed minimum Symfony version for 7.x from 7.0 to 7.1
+
 ## 4.33.6
 * Fixed Symfony 7.2 deprecation of tagged arguments
 

diff --git a/composer.json b/composer.json
@@ -18,16 +18,16 @@
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "symfony/config": "^5.4 || ^6.4 || ^7.0",
-        "symfony/console": "^5.4 || ^6.4 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
+        "symfony/config": "^5.4 || ^6.4 || ^7.1",
+        "symfony/console": "^5.4 || ^6.4 || ^7.1",
+        "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.1",
         "symfony/deprecation-contracts": "^2.1 || ^3",
-        "symfony/framework-bundle": "^5.4.24 || ^6.4 || ^7.0",
-        "symfony/http-foundation": "^5.4 || ^6.4 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
-        "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
-        "symfony/property-info": "^5.4.10 || ^6.4 || ^7.0",
-        "symfony/routing": "^5.4 || ^6.4 || ^7.0",
+        "symfony/framework-bundle": "^5.4.24 || ^6.4 || ^7.1",
+        "symfony/http-foundation": "^5.4 || ^6.4 || ^7.1",
+        "symfony/http-kernel": "^5.4 || ^6.4 || ^7.1",
+        "symfony/options-resolver": "^5.4 || ^6.4 || ^7.1",
+        "symfony/property-info": "^5.4.10 || ^6.4 || ^7.1",
+        "symfony/routing": "^5.4 || ^6.4 || ^7.1",
         "zircote/swagger-php": "^4.6.1"
     },
     "require-dev": {
@@ -43,21 +43,21 @@
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpstan/phpstan-symfony": "^1.3",
         "phpunit/phpunit": "^9.6 || ^10.5",
-        "symfony/asset": "^5.4 || ^6.4 || ^7.0",
-        "symfony/browser-kit": "^5.4 || ^6.4 || ^7.0",
-        "symfony/cache": "^5.4 || ^6.4 || ^7.0",
-        "symfony/dom-crawler": "^5.4 || ^6.4 || ^7.0",
-        "symfony/expression-language": "^5.4 || ^6.4 || ^7.0",
-        "symfony/form": "^5.4 || ^6.4 || ^7.0",
+        "symfony/asset": "^5.4 || ^6.4 || ^7.1",
+        "symfony/browser-kit": "^5.4 || ^6.4 || ^7.1",
+        "symfony/cache": "^5.4 || ^6.4 || ^7.1",
+        "symfony/dom-crawler": "^5.4 || ^6.4 || ^7.1",
+        "symfony/expression-language": "^5.4 || ^6.4 || ^7.1",
+        "symfony/form": "^5.4 || ^6.4 || ^7.1",
         "symfony/phpunit-bridge": "^6.4",
-        "symfony/property-access": "^5.4 || ^6.4 || ^7.0",
-        "symfony/security-csrf": "^5.4 || ^6.4 || ^7.0",
-        "symfony/serializer": "^5.4 || ^6.4 || ^7.0",
-        "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0",
-        "symfony/templating": "^5.4 || ^6.4 || ^7.0",
-        "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0",
-        "symfony/uid": "^5.4 || ^6.4 || ^7.0",
-        "symfony/validator": "^5.4 || ^6.4 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.4 || ^7.1",
+        "symfony/security-csrf": "^5.4 || ^6.4 || ^7.1",
+        "symfony/serializer": "^5.4 || ^6.4 || ^7.1",
+        "symfony/stopwatch": "^5.4 || ^6.4 || ^7.1",
+        "symfony/templating": "^5.4 || ^6.4 || ^7.1",
+        "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.1",
+        "symfony/uid": "^5.4 || ^6.4 || ^7.1",
+        "symfony/validator": "^5.4 || ^6.4 || ^7.1",
         "willdurand/hateoas-bundle": "^1.0 || ^2.0"
     },
     "conflict": {

diff --git a/docs/index.rst b/docs/index.rst
@@ -389,10 +389,10 @@ that property type to not be nullable, for example.
         #[OA\Response(response: 200, content: new Model(type: UserDto::class, groups: ["default"]))]
 
         // Similarly, this will make the username `required` in the create  schema
-        #[OA\RequestBody(new Model(type: UserDto::class, groups: ["create"]))]
+        #[OA\RequestBody(content: new Model(type: UserDto::class, groups: ["create"]))]
 
         // But for updates, the `username` property will not be required
-        #[OA\RequestBody(new Model(type: UserDto::class, groups: ["update"]))]
+        #[OA\RequestBody(content: new Model(type: UserDto::class, groups: ["update"]))]
 
 
 .. tip::