Removal of annotation reader, only attributes can be used now

Author: ychadwick

src/Admin/AbstractAttributeAdmin.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Networking\InitCmsBundle\Admin;
+
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
+use Sonata\AdminBundle\Datagrid\DatagridMapper;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Show\ShowMapper;
+
+abstract class AbstractAttributeAdmin extends AbstractAdmin
+{
+    protected SonataAdminAttributeReaderInterface $attributeReader;
+
+    public function __construct(
+        SonataAdminAttributeReaderInterface $attributeReader
+    ) {
+        $this->attributeReader = $attributeReader;
+
+        parent::__construct();
+    }
+
+    protected function configureListFields(ListMapper $list): void
+    {
+        $this->attributeReader->configureListFields(
+            $this->getClass(),
+            $list
+        );
+    }
+
+    protected function configureFormFields(FormMapper $form): void
+    {
+        $this->attributeReader->configureFormFields(
+            $this->getClass(),
+            $form
+        );
+    }
+
+    protected function configureShowFields(ShowMapper $show): void
+    {
+        $this->attributeReader->configureShowFields(
+            $this->getClass(),
+            $show
+        );
+    }
+
+    protected function configureDatagridFilters(DatagridMapper $filter): void
+    {
+        $this->attributeReader->configureDatagridFilters(
+            $this->getClass(),
+            $filter
+        );
+    }
+}

src/Admin/AbstractSonataAdminAnnotationAdmin.php

@@ -11,7 +11,7 @@
 
 namespace Networking\InitCmsBundle\Admin;
 
-use Networking\InitCmsBundle\Reader\SonataAdminAnnotationReaderInterface;
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\DatagridInterface;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
@@ -27,7 +27,7 @@
  */
 abstract class BaseAdmin extends AbstractAdmin
 {
-    protected $annotationReader;
+    protected $attributeReader;
 
     /**
      * @var array
@@ -132,6 +132,7 @@ public function getTrackedActions(): array
 
     protected function configureListFields(ListMapper $list): void
     {
+
         $this->getSonataAnnotationReader()?->configureListFields($this->getClass(), $list);
     }
 
@@ -150,17 +151,17 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
         $this->getSonataAnnotationReader()?->configureDatagridFilters($this->getClass(), $filter);
     }
 
-    protected function getSonataAnnotationReader(): ?SonataAdminAnnotationReaderInterface
+    protected function getSonataAnnotationReader(): ?SonataAdminAttributeReaderInterface
     {
-        return $this->annotationReader;
+        return $this->attributeReader;
     }
 
     /**
      * @return $this
      */
-    public function setSonataAnnotationReader(SonataAdminAnnotationReaderInterface $annotationReader): self
+    public function setSonataAnnotationReader(SonataAdminAttributeReaderInterface $annotationReader): self
     {
-        $this->annotationReader = $annotationReader;
+        $this->attributeReader = $annotationReader;
 
         return $this;
     }

src/Admin/BaseAdmin.php

@@ -4,7 +4,7 @@
 
 namespace Networking\InitCmsBundle\Admin;
 
-use Networking\InitCmsBundle\Reader\SonataAdminAnnotationReaderInterface;
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 
 trait SonataAdminAnnotationDatagridMapperTrait
@@ -15,7 +15,7 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     }
 
     /**
-     * @return SonataAdminAnnotationReaderInterface
+     * @return SonataAdminAttributeReaderInterface
      */
     abstract protected function getSonataAnnotationReader();
 }

src/Admin/SonataAdminAnnotationDatagridMapperTrait.php

@@ -4,7 +4,7 @@
 
 namespace Networking\InitCmsBundle\Admin;
 
-use Networking\InitCmsBundle\Reader\SonataAdminAnnotationReaderInterface;
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
 use Sonata\AdminBundle\Form\FormMapper;
 
 trait SonataAdminAnnotationFormMapperTrait
@@ -17,7 +17,7 @@ protected function configureFormFields(FormMapper $formMapper)
     }
 
     /**
-     * @return SonataAdminAnnotationReaderInterface
+     * @return SonataAdminAttributeReaderInterface
      */
     abstract protected function getSonataAnnotationReader();
 }

src/Admin/SonataAdminAnnotationFormMapperTrait.php

@@ -4,7 +4,7 @@
 
 namespace Networking\InitCmsBundle\Admin;
 
-use Networking\InitCmsBundle\Reader\SonataAdminAnnotationReaderInterface;
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 
 trait SonataAdminAnnotationListMapperTrait
@@ -17,7 +17,7 @@ protected function configureListFields(ListMapper $listMapper)
     }
 
     /**
-     * @return SonataAdminAnnotationReaderInterface
+     * @return SonataAdminAttributeReaderInterface
      */
     abstract protected function getSonataAnnotationReader();
 }

src/Admin/SonataAdminAnnotationListMapperTrait.php

@@ -4,13 +4,13 @@
 
 namespace Networking\InitCmsBundle\Admin;
 
-use Networking\InitCmsBundle\Reader\SonataAdminAnnotationReaderInterface;
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
 use Sonata\AdminBundle\Admin\Pool;
 
 trait SonataAdminAnnotationReaderTrait
 {
     /**
-     * @return SonataAdminAnnotationReaderInterface
+     * @return SonataAdminAttributeReaderInterface
      */
     protected function getSonataAnnotationReader()
     {

src/Admin/SonataAdminAnnotationReaderTrait.php

@@ -4,7 +4,7 @@
 
 namespace Networking\InitCmsBundle\Admin;
 
-use Networking\InitCmsBundle\Reader\SonataAdminAnnotationReaderInterface;
+use Networking\InitCmsBundle\AttributeReader\SonataAdminAttributeReaderInterface;
 use Sonata\AdminBundle\Show\ShowMapper;
 
 trait SonataAdminAnnotationShowMapperTrait
@@ -17,7 +17,7 @@ protected function configureShowFields(ShowMapper $showMapper)
     }
 
     /**
-     * @return SonataAdminAnnotationReaderInterface
+     * @return SonataAdminAttributeReaderInterface
      */
     abstract protected function getSonataAnnotationReader();
 }

src/Admin/SonataAdminAnnotationShowMapperTrait.php

@@ -21,6 +21,16 @@ abstract class AbstractMapper implements AdminInterface
      */
     public $fieldDescriptionOptions = [];
 
+    public function __construct(
+        ?string $name = null,
+        ?string $type = null,
+        array $fieldDescriptionOptions = []
+    ){
+        $this->type = $type;
+        $this->name = $name;
+        $this->fieldDescriptionOptions = $fieldDescriptionOptions;
+    }
+
     /**
      * @return null|string
      */

src/Annotation/AbstractMapper.php

@@ -10,53 +10,35 @@
 #[\Attribute(\Attribute::TARGET_PROPERTY)]
 class FormMapper extends AbstractMapper implements FormInterface
 {
-    /**
-     * @var array
-     */
-    public $options = [];
+    public array $options = [];
 
-    /**
-     * @var string
-     */
-    public $with = null;
+    public ?string $with = null;
 
-    /**
-     * @var array
-     */
-    public $withOptions = [];
+    public array $withOptions = [];
 
-    /**
-     * @var string
-     */
-    public $tab = null;
+    public ?string $tab = null;
 
-    /**
-     * @var array
-     */
     public $tabOptions = [];
 
-    /**
-     * @var bool
-     */
     public $ignoreOnParent = false;
 
     public function __construct(
-        string $type,
-        array $options = [],
+        ?string $name = null,
+        ?string $type = null,
         array $fieldDescriptionOptions = [],
+        array $options = [],
         array $withOptions = [],
         bool $ignoreOnParent = false,
-        ?string $name = null,
         ?string $with = null,
         ?string $tab = null,
-    ){
-        $this->type = $type;
-        $this->fieldDescriptionOptions = $fieldDescriptionOptions;
+    ) {
         $this->options = $options;
         $this->with = $with;
         $this->withOptions = $withOptions;
         $this->tab = $tab;
         $this->ignoreOnParent = $ignoreOnParent;
+
+        parent::__construct($name, $type, $fieldDescriptionOptions);
     }
 
     /**
@@ -81,7 +63,7 @@ public function getWithOptions()
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isIgnoreOnParent()
     {