Merge branch '2.6' into main

Author: vincentchalamon

core/configuration.md

@@ -123,11 +123,11 @@ api_platform:
         # The OAuth flow grant type.
         flow: 'application'
 
-        # The OAuth token URL.
-        tokenUrl: '/oauth/v2/token'
+        # The OAuth token URL. Make sure to check the specification tokenUrl is not needed for an implicit flow.
+        tokenUrl: ''
 
         # The OAuth authentication URL.
-        authorizationUrl: '/oauth/v2/auth'
+        authorizationUrl: ''
 
         # The OAuth scopes.
         scopes: []

core/filters.md

@@ -1209,10 +1209,12 @@ final class RegexpFilter extends AbstractFilter
                 'property' => $property,
                 'type' => Type::BUILTIN_TYPE_STRING,
                 'required' => false,
-                'swagger' => [
-                    'description' => 'Filter using a regex. This will appear in the Swagger documentation!',
-                    'name' => 'Custom name to use in the Swagger documentation',
-                    'type' => 'Will appear below the name in the Swagger documentation',
+                'description' => 'Filter using a regex. This will appear in the OpenApi documentation!',
+                'openapi' => [
+                    'example' => 'Custom example that will be in the documentation and be the default value of the sandbox',
+                    'allowReserved' => false,// if true, query parameters will be not percent-encoded
+                    'allowEmptyValue' => true,
+                    'explode' => false, // to be true, the type must be Type::BUILTIN_TYPE_ARRAY, ?product=blue,green will be ?product=blue&product=green
                 ],
             ];
         }

core/graphql.md

@@ -1832,6 +1832,7 @@ Your class needs to look like this:
 namespace App\Type;
 
 use ApiPlatform\GraphQl\Type\TypeConverterInterface;
+use ApiPlatform\Metadata\GraphQl\Operation;
 use App\Entity\Book;
 use GraphQL\Type\Definition\Type as GraphQLType;
 use Symfony\Component\PropertyInfo\Type;
@@ -1848,15 +1849,15 @@ final class TypeConverter implements TypeConverterInterface
     /**
      * {@inheritdoc}
      */
-    public function convertType(Type $type, bool $input, ?string $queryName, ?string $mutationName, string $resourceClass, string $rootResource, ?string $property, int $depth)
+    public function convertType(Type $type, bool $input, Operation $rootOperation, string $resourceClass, string $rootResource, ?string $property, int $depth)
     {
         if ('publicationDate' === $property
             && Book::class === $resourceClass
         ) {
             return 'DateTime';
         }
 
-        return $this->defaultTypeConverter->convertType($type, $input, $queryName, $mutationName, $resourceClass, $rootResource, $property, $depth);
+        return $this->defaultTypeConverter->convertType($type, $input, $rootOperation, $resourceClass, $rootResource, $property, $depth);
     }
 
     /**

core/jwt.md

@@ -154,6 +154,18 @@ security:
         - { path: ^/, roles: IS_AUTHENTICATED_FULLY }
 ```
 
+### Be sure to have lexik_jwt_authentication configured on your user_identity_field
+
+```yaml
+# api/config/packages/lexik_jwt_authentication.yaml
+lexik_jwt_authentication:
+    secret_key: '%env(resolve:JWT_SECRET_KEY)%'
+    public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
+    pass_phrase: '%env(JWT_PASSPHRASE)%'
+
+    user_identity_field: email # Or the field you have setted using make:user
+```
+
 ## Documenting the Authentication Mechanism with Swagger/Open API
 
 Want to test the routes of your JWT-authentication-protected API?
@@ -271,6 +283,7 @@ final class JwtDecorator implements OpenApiFactoryInterface
                         ],
                     ]),
                 ),
+                security: [],
             ),
         );
         $openApi->getPaths()->addPath('/authentication_token', $pathItem);

core/mongodb.md

@@ -202,7 +202,7 @@ class Offer
 }
 ```
 
-When defining references, always use the id for storing them instead of the native [DBRef](https://docs.mongodb.com/manual/reference/database-references/#dbrefs).
+When defining references, always use the ID for storing them instead of the native [DBRef](https://docs.mongodb.com/manual/reference/database-references/#dbrefs).
 It allows API Platform to manage [filtering on nested properties](filters.md#apifilter-annotation) by using [lookups](https://docs.mongodb.com/manual/reference/operator/aggregation/lookup/).
 
 ## Filtering

core/serialization.md

@@ -1052,9 +1052,9 @@ final class ApiNormalizer implements NormalizerInterface, DenormalizerInterface,
         return $this->decorated->supportsDenormalization($data, $type, $format);
     }
 
-    public function denormalize($data, $class, $format = null, array $context = [])
+    public function denormalize($data, string $type, string $format = null, array $context = [])
     {
-        return $this->decorated->denormalize($data, $class, $format, $context);
+        return $this->decorated->denormalize($data, $type, $format, $context);
     }
 
     public function setSerializer(SerializerInterface $serializer)

extra/philosophy.md

@@ -29,7 +29,7 @@ API Platform makes modern development easy and fun again:
   be understood by any compliant client such as your apps but also search engines (JSON-LD with Schema.org vocabulary).
   This API is the central and unique entry point to access and modify data. It also encapsulates the whole business logic.
 * [Then **create as many clients as you want using frontend technologies you love**](../client-generator/index.md): a JavaScript
-  webapp built in React or in Vue querying the API but also a native iOS or Android app, or even a desktop application. Clients
+  webapp built with React or with Vue querying the API but also a native iOS or Android app, or even a desktop application. Clients
   only display data and forms.
 
 See also [the general design](../core/design.md) of the framework.

schema-generator/configuration.md

@@ -440,13 +440,20 @@ It allows to specify interfaces and `abstract` classes in relation mappings.
 If you set the option `useInterface` to true, the generator will generate an interface corresponding to each generated
 entity and will use them in relation mappings.
 
-To let the schema generator generate the XML mapping file usable with Symfony, add the following to your config file:
+To let the schema generator generate the mapping file usable with Symfony, add the following to your config file:
 
 ```yaml
 doctrine:
     resolveTargetEntityConfigPath: path/to/doctrine.xml
 ```
 
+The default mapping file format is XML, but you can change it to YAML with the following option:
+```yaml
+doctrine:
+    resolveTargetEntityConfigPath: path/to/doctrine.yaml
+    resolveTargetEntityConfigType: YAML # Supports XML & YAML
+```
+
 ### Doctrine Resolve Target Entity Config Type
 
 By default, the mapping file is in XML. If you want to have a YAML file, add the following: