Fix coding standard and add conflict explanation

Sylius · Sep 4, 2024 · ca21c70 · ca21c70
1 parent 8e0ef86
commit ca21c70
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -18,7 +18,6 @@
 
 /**
  * @template T of ResourceInterface
- *
  * @extends ObjectRepository<T>
  */
 interface RepositoryInterface extends ObjectRepository

diff --git 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
@@ -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
@@ -23,9 +23,6 @@ public function isEnabled(): bool
         return $this->enabled;
     }
 
-    /**
-     * @param bool $enabled
-     */
     public function setEnabled(?bool $enabled): void
     {
         $this->enabled = (bool) $enabled;
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,8 +85,6 @@ protected function getDoctrineMappingDirectory(): string @@
         /**
          * Return the entity namespace.
-         *
-         * @return string
          */
         protected function getModelNamespace(): ?string
         {
@@ Expand Down @@