Skip to content

Commit 6139a30

Browse files
blankseblankse
authored
Avoid usage of deprecated service aliases (#329)
1 parent cf7f67c commit 6139a30

File tree

5 files changed

+68
-57
lines changed

5 files changed

+68
-57
lines changed

‎install/class_source/class_LinkActivityDefinition_export.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
"previewUrl": "\/__customermanagementframework\/object-preview\/link-activity-definition-preview",
515515
"group": "CustomerManagement",
516516
"showAppLoggerTab": false,
517-
"linkGeneratorReference": "@cmf.link-activity-definition.linkgenerator",
517+
"linkGeneratorReference": "@CustomerManagementFrameworkBundle\\LinkGenerator\\LinkActivityDefinitionLinkGenerator",
518518
"compositeIndices": [],
519519
"showFieldLookup": false,
520520
"propertyVisibility": {
@@ -536,4 +536,4 @@
536536
}
537537
},
538538
"enableGridLocking": false
539-
}
539+
}

‎src/Controller/Admin/CustomersController.php‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,23 @@ class CustomersController extends Admin
5050
*/
5151
private $segmentGroups = null;
5252

53+
private ExporterManagerInterface $exporterManager;
54+
5355
public function onKernelControllerEvent(ControllerEvent $event)
5456
{
5557
parent::onKernelControllerEvent($event);
5658
$this->checkPermission('plugin_cmf_perm_customerview');
5759
AbstractObject::setHideUnpublished(true);
5860
}
5961

62+
/**
63+
* @required
64+
*/
65+
public function setExporterManager(ExporterManagerInterface $exporterManager): void
66+
{
67+
$this->exporterManager = $exporterManager;
68+
}
69+
6070
/**
6171
* @param Request $request
6272
* @Route("/list")
@@ -164,7 +174,7 @@ public function exportAction(Request $request)
164174
$ids = Db::get()->fetchFirstColumn((string)$query);
165175

166176
$jobId = uniqid();
167-
\Pimcore::getContainer()->get('cmf.customer_exporter_manager')->saveExportTmpData($jobId, [
177+
$this->exporterManager->saveExportTmpData($jobId, [
168178
'processIds' => $ids,
169179
'exporter' => $request->get('exporter'),
170180
]);
@@ -185,11 +195,13 @@ public function exportAction(Request $request)
185195
*/
186196
public function exportStepAction(Request $request)
187197
{
188-
$perRequest = $request->get('perRequest',
189-
\Pimcore::getContainer()->getParameter('cmf.customer_export.items_per_request'));
198+
$perRequest = $request->get(
199+
'perRequest',
200+
$this->getParameter('cmf.customer_export.items_per_request')
201+
);
190202

191203
try {
192-
$data = \Pimcore::getContainer()->get('cmf.customer_exporter_manager')->getExportTmpData($request);
204+
$data = $this->exporterManager->getExportTmpData($request);
193205
} catch (\Exception $e) {
194206
return $this->adminJson([
195207
'error' => true,
@@ -223,7 +235,7 @@ public function exportStepAction(Request $request)
223235
$data['exportData'] = $totalExportData;
224236
$data['processIds'] = $processIds;
225237

226-
\Pimcore::getContainer()->get('cmf.customer_exporter_manager')->saveExportTmpData(
238+
$this->exporterManager->saveExportTmpData(
227239
$request->get('jobId'),
228240
$data
229241
);
@@ -254,7 +266,7 @@ public function exportStepAction(Request $request)
254266
public function downloadFinishedExportAction(Request $request)
255267
{
256268
try {
257-
$data = \Pimcore::getContainer()->get('cmf.customer_exporter_manager')->getExportTmpData($request);
269+
$data = $this->exporterManager->getExportTmpData($request);
258270
} catch (\Exception $e) {
259271
return $this->adminJson([
260272
'error' => true,
@@ -295,7 +307,7 @@ public function downloadFinishedExportAction(Request $request)
295307
]
296308
);
297309

298-
\Pimcore::getContainer()->get('cmf.customer_exporter_manager')->deleteExportTmpData($request->get('jobId'));
310+
$this->exporterManager->deleteExportTmpData($request->get('jobId'));
299311

300312
return $response;
301313
}
@@ -369,16 +381,11 @@ protected function hasUserAccessToTempCustomerFolder()
369381
*/
370382
protected function getExporter(Listing\Concrete $listing, $exporterName)
371383
{
372-
/**
373-
* @var ExporterManagerInterface $exporterManager
374-
*/
375-
$exporterManager = \Pimcore::getContainer()->get('cmf.customer_exporter_manager');
376-
377-
if (!$exporterManager->hasExporter($exporterName)) {
384+
if (!$this->exporterManager->hasExporter($exporterName)) {
378385
throw new \InvalidArgumentException('Exporter does not exist');
379386
}
380387

381-
return $exporterManager->buildExporter($exporterName, $listing);
388+
return $this->exporterManager->buildExporter($exporterName, $listing);
382389
}
383390

384391
/**

‎src/Maintenance/Tasks/CleanupExportTmpDataTask.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@
1515

1616
namespace CustomerManagementFrameworkBundle\Maintenance\Tasks;
1717

18+
use CustomerManagementFrameworkBundle\CustomerList\ExporterManagerInterface;
1819
use Pimcore\Maintenance\TaskInterface;
1920

2021
class CleanupExportTmpDataTask implements TaskInterface
2122
{
23+
public function __construct(private ExporterManagerInterface $exporterManager)
24+
{
25+
}
26+
2227
public function execute(): void
2328
{
24-
\Pimcore::getContainer()->get('cmf.customer_exporter_manager')->cleanupExportTmpData();
29+
$this->exporterManager->cleanupExportTmpData();
2530
}
2631
}

‎src/Resources/config/services.yml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,15 @@ services:
160160
class: CustomerManagementFrameworkBundle\ActivityUrlTracker\DefaultActivityUrlTracker
161161

162162
CustomerManagementFrameworkBundle\LinkGenerator\LinkActivityDefinitionLinkGenerator:
163-
alias: cmf.link-activity-definition.linkgenerator
163+
arguments:
164+
- '%pimcore_customer_management_framework.url_activity_tracker.linkCmfcPlaceholder%'
164165

165166
cmf.link-activity-definition.linkgenerator:
166-
class: CustomerManagementFrameworkBundle\LinkGenerator\LinkActivityDefinitionLinkGenerator
167+
alias: CustomerManagementFrameworkBundle\LinkGenerator\LinkActivityDefinitionLinkGenerator
167168
deprecated:
168-
message: 'The "%service_id%" service is deprecated. Use "CustomerManagementFrameworkBundle\LinkGenerator\LinkActivityDefinitionLinkGenerator" instead'
169+
message: 'The "%alias_id%" alias is deprecated. Use "CustomerManagementFrameworkBundle\LinkGenerator\LinkActivityDefinitionLinkGenerator" instead'
169170
package: pimcore/customer-management-framework-bundle
170171
version: 3.0
171-
arguments:
172-
- '%pimcore_customer_management_framework.url_activity_tracker.linkCmfcPlaceholder%'
173172

174173
cmf.segment_manager.segment_merger:
175174
class: CustomerManagementFrameworkBundle\SegmentManager\SegmentMerger\DefaultSegmentMerger
@@ -202,25 +201,25 @@ services:
202201

203202

204203
CustomerManagementFrameworkBundle\CustomerList\ExporterManagerInterface:
205-
alias: cmf.customer_exporter_manager
204+
class: CustomerManagementFrameworkBundle\CustomerList\ExporterManager
205+
arguments:
206+
- '%pimcore_customer_management_framework.customer_list.exporters%'
206207

207208
cmf.customer_exporter_manager:
208-
class: CustomerManagementFrameworkBundle\CustomerList\ExporterManager
209+
alias: CustomerManagementFrameworkBundle\CustomerList\ExporterManagerInterface
209210
deprecated:
210-
message: 'The "%service_id%" service is deprecated. Use "CustomerManagementFrameworkBundle\CustomerList\ExporterManagerInterface" instead'
211+
message: 'The "%alias_id%" alias is deprecated. Use "CustomerManagementFrameworkBundle\CustomerList\ExporterManagerInterface" instead'
211212
package: pimcore/customer-management-framework-bundle
212213
version: 3.0
213-
arguments:
214-
- '%pimcore_customer_management_framework.customer_list.exporters%'
215214

216215

217216
CustomerManagementFrameworkBundle\ActionTrigger\Queue\QueueInterface:
218-
alias: cmf.action_trigger.queue
217+
class: CustomerManagementFrameworkBundle\ActionTrigger\Queue\DefaultQueue
219218

220219
cmf.action_trigger.queue:
221-
class: CustomerManagementFrameworkBundle\ActionTrigger\Queue\DefaultQueue
220+
alias: CustomerManagementFrameworkBundle\ActionTrigger\Queue\QueueInterface
222221
deprecated:
223-
message: 'The "%service_id%" service is deprecated. Use "CustomerManagementFrameworkBundle\ActionTrigger\Queue\QueueInterface" instead'
222+
message: 'The "%alias_id%" alias is deprecated. Use "CustomerManagementFrameworkBundle\ActionTrigger\Queue\QueueInterface" instead'
224223
package: pimcore/customer-management-framework-bundle
225224
version: 3.0
226225

‎src/Resources/config/services_events.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
services:
22
_defaults:
3-
public: true
4-
autowire: true
5-
autoconfigure: true
3+
public: true
4+
autowire: true
5+
autoconfigure: true
66

77
pimcore.event_listener.frontend.activity_url_tracker:
8-
class: CustomerManagementFrameworkBundle\Event\Frontend\UrlActivityTracker
9-
tags:
10-
- { name: kernel.event_listener, event: kernel.request, method: onKernelRequest, priority: -200 }
8+
class: CustomerManagementFrameworkBundle\Event\Frontend\UrlActivityTracker
9+
tags:
10+
- { name: kernel.event_listener, event: kernel.request, method: onKernelRequest, priority: -200 }
1111

1212

1313
cmf.event_listener.pimcore_object:
14-
class: CustomerManagementFrameworkBundle\Event\PimcoreObjectEventListener
15-
tags:
16-
- { name: kernel.event_listener, event: pimcore.dataobject.preUpdate, method: onPreUpdate }
17-
- { name: kernel.event_listener, event: pimcore.dataobject.postUpdate, method: onPostUpdate }
18-
- { name: kernel.event_listener, event: pimcore.dataobject.preAdd, method: onPreAdd }
19-
- { name: kernel.event_listener, event: pimcore.dataobject.postAdd, method: onPostAdd }
20-
- { name: kernel.event_listener, event: pimcore.dataobject.preDelete, method: onPreDelete }
21-
- { name: kernel.event_listener, event: pimcore.dataobject.postDelete, method: onPostDelete }
22-
- { name: kernel.event_listener, event: pimcore.dataobject.import.preSave, method: onPreSave }
14+
class: CustomerManagementFrameworkBundle\Event\PimcoreObjectEventListener
15+
tags:
16+
- { name: kernel.event_listener, event: pimcore.dataobject.preUpdate, method: onPreUpdate }
17+
- { name: kernel.event_listener, event: pimcore.dataobject.postUpdate, method: onPostUpdate }
18+
- { name: kernel.event_listener, event: pimcore.dataobject.preAdd, method: onPreAdd }
19+
- { name: kernel.event_listener, event: pimcore.dataobject.postAdd, method: onPostAdd }
20+
- { name: kernel.event_listener, event: pimcore.dataobject.preDelete, method: onPreDelete }
21+
- { name: kernel.event_listener, event: pimcore.dataobject.postDelete, method: onPostDelete }
22+
- { name: kernel.event_listener, event: pimcore.dataobject.import.preSave, method: onPreSave }
2323

2424
cmf.event_listener.object_merger:
25-
class: CustomerManagementFrameworkBundle\Event\CustomerMergerEventListener
26-
tags:
27-
- { name: kernel.event_listener, event: plugin.ObjectMerger.postMerge, method: onPostMerge }
28-
- { name: kernel.event_listener, event: plugin.ObjectMerger.preMerge, method: onPreMerge }
25+
class: CustomerManagementFrameworkBundle\Event\CustomerMergerEventListener
26+
tags:
27+
- { name: kernel.event_listener, event: plugin.ObjectMerger.postMerge, method: onPostMerge }
28+
- { name: kernel.event_listener, event: plugin.ObjectMerger.preMerge, method: onPreMerge }
2929

3030
CustomerManagementFrameworkBundle\ActionTrigger\EventHandler\EventHandlerInterface:
31-
alias: cmf.event_listener.action_trigger
32-
33-
cmf.event_listener.action_trigger:
3431
class: CustomerManagementFrameworkBundle\ActionTrigger\EventHandler\DefaultEventHandler
35-
deprecated:
36-
message: 'The "%service_id%" service is deprecated. Use "CustomerManagementFrameworkBundle\ActionTrigger\Queue\QueueInterface" instead'
37-
package: pimcore/customer-management-framework-bundle
38-
version: 3.0
3932
tags:
4033
- { name: kernel.event_listener, event: plugin.cmf.new-activity, method: handleEvent }
4134
- { name: kernel.event_listener, event: plugin.cmf.execute-segment-builders, method: handleEvent }
4235
- { name: kernel.event_listener, event: plugin.cmf.after-track-activity, method: handleEvent }
4336
- { name: kernel.event_listener, event: plugin.cmf.segment-tracked, method: handleEvent }
4437
- { name: kernel.event_listener, event: plugin.cmf.target-group-assigned, method: handleEvent }
45-
4638
calls:
4739
- [setLogger, ['@cmf.logger']]
4840

41+
cmf.event_listener.action_trigger:
42+
alias: CustomerManagementFrameworkBundle\ActionTrigger\EventHandler\EventHandlerInterface
43+
deprecated:
44+
message: 'The "%alias_id%" alias is deprecated. Use "CustomerManagementFrameworkBundle\ActionTrigger\EventHandler\EventHandlerInterface" instead'
45+
package: pimcore/customer-management-framework-bundle
46+
version: 3.0
47+
48+
4949
CustomerManagementFrameworkBundle\Event\PimcoreElementRemovalListenerInterface:
5050
class: CustomerManagementFrameworkBundle\Event\PimcoreElementRemovalListener
5151
tags:

0 commit comments

Comments
 (0)