Merge 3.2

docs/src/Kernel.php

@@ -45,7 +45,7 @@ class Kernel extends BaseKernel
     private $declaredClasses = [];
     private string $guide;
 
-    public function __construct(string $environment, bool $debug, string $guide = null)
+    public function __construct(string $environment, bool $debug, ?string $guide = null)
     {
         parent::__construct($environment, $debug);
 
@@ -118,7 +118,7 @@ private function configureContainer(ContainerConfigurator $container, LoaderInte
         }
     }
 
-    public function request(Request $request = null): Response
+    public function request(?Request $request = null): Response
     {
         if (null === $request && \function_exists('App\Playground\request')) {
             $request = request();

features/openapi/docs.feature

@@ -98,7 +98,6 @@ Feature: Documentation support
     And the "playMode" property for the OpenAPI class "VideoGame" should be equal to:
     """
     {
-      "owl:maxCardinality": 1,
       "type": "string",
       "format": "iri-reference",
       "example": "https://example.com/"
@@ -310,7 +309,6 @@ Feature: Documentation support
     And the "resourceRelated" property for the OpenAPI class "Resource" should be equal to:
     """
     {
-      "owl:maxCardinality": 1,
       "readOnly": true,
       "anyOf": [
         {
@@ -389,7 +387,6 @@ Feature: Documentation support
     And the "data" property for the OpenAPI class "WrappedResponseEntity.CustomOutputEntityWrapperDto-read" should be equal to:
     """
     {
-      "owl:maxCardinality": 1,
       "$ref": "#\/components\/schemas\/WrappedResponseEntity-read"
     }
     """

src/Action/EntrypointAction.php

@@ -41,7 +41,7 @@ public function __construct(
     /**
      * @return Entrypoint|Response
      */
-    public function __invoke(Request $request = null)
+    public function __invoke(?Request $request = null)
     {
         if ($this->provider && $this->processor) {
             $context = ['request' => $request];

src/Action/ExceptionAction.php

@@ -43,7 +43,7 @@ final class ExceptionAction
      * @param array $errorFormats      A list of enabled error formats
      * @param array $exceptionToStatus A list of exceptions mapped to their HTTP status code
      */
-    public function __construct(private readonly SerializerInterface $serializer, private readonly array $errorFormats, private readonly array $exceptionToStatus = [], ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null)
+    public function __construct(private readonly SerializerInterface $serializer, private readonly array $errorFormats, private readonly array $exceptionToStatus = [], ?ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null)
     {
         $this->resourceMetadataCollectionFactory = $resourceMetadataCollectionFactory;
     }

src/Api/FilterLocatorTrait.php

@@ -45,7 +45,7 @@ private function setFilterLocator(?ContainerInterface $filterLocator, bool $allo
     /**
      * Gets a filter with a backward compatibility.
      */
-    private function getFilter(string $filterId): null|FilterInterface|MetadataFilterInterface
+    private function getFilter(string $filterId): FilterInterface|MetadataFilterInterface|null
     {
         if ($this->filterLocator && $this->filterLocator->has($filterId)) {
             return $this->filterLocator->get($filterId);

src/Api/IdentifiersExtractor.php

@@ -37,7 +37,7 @@ final class IdentifiersExtractor implements IdentifiersExtractorInterface
     use ResourceClassInfoTrait;
     private readonly PropertyAccessorInterface $propertyAccessor;
 
-    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, ResourceClassResolverInterface $resourceClassResolver, private readonly PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory, PropertyAccessorInterface $propertyAccessor = null)
+    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, ResourceClassResolverInterface $resourceClassResolver, private readonly PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory, ?PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->resourceClassResolver = $resourceClassResolver;
@@ -49,7 +49,7 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
      *
      * TODO: 3.0 identifiers should be stringable?
      */
-    public function getIdentifiersFromItem(object $item, Operation $operation = null, array $context = []): array
+    public function getIdentifiersFromItem(object $item, ?Operation $operation = null, array $context = []): array
     {
         if (!$this->isResourceClass($this->getObjectClass($item))) {
             return ['id' => $this->propertyAccessor->getValue($item, 'id')];
@@ -96,7 +96,7 @@ private function getIdentifiersFromOperation(object $item, Operation $operation,
     /**
      * Gets the value of the given class property.
      */
-    private function getIdentifierValue(object $item, string $class, string $property, string $parameterName, string $toProperty = null): float|bool|int|string
+    private function getIdentifierValue(object $item, string $class, string $property, string $parameterName, ?string $toProperty = null): float|bool|int|string
     {
         if ($item instanceof $class) {
             try {

src/Api/IdentifiersExtractorInterface.php

@@ -28,5 +28,5 @@ interface IdentifiersExtractorInterface
      *
      * @throws RuntimeException
      */
-    public function getIdentifiersFromItem(object $item, Operation $operation = null, array $context = []): array;
+    public function getIdentifiersFromItem(object $item, ?Operation $operation = null, array $context = []): array;
 }

src/Api/IriConverterInterface.php

@@ -31,7 +31,7 @@ interface IriConverterInterface
      * @throws InvalidArgumentException
      * @throws ItemNotFoundException
      */
-    public function getResourceFromIri(string $iri, array $context = [], Operation $operation = null): object;
+    public function getResourceFromIri(string $iri, array $context = [], ?Operation $operation = null): object;
 
     /**
      * Gets the IRI associated with the given item.
@@ -41,5 +41,5 @@ public function getResourceFromIri(string $iri, array $context = [], Operation $
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function getIriFromResource(object|string $resource, int $referenceType = UrlGeneratorInterface::ABS_PATH, Operation $operation = null, array $context = []): ?string;
+    public function getIriFromResource(object|string $resource, int $referenceType = UrlGeneratorInterface::ABS_PATH, ?Operation $operation = null, array $context = []): ?string;
 }

src/Api/ResourceClassResolver.php

@@ -38,7 +38,7 @@ public function __construct(private readonly ResourceNameCollectionFactoryInterf
     /**
      * {@inheritdoc}
      */
-    public function getResourceClass(mixed $value, string $resourceClass = null, bool $strict = false): string
+    public function getResourceClass(mixed $value, ?string $resourceClass = null, bool $strict = false): string
     {
         if ($strict && null === $resourceClass) {
             throw new InvalidArgumentException('Strict checking is only possible when resource class is specified.');

src/Api/ResourceClassResolverInterface.php

@@ -30,7 +30,7 @@ interface ResourceClassResolverInterface
      *
      * @throws InvalidArgumentException
      */
-    public function getResourceClass(mixed $value, string $resourceClass = null, bool $strict = false): string;
+    public function getResourceClass(mixed $value, ?string $resourceClass = null, bool $strict = false): string;
 
     /**
      * Is the given class a resource class?

src/Doctrine/Common/Filter/NumericFilterTrait.php

@@ -63,7 +63,7 @@ public function getDescription(string $resourceClass): array
     /**
      * Gets the PHP type corresponding to this Doctrine type.
      */
-    abstract protected function getType(string $doctrineType = null): string;
+    abstract protected function getType(?string $doctrineType = null): string;
 
     abstract protected function getProperties(): ?array;
 

src/Doctrine/Common/Filter/SearchFilterTrait.php

@@ -34,7 +34,7 @@ trait SearchFilterTrait
 
     protected IriConverterInterface|LegacyIriConverterInterface $iriConverter;
     protected PropertyAccessorInterface $propertyAccessor;
-    protected null|IdentifiersExtractorInterface|LegacyIdentifiersExtractorInterface $identifiersExtractor = null;
+    protected IdentifiersExtractorInterface|LegacyIdentifiersExtractorInterface|null $identifiersExtractor = null;
 
     /**
      * {@inheritdoc}
@@ -165,7 +165,7 @@ protected function normalizeValues(array $values, string $property): ?array
     /**
      * When the field should be an integer, check that the given value is a valid one.
      */
-    protected function hasValidValues(array $values, string $type = null): bool
+    protected function hasValidValues(array $values, ?string $type = null): bool
     {
         foreach ($values as $value) {
             if (null !== $value && \in_array($type, (array) self::DOCTRINE_INTEGER_TYPE, true) && false === filter_var($value, \FILTER_VALIDATE_INT)) {

src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php

@@ -194,12 +194,12 @@ public function getFoo(): ?array
         return $this->foo;
     }
 
-    public function setFoo(array $foo = null): void
+    public function setFoo(?array $foo = null): void
     {
         $this->foo = $foo;
     }
 
-    public function setDummyDate(\DateTime $dummyDate = null): void
+    public function setDummyDate(?\DateTime $dummyDate = null): void
     {
         $this->dummyDate = $dummyDate;
     }

src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php

@@ -161,7 +161,7 @@ public function getThirdLevel(): ?ThirdLevel
         return $this->thirdLevel;
     }
 
-    public function setThirdLevel(ThirdLevel $thirdLevel = null): void
+    public function setThirdLevel(?ThirdLevel $thirdLevel = null): void
     {
         $this->thirdLevel = $thirdLevel;
     }

src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/ThirdLevel.php

@@ -87,7 +87,7 @@ public function getFourthLevel(): ?FourthLevel
         return $this->fourthLevel;
     }
 
-    public function setFourthLevel(FourthLevel $fourthLevel = null): void
+    public function setFourthLevel(?FourthLevel $fourthLevel = null): void
     {
         $this->fourthLevel = $fourthLevel;
     }

src/Doctrine/EventListener/PublishMercureUpdatesListener.php

@@ -66,7 +66,7 @@ final class PublishMercureUpdatesListener
     /**
      * @param array<string, string[]|string> $formats
      */
-    public function __construct(LegacyResourceClassResolverInterface|ResourceClassResolverInterface $resourceClassResolver, private readonly LegacyIriConverterInterface|IriConverterInterface $iriConverter, ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, private readonly SerializerInterface $serializer, private readonly array $formats, MessageBusInterface $messageBus = null, private readonly ?HubRegistry $hubRegistry = null, private readonly ?GraphQlSubscriptionManagerInterface $graphQlSubscriptionManager = null, private readonly ?GraphQlMercureSubscriptionIriGeneratorInterface $graphQlMercureSubscriptionIriGenerator = null, ExpressionLanguage $expressionLanguage = null, private bool $includeType = false)
+    public function __construct(LegacyResourceClassResolverInterface|ResourceClassResolverInterface $resourceClassResolver, private readonly LegacyIriConverterInterface|IriConverterInterface $iriConverter, ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, private readonly SerializerInterface $serializer, private readonly array $formats, ?MessageBusInterface $messageBus = null, private readonly ?HubRegistry $hubRegistry = null, private readonly ?GraphQlSubscriptionManagerInterface $graphQlSubscriptionManager = null, private readonly ?GraphQlMercureSubscriptionIriGeneratorInterface $graphQlMercureSubscriptionIriGenerator = null, ?ExpressionLanguage $expressionLanguage = null, private bool $includeType = false)
     {
         if (null === $messageBus && null === $hubRegistry) {
             throw new InvalidArgumentException('A message bus or a hub registry must be provided.');

src/Doctrine/EventListener/PurgeHttpCacheListener.php

@@ -43,7 +43,7 @@ final class PurgeHttpCacheListener
     private readonly PropertyAccessorInterface $propertyAccessor;
     private array $tags = [];
 
-    public function __construct(private readonly PurgerInterface $purger, private readonly IriConverterInterface|LegacyIriConverterInterface $iriConverter, private readonly ResourceClassResolverInterface|LegacyResourceClassResolverInterface $resourceClassResolver, PropertyAccessorInterface $propertyAccessor = null)
+    public function __construct(private readonly PurgerInterface $purger, private readonly IriConverterInterface|LegacyIriConverterInterface $iriConverter, private readonly ResourceClassResolverInterface|LegacyResourceClassResolverInterface $resourceClassResolver, ?PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
     }

src/Doctrine/Odm/Extension/AggregationCollectionExtensionInterface.php

@@ -23,5 +23,5 @@
  */
 interface AggregationCollectionExtensionInterface
 {
-    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void;
+    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void;
 }

src/Doctrine/Odm/Extension/AggregationItemExtensionInterface.php

@@ -23,5 +23,5 @@
  */
 interface AggregationItemExtensionInterface
 {
-    public function applyToItem(Builder $aggregationBuilder, string $resourceClass, array $identifiers, Operation $operation = null, array &$context = []): void;
+    public function applyToItem(Builder $aggregationBuilder, string $resourceClass, array $identifiers, ?Operation $operation = null, array &$context = []): void;
 }

src/Doctrine/Odm/Extension/AggregationResultCollectionExtensionInterface.php

@@ -24,7 +24,7 @@
  */
 interface AggregationResultCollectionExtensionInterface extends AggregationCollectionExtensionInterface
 {
-    public function supportsResult(string $resourceClass, Operation $operation = null, array $context = []): bool;
+    public function supportsResult(string $resourceClass, ?Operation $operation = null, array $context = []): bool;
 
-    public function getResult(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array $context = []): iterable;
+    public function getResult(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array $context = []): iterable;
 }

src/Doctrine/Odm/Extension/AggregationResultItemExtensionInterface.php

@@ -24,7 +24,7 @@
  */
 interface AggregationResultItemExtensionInterface extends AggregationItemExtensionInterface
 {
-    public function supportsResult(string $resourceClass, Operation $operation = null, array $context = []): bool;
+    public function supportsResult(string $resourceClass, ?Operation $operation = null, array $context = []): bool;
 
-    public function getResult(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array $context = []): ?object;
+    public function getResult(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array $context = []): ?object;
 }

src/Doctrine/Odm/Extension/FilterExtension.php

@@ -33,7 +33,7 @@ public function __construct(private readonly ContainerInterface $filterLocator)
     /**
      * {@inheritdoc}
      */
-    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void
+    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         $resourceFilters = $operation?->getFilters();
 

src/Doctrine/Odm/Extension/OrderExtension.php

@@ -40,7 +40,7 @@ public function __construct(private readonly ?string $order = null, private read
     /**
      * {@inheritdoc}
      */
-    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void
+    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         // Do not apply order if already defined on $aggregationBuilder
         if ($this->hasSortStage($aggregationBuilder)) {

src/Doctrine/Odm/Extension/PaginationExtension.php

@@ -40,7 +40,7 @@ public function __construct(private readonly ManagerRegistry $managerRegistry, p
      *
      * @throws RuntimeException
      */
-    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void
+    public function applyToCollection(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         if (!$this->pagination->isEnabled($operation, $context)) {
             return;
@@ -85,7 +85,7 @@ public function applyToCollection(Builder $aggregationBuilder, string $resourceC
     /**
      * {@inheritdoc}
      */
-    public function supportsResult(string $resourceClass, Operation $operation = null, array $context = []): bool
+    public function supportsResult(string $resourceClass, ?Operation $operation = null, array $context = []): bool
     {
         if ($context['graphql_operation_name'] ?? false) {
             return $this->pagination->isGraphQlEnabled($operation, $context);
@@ -99,7 +99,7 @@ public function supportsResult(string $resourceClass, Operation $operation = nul
      *
      * @throws RuntimeException
      */
-    public function getResult(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array $context = []): iterable
+    public function getResult(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array $context = []): iterable
     {
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
         if (!$manager instanceof DocumentManager) {

src/Doctrine/Odm/Filter/AbstractFilter.php

@@ -35,15 +35,15 @@ abstract class AbstractFilter implements FilterInterface
     use PropertyHelperTrait;
     protected LoggerInterface $logger;
 
-    public function __construct(protected ManagerRegistry $managerRegistry, LoggerInterface $logger = null, protected ?array $properties = null, protected ?NameConverterInterface $nameConverter = null)
+    public function __construct(protected ManagerRegistry $managerRegistry, ?LoggerInterface $logger = null, protected ?array $properties = null, protected ?NameConverterInterface $nameConverter = null)
     {
         $this->logger = $logger ?? new NullLogger();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function apply(Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void
+    public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         foreach ($context['filters'] as $property => $value) {
             $this->filterProperty($this->denormalizePropertyName($property), $value, $aggregationBuilder, $resourceClass, $operation, $context);
@@ -53,7 +53,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, Operat
     /**
      * Passes a property through the filter.
      */
-    abstract protected function filterProperty(string $property, $value, Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void;
+    abstract protected function filterProperty(string $property, $value, Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void;
 
     protected function getManagerRegistry(): ManagerRegistry
     {

src/Doctrine/Odm/Filter/BooleanFilter.php

@@ -116,7 +116,7 @@ final class BooleanFilter extends AbstractFilter
     /**
      * {@inheritdoc}
      */
-    protected function filterProperty(string $property, $value, Builder $aggregationBuilder, string $resourceClass, Operation $operation = null, array &$context = []): void
+    protected function filterProperty(string $property, $value, Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         if (
             !$this->isPropertyEnabled($property, $resourceClass)