diff --git a/CONFLICTS.md b/CONFLICTS.md index fc6774114..b2d085b82 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -2,3 +2,8 @@ This document explains why certain conflicts were added to `composer.json` and references related issues. + +- `willdurand/hateoas-bundle: ^2.6` + +This version allows Symfony 7 but does not support the "annotation_reader" service removal. +@see /~https://github.com/willdurand/BazingaHateoasBundle/issues/108 diff --git a/src/Bundle/AbstractResourceBundle.php b/src/Bundle/AbstractResourceBundle.php index 76a3e0d22..1445ebb72 100644 --- a/src/Bundle/AbstractResourceBundle.php +++ b/src/Bundle/AbstractResourceBundle.php @@ -85,8 +85,6 @@ protected function getDoctrineMappingDirectory(): string /** * Return the entity namespace. - * - * @return string */ protected function getModelNamespace(): ?string { diff --git a/src/Bundle/Form/EventSubscriber/AddCodeFormSubscriber.php b/src/Bundle/Form/EventSubscriber/AddCodeFormSubscriber.php index e292c96ea..64dc849d7 100644 --- a/src/Bundle/Form/EventSubscriber/AddCodeFormSubscriber.php +++ b/src/Bundle/Form/EventSubscriber/AddCodeFormSubscriber.php @@ -26,9 +26,6 @@ final class AddCodeFormSubscriber implements EventSubscriberInterface private array $options; - /** - * @param string $type - */ public function __construct(?string $type = null, array $options = []) { $this->type = $type ?? TextType::class; diff --git a/src/Component/src/Doctrine/Persistence/RepositoryInterface.php b/src/Component/src/Doctrine/Persistence/RepositoryInterface.php index d3b0288c8..703172014 100644 --- a/src/Component/src/Doctrine/Persistence/RepositoryInterface.php +++ b/src/Component/src/Doctrine/Persistence/RepositoryInterface.php @@ -18,7 +18,6 @@ /** * @template T of ResourceInterface - * * @extends ObjectRepository */ interface RepositoryInterface extends ObjectRepository diff --git a/src/Component/src/Metadata/MetadataInterface.php b/src/Component/src/Metadata/MetadataInterface.php index e2c7b0fef..3937b944a 100644 --- a/src/Component/src/Metadata/MetadataInterface.php +++ b/src/Component/src/Metadata/MetadataInterface.php @@ -30,9 +30,6 @@ public function getPluralName(): string; public function getDriver(): string|false; - /** - * @return ?string - */ public function getTemplatesNamespace(): ?string; /** diff --git a/src/Component/src/Model/ToggleableInterface.php b/src/Component/src/Model/ToggleableInterface.php index e1ad87966..c2401ee0a 100644 --- a/src/Component/src/Model/ToggleableInterface.php +++ b/src/Component/src/Model/ToggleableInterface.php @@ -22,9 +22,6 @@ interface ToggleableInterface */ public function isEnabled(); - /** - * @param bool $enabled - */ public function setEnabled(?bool $enabled): void; public function enable(): void; diff --git a/src/Component/src/Model/ToggleableTrait.php b/src/Component/src/Model/ToggleableTrait.php index 4f2b416c1..b985c0f6c 100644 --- a/src/Component/src/Model/ToggleableTrait.php +++ b/src/Component/src/Model/ToggleableTrait.php @@ -23,9 +23,6 @@ public function isEnabled(): bool return $this->enabled; } - /** - * @param bool $enabled - */ public function setEnabled(?bool $enabled): void { $this->enabled = (bool) $enabled;