Use DI for services & remove aliases - resolves #205

pimcore · Dec 28, 2022 · ca2e1c8 · ca2e1c8
1 parent 8c08a9c
commit ca2e1c8
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 31 deletions.
diff --git a/src/Controller/Admin/ActivitiesController.php b/src/Controller/Admin/ActivitiesController.php
@@ -73,7 +73,7 @@ public function listAction(
             $types = \Pimcore\Db::get()->fetchFirstColumn((string)$select);
 
             if ($type = $request->get('type')) {
-                $select = $list->getQueryBuilder(false);
+                $select = $list->getQueryBuilder();
                 $select->andWhere('type = ' . $list->quote($type));
                 $list->setCondition((string) $select->getQueryPart('where'));
             }

diff --git a/src/Controller/Rest/Api/ActivitiesController.php b/src/Controller/Rest/Api/ActivitiesController.php
@@ -16,18 +16,20 @@
 namespace CustomerManagementFrameworkBundle\Controller\Rest\Api;
 
 use CustomerManagementFrameworkBundle\Controller\Rest\CrudHandlerController;
+use CustomerManagementFrameworkBundle\RESTApi\ActivitiesHandler;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @Route("/activities")
  */
 class ActivitiesController extends CrudHandlerController
 {
-    /**
-     * @return \CustomerManagementFrameworkBundle\RESTApi\ActivitiesHandler
-     */
-    protected function getHandler()
+    public function __construct(protected ActivitiesHandler $handler)
     {
-        return \Pimcore::getContainer()->get('cmf.rest.activities_handler');
+    }
+
+    protected function getHandler(): ActivitiesHandler
+    {
+        return $this->handler;
     }
 }
diff --git a/src/Controller/Rest/Api/CustomersController.php b/src/Controller/Rest/Api/CustomersController.php
@@ -24,11 +24,12 @@
  */
 class CustomersController extends CrudHandlerController
 {
-    /**
-     * @return CustomersHandler
-     */
-    protected function getHandler()
+    public function __construct(protected CustomersHandler $handler)
     {
-        return \Pimcore::getContainer()->get('cmf.rest.customers_handler');
+    }
+
+    protected function getHandler(): CustomersHandler
+    {
+        return $this->handler;
     }
 }
diff --git a/src/Controller/Rest/Api/DeletionsController.php b/src/Controller/Rest/Api/DeletionsController.php
@@ -16,6 +16,7 @@
 namespace CustomerManagementFrameworkBundle\Controller\Rest\Api;
 
 use CustomerManagementFrameworkBundle\Controller\Rest\RestHandlerController;
+use CustomerManagementFrameworkBundle\RESTApi\DeletionsHandler;
 use CustomerManagementFrameworkBundle\RESTApi\Exception\ExceptionInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -25,6 +26,10 @@
  */
 class DeletionsController extends RestHandlerController
 {
+    public function __construct(protected DeletionsHandler $handler)
+    {
+    }
+
     /**
      * @param Request $request
      * @Route("", methods={"GET"})
@@ -46,11 +51,8 @@ public function listRecords(Request $request)
         return $response;
     }
 
-    /**
-     * @return \CustomerManagementFrameworkBundle\RESTApi\DeletionsHandler
-     */
-    protected function getHandler()
+    protected function getHandler(): DeletionsHandler
     {
-        return \Pimcore::getContainer()->get('cmf.rest.deletions_handler');
+        return $this->handler;
     }
 }
diff --git a/src/Controller/Rest/Api/SegmentGroupsController.php b/src/Controller/Rest/Api/SegmentGroupsController.php
@@ -16,18 +16,20 @@
 namespace CustomerManagementFrameworkBundle\Controller\Rest\Api;
 
 use CustomerManagementFrameworkBundle\Controller\Rest\CrudHandlerController;
+use CustomerManagementFrameworkBundle\RESTApi\SegmentGroupsHandler;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @Route("/segment-groups")
  */
 class SegmentGroupsController extends CrudHandlerController
 {
-    /**
-     * @return \CustomerManagementFrameworkBundle\RESTApi\SegmentGroupsHandler
-     */
-    protected function getHandler()
+    public function __construct(protected SegmentGroupsHandler $handler)
     {
-        return \Pimcore::getContainer()->get('cmf.rest.segment_groups_handler');
+    }
+
+    protected function getHandler(): SegmentGroupsHandler
+    {
+        return $this->handler;
     }
 }
diff --git a/src/Controller/Rest/Api/SegmentsController.php b/src/Controller/Rest/Api/SegmentsController.php
@@ -16,18 +16,20 @@
 namespace CustomerManagementFrameworkBundle\Controller\Rest\Api;
 
 use CustomerManagementFrameworkBundle\Controller\Rest\CrudHandlerController;
+use CustomerManagementFrameworkBundle\RESTApi\SegmentsHandler;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @Route("/segments")
  */
 class SegmentsController extends CrudHandlerController
 {
-    /**
-     * @return \CustomerManagementFrameworkBundle\RESTApi\SegmentsHandler
-     */
-    protected function getHandler()
+    public function __construct(protected SegmentsHandler $handler)
     {
-        return \Pimcore::getContainer()->get('cmf.rest.segments_handler');
+    }
+
+    protected function getHandler(): SegmentsHandler
+    {
+        return $this->handler;
     }
 }
diff --git a/src/Controller/Rest/Api/SegmentsOfCustomersController.php b/src/Controller/Rest/Api/SegmentsOfCustomersController.php
@@ -51,10 +51,7 @@ public function updateRecordsAction(Request $request)
         return $response;
     }
 
-    /**
-     * @return SegmentsOfCustomerHandler
-     */
-    protected function getHandler()
+    protected function getHandler(): SegmentsOfCustomerHandler
     {
         return $this->handler;
     }

diff --git a/src/DependencyInjection/PimcoreCustomerManagementFrameworkExtension.php b/src/DependencyInjection/PimcoreCustomerManagementFrameworkExtension.php
@@ -142,7 +142,7 @@ private function registerCustomerDuplicatesServicesConfiguration(ContainerBuilde
         $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicateCheckTrimmedFields', (array) $config['duplicateCheckTrimmedFields']);
         $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_view.listFields', $config['duplicates_view']['listFields'] ?: []);
         $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_view.enabled', (bool) $config['duplicates_view']['enabled']);
-        $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_index.enableDuplicatesIndex', $config['duplicates_index']['enableDuplicatesIndex'] ?: []);
+        $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_index.enableDuplicatesIndex', $config['duplicates_index']['enableDuplicatesIndex'] ?: false);
         $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_index.duplicateCheckFields', $config['duplicates_index']['duplicateCheckFields'] ?: []);
         $container->setParameter('pimcore_customer_management_framework.customer_duplicates_services.duplicates_index.dataTransformers', $config['duplicates_index']['dataTransformers'] ?: []);
     }