Refactor and add constructors in Reorder classes

Introduced constructors in `AbstractReorder`, `FormReorder`, `ShowReorder`, and `ShowAndFormReorder` classes to set initial values. Also removed unneeded import, improved function return types and removed unneeded whitespace. The refactoring improves code readability and makes initial state setting more explicit.
networking · Feb 22, 2024 · 0d7c67a · 0d7c67a
1 parent 75a51d0
commit 0d7c67a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 10 deletions.
diff --git a/src/Admin/BaseAdmin.php b/src/Admin/BaseAdmin.php
@@ -132,7 +132,6 @@ public function getTrackedActions(): array
 
     protected function configureListFields(ListMapper $list): void
     {
-
         $this->getSonataAnnotationReader()?->configureListFields($this->getClass(), $list);
     }
 

diff --git a/src/Annotation/Order/AbstractReorder.php b/src/Annotation/Order/AbstractReorder.php
@@ -4,15 +4,18 @@
 
 namespace Networking\InitCmsBundle\Annotation\Order;
 
-use Networking\InitCmsBundle\Annotation\Order\ShowAndFormReorderInterface;
-
 abstract class AbstractReorder implements ReorderInterface
 {
     /**
      * @var array
      */
     public $keys = [];
 
+    public function __construct(array $keys)
+    {
+        $this->keys = $keys;
+    }
+
     /**
      * @return array
      */

diff --git a/src/Annotation/Order/FormReorder.php b/src/Annotation/Order/FormReorder.php
@@ -10,10 +10,17 @@
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class FormReorder extends AbstractReorder implements FormReorderInterface
 {
+
     /**
      * @var string
      */
-    public $with = null;
+    public ?string $with = null;
+
+    public function __construct(array $keys, ?string $with = null)
+    {
+        parent::__construct($keys);
+        $this->with = $with;
+    }
 
     public function getWith(): ?string
     {

diff --git a/src/Annotation/Order/ShowAndFormReorder.php b/src/Annotation/Order/ShowAndFormReorder.php
@@ -13,7 +13,13 @@ class ShowAndFormReorder extends AbstractReorder implements ShowAndFormReorderIn
     /**
      * @var string
      */
-    public $with = null;
+    public ?string $with = null;
+
+    public function __construct(array $keys, ?string $with = null)
+    {
+        parent::__construct($keys);
+        $this->with = $with;
+    }
 
     public function getWith(): ?string
     {

diff --git a/src/Annotation/Order/ShowReorder.php b/src/Annotation/Order/ShowReorder.php
@@ -13,7 +13,13 @@ class ShowReorder extends AbstractReorder implements ShowReorderInterface
     /**
      * @var string
      */
-    public $with = null;
+    public ?string $with = null;
+
+    public function __construct(array $keys, ?string $with = null)
+    {
+        parent::__construct($keys);
+        $this->with = $with;
+    }
 
     public function getWith(): ?string
     {

diff --git a/src/AttributeReader/SonataAdminAttributeReader.php b/src/AttributeReader/SonataAdminAttributeReader.php
@@ -251,9 +251,9 @@ public function getDatagridMapperCallbacks($entity): array
     }
 
     /**
-     * @return ListReorderInterface
+     * @return ListReorderInterface|null
      */
-    public function getListReorderAnnotation($entity): ListReorderInterface
+    public function getListReorderAnnotation($entity): ?ListReorderInterface
     {
         return $this->getAnnotationsByType($entity, self::ANNOTATION_TYPE_ADMIN_LIST_REORDER, self::SCOPE_CLASS);
     }

diff --git a/src/AttributeReader/SonataAdminAttributeReaderInterface.php b/src/AttributeReader/SonataAdminAttributeReaderInterface.php
@@ -54,9 +54,9 @@ public function getListMapperAnnotations($entity): array;
     public function getListMapperCallbacks($entity): array;
 
     /**
-     * @return ListReorderInterface
+     * @return ListReorderInterface|null
      */
-    public function getListReorderAnnotation($entity): ListReorderInterface;
+    public function getListReorderAnnotation($entity): ?ListReorderInterface;
 
     /**
      * @return ShowInterface[]