Use DI for services & remove aliases - resolves #205

pimcore · Dec 28, 2022 · dcd0fbe · dcd0fbe
1 parent e0e9d1e
commit dcd0fbe
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/src/Newsletter/AddressSource/SegmentAddressSource.php b/src/Newsletter/AddressSource/SegmentAddressSource.php
@@ -41,14 +41,22 @@ public function __construct(array $arguments)
         } else {
             $operator = SegmentManagerInterface::CONDITION_OR;
         }
-        $this->segmentManager = \Pimcore::getContainer()->get(SegmentManagerInterface::class);
+
         $this->sendingParamContainers = $this->setUpSendingParamContainers(
             array_filter($arguments['segmentIds']),
             $operator,
             $arguments['filterFlags']
         );
     }
 
+    /**
+     * @required
+     */
+    public function setSegmentManager(SegmentManagerInterface $segmentManager): void
+    {
+        $this->segmentManager = $segmentManager;
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/tests/Model/Activity/ActivityTest.php b/tests/Model/Activity/ActivityTest.php
@@ -2,6 +2,7 @@
 
 namespace CustomerManagementFrameworkBundle\Tests\Model\Activity;
 use CustomerManagementFrameworkBundle\ActivityManager\ActivityManagerInterface;
+use CustomerManagementFrameworkBundle\ActivityStore\ActivityStoreInterface;
 use CustomerManagementFrameworkBundle\Model\Activity\GenericActivity;
 use Pimcore\Model\DataObject\Customer;
 use Pimcore\Tests\Support\Test\ModelTestCase;
@@ -36,8 +37,8 @@ protected function createCustomer(): Customer {
 
     public function testTrackActivity() {
 
-        $activityManager = \Pimcore::getContainer()->get(ActivityManagerInterface::class);
-        $activityStore = \Pimcore::getContainer()->get('cmf.activity_store');
+        $activityManager = $this->tester->grabService(ActivityManagerInterface::class);
+        $activityStore = $this->tester->grabService(ActivityStoreInterface::class);
 
         $customer = $this->createCustomer();
 

diff --git a/tests/Model/Customer/CustomerListTest.php b/tests/Model/Customer/CustomerListTest.php
@@ -113,7 +113,7 @@ public function tearDown(): void
 
     protected function createSegments()
     {
-        $segmentManager = \Pimcore::getContainer()->get(SegmentManagerInterface::class);
+        $segmentManager = $this->tester->grabService(SegmentManagerInterface::class);
         $segmentManager->resetSegmentsFolder();
         foreach ($this->segmentDummyData as $segment) {
             $segmentManager->createSegment($segment['name'], $segment['group'], $segment['name']);
@@ -122,7 +122,7 @@ protected function createSegments()
 
     protected function createCustomers()
     {
-        $segmentManager = \Pimcore::getContainer()->get(SegmentManagerInterface::class);
+        $segmentManager = $this->tester->grabService(SegmentManagerInterface::class);
 
         foreach ($this->customerDummyData as &$customerData) {
 
@@ -351,7 +351,7 @@ public function testDateBetweenFilter()
 
     public function testCustomerSegmentFilter()
     {
-        $segmentManager = \Pimcore::getContainer()->get(SegmentManagerInterface::class);
+        $segmentManager = $this->tester->grabService(SegmentManagerInterface::class);
 
         //test one filter
         $listing = new Customer\Listing();

diff --git a/tests/_support/Helper/Model.php b/tests/_support/Helper/Model.php
@@ -48,4 +48,14 @@ public function initializeDefinitions()
         $cm = $this->getModule('\\' . ClassManager::class);
         $cm->setupClass('Customer', __DIR__ . '/../../../install/class_source/optional/class_Customer_export.json');
     }
+
+    /**
+     * @throws \Codeception\Exception\ModuleException
+     */
+    public function grabService(string $serviceId): mixed
+    {
+        $pimcoreHelper = $this->getModule('\\' . Pimcore::class);
+
+        return $pimcoreHelper->grabService($serviceId);
+    }
 }