fix(DynamicContentSubscriber): port Mautic 5 migration to Mautic 6

.github/workflows/tests.yml

@@ -7,7 +7,9 @@ on:
       - '[0-9]+\.[0-9]+'
       - development
       - beta
+      - 'fix/**'
   pull_request:
+  workflow_dispatch:
 
 env:
   PLUGIN_DIR: plugins/CustomObjectsBundle # Same as extra.install-directory-name in composer.json
@@ -18,9 +20,9 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0'] # The supported PHP versions
+        php-versions: ['8.2'] # The supported PHP versions
         db-types: ['mysql'] # can be: ['mysql', 'mariadb'] but not necessary for this plugin that does not add any DB schema
-        mautic-versions: ['5.1'] # The supported Mautic versions
+        mautic-versions: ['6.x'] # The supported Mautic versions
 
     name: Tests on PHP ${{ matrix.php-versions }}, ${{ matrix.db-types }}, Mautic ${{ matrix.mautic-versions }}
 

Command/CustomItemsScheduledExportCommand.php

@@ -21,7 +21,7 @@ class CustomItemsScheduledExportCommand extends Command
     public function __construct(
         private CustomItemExportSchedulerModel $customItemExportSchedulerModel,
         private EventDispatcherInterface $eventDispatcher,
-        private FormatterHelper $formatterHelper
+        private FormatterHelper $formatterHelper,
     ) {
         parent::__construct();
     }

Command/GenerateSampleDataCommand.php

@@ -22,7 +22,7 @@ class GenerateSampleDataCommand extends Command
 
     public function __construct(
         private EntityManager $entityManager,
-        private RandomHelper $randomHelper
+        private RandomHelper $randomHelper,
     ) {
         parent::__construct();
 

Config/config.php

@@ -635,6 +635,7 @@
             'custom_object.helper.token_formatter' => [
                 'class'     => MauticPlugin\CustomObjectsBundle\Helper\TokenFormatter::class,
             ],
+
             'custom_object.data_persister.custom_item' => [
                 'class'     => MauticPlugin\CustomObjectsBundle\DataPersister\CustomItemDataPersister::class,
                 'tag'       => 'api_platform.data_persister',
@@ -643,7 +644,7 @@
                 ],
             ],
             'custom_object.helper.contact_filter_matcher' => [
-                'class'     => \MauticPlugin\CustomObjectsBundle\Helper\ContactFilterMatcher::class,
+                'class'     => MauticPlugin\CustomObjectsBundle\Helper\ContactFilterMatcher::class,
                 'arguments' => [
                     'mautic.custom.model.field',
                     'mautic.custom.model.object',

Config/services.php

@@ -17,6 +17,8 @@
         'Report/ReportColumnsBuilder.php',
         'Serializer/ApiNormalizer.php',
         'Extension/CustomItemListeningExtension.php',
+        // Registered explicitly in config.php with a non-autowirable int argument
+        'Helper/ContactFilterMatcher.php',
     ];
 
     $services->load('MauticPlugin\\CustomObjectsBundle\\', '../')

Controller/CustomField/FormController.php

@@ -27,7 +27,7 @@ public function renderFormAction(
         CustomFieldPermissionProvider $permissionProvider,
         CustomFieldRouteProvider $fieldRouteProvider,
         CustomObjectModel $customObjectModel,
-        CustomObjectRouteProvider $objectRouteProvider
+        CustomObjectRouteProvider $objectRouteProvider,
     ): Response {
         $request    = $this->getCurrentRequest();
         $objectId   = (int) $request->get('objectId');

Controller/CustomField/SaveController.php

@@ -41,7 +41,7 @@ public function saveAction(
         CustomFieldFactory $customFieldFactory,
         CustomFieldPermissionProvider $permissionProvider,
         CustomFieldRouteProvider $fieldRouteProvider,
-        CustomObjectModel $customObjectModel
+        CustomObjectModel $customObjectModel,
     ) {
         $request    = $this->getCurrentRequest();
 
@@ -111,7 +111,7 @@ private function buildSuccessForm(
         CustomField $customField,
         Request $request,
         CustomFieldModel $customFieldModel,
-        FormFactoryInterface $formFactory
+        FormFactoryInterface $formFactory,
     ): JsonResponse {
         $panelId = is_numeric($request->get('panelId')) ? (int) $request->get('panelId') : null; // Is edit of existing panel in view
 

Controller/CustomItem/BatchDeleteController.php

@@ -22,7 +22,7 @@ public function deleteAction(
         CustomItemPermissionProvider $permissionProvider,
         CustomItemRouteProvider $routeProvider,
         FlashBag $flashBag,
-        int $objectId
+        int $objectId,
     ): Response {
         $request = $this->getCurrentRequest();
 

Controller/CustomItem/CancelController.php

@@ -21,7 +21,7 @@ public function cancelAction(
         CustomItemRouteProvider $routeProvider,
         CustomItemModel $customItemModel,
         int $objectId,
-        ?int $itemId = null
+        ?int $itemId = null,
     ): Response {
         $page = $sessionProviderFactory->createItemProvider($objectId)->getPage();
 

Controller/CustomItem/ContactListController.php

@@ -21,7 +21,7 @@ public function listAction(
         Request $request,
         PageHelperFactoryInterface $pageHelperFactory,
         int $objectId,
-        int $page = 1
+        int $page = 1,
     ): Response {
         return $this->generateContactsGrid(
             $request,

Controller/CustomItem/DeleteController.php

@@ -23,7 +23,7 @@ public function deleteAction(
         CustomItemPermissionProvider $permissionProvider,
         CustomItemRouteProvider $routeProvider,
         int $objectId,
-        int $itemId
+        int $itemId,
     ): Response {
         try {
             $customItem = $customItemModel->fetchEntity($itemId);

Controller/CustomItem/ExportController.php

@@ -26,7 +26,7 @@ class ExportController extends AbstractFormController
     public function exportAction(
         CustomItemPermissionProvider $permissionProvider,
         CustomItemExportSchedulerModel $model,
-        int $object
+        int $object,
     ): Response {
         $permissionProvider->canCreate($object);
 

Controller/CustomItem/FormController.php

@@ -25,7 +25,7 @@ public function newAction(
         CustomItemModel $customItemModel,
         CustomObjectModel $customObjectModel,
         CustomItemPermissionProvider $permissionProvider,
-        int $objectId
+        int $objectId,
     ): Response {
         try {
             $customItem = $this->performNewAction($customObjectModel, $customItemModel, $permissionProvider, $objectId);
@@ -48,7 +48,7 @@ public function newWithRedirectToContactAction(
         CustomObjectModel $customObjectModel,
         CustomItemPermissionProvider $permissionProvider,
         int $objectId,
-        int $contactId
+        int $contactId,
     ): Response {
         try {
             $customItem = $this->performNewAction($customObjectModel, $customItemModel, $permissionProvider, $objectId);
@@ -77,7 +77,7 @@ private function performNewAction(
         CustomObjectModel $customObjectModel,
         CustomItemModel $customItemModel,
         CustomItemPermissionProvider $permissionProvider,
-        int $objectId
+        int $objectId,
     ): CustomItem {
         $permissionProvider->canCreate($objectId);
 
@@ -95,7 +95,7 @@ public function editAction(
         LockFlashMessageHelper $lockFlashMessageHelper,
         CustomItemPermissionProvider $permissionProvider,
         int $objectId,
-        int $itemId
+        int $itemId,
     ): Response {
         try {
             $customItem = $this->performEditAction($customItemModel, $permissionProvider, $itemId);
@@ -134,7 +134,7 @@ public function editWithRedirectToContactAction(
         CustomItemPermissionProvider $permissionProvider,
         int $objectId,
         int $itemId,
-        int $contactId
+        int $contactId,
     ): Response {
         try {
             $customItem = $this->performEditAction($customItemModel, $permissionProvider, $itemId);
@@ -180,7 +180,7 @@ public function cloneAction(
         CustomItemModel $customItemModel,
         CustomItemPermissionProvider $permissionProvider,
         int $objectId,
-        int $itemId
+        int $itemId,
     ): Response {
         try {
             $customItem = clone $customItemModel->fetchEntity($itemId);
@@ -204,7 +204,7 @@ public function cloneAction(
     private function performEditAction(
         CustomItemModel $customItemModel,
         CustomItemPermissionProvider $permissionProvider,
-        int $itemId
+        int $itemId,
     ): CustomItem {
         $customItem = $customItemModel->fetchEntity($itemId);
         $permissionProvider->canEdit($customItem);
@@ -217,7 +217,7 @@ private function renderFormForItem(
         CustomItemRouteProvider $routeProvider,
         CustomItem $customItem,
         string $route,
-        ?int $contactId = null
+        ?int $contactId = null,
     ): Response {
         $action  = $routeProvider->buildSaveRoute($customItem->getCustomObject()->getId(), $customItem->getId());
         $options = [

Controller/CustomItem/LinkController.php

@@ -21,7 +21,7 @@ public function saveAction(
         FlashBag $flashBag,
         int $itemId,
         string $entityType,
-        int $entityId
+        int $entityId,
     ): JsonResponse {
         try {
             $customItem = $customItemModel->fetchEntity($itemId);

Controller/CustomItem/LinkFormController.php

@@ -31,7 +31,7 @@ public function formAction(
         FlashBag $flashBag,
         int $itemId,
         string $entityType,
-        int $entityId
+        int $entityId,
     ): Response {
         try {
             $customItem = $customItemModel->fetchEntity($itemId);
@@ -93,7 +93,7 @@ public function saveAction(
         FlashBag $flashBag,
         int $itemId,
         string $entityType,
-        int $entityId
+        int $entityId,
     ): Response {
         $relationshipItem   = null;
         $relationshipObject = null;
@@ -164,7 +164,7 @@ protected function getRelationshipItem(
         CustomObject $relationshipObject,
         CustomItem $customItem,
         string $entityType,
-        int $entityId
+        int $entityId,
     ): CustomItem {
         /** @var CustomItemXrefCustomItem|null $relationshipItemXref */
         $relationshipItemXref = $customItem->getCustomItemLowerReferences()

Controller/CustomItem/ListController.php

@@ -26,7 +26,7 @@ public function listAction(
         CustomItemPermissionProvider $permissionProvider,
         CustomItemRouteProvider $routeProvider,
         int $objectId,
-        int $page = 1
+        int $page = 1,
     ): Response {
         $request = $this->getCurrentRequest();
 

Controller/CustomItem/LookupController.php

@@ -22,7 +22,7 @@ public function listAction(
         CustomItemModel $customItemModel,
         CustomItemPermissionProvider $permissionProvider,
         FlashBag $flashBag,
-        int $objectId
+        int $objectId,
     ): JsonResponse {
         try {
             $permissionProvider->canViewAtAll($objectId);

Controller/CustomItem/SaveController.php

@@ -30,7 +30,7 @@ public function saveAction(
         CustomItemRouteProvider $routeProvider,
         LockFlashMessageHelper $lockFlashMessageHelper,
         int $objectId,
-        ?int $itemId = null
+        ?int $itemId = null,
     ): Response {
         $request = $this->getCurrentRequest();
 

Controller/CustomItem/UnlinkController.php

@@ -20,7 +20,7 @@ public function saveAction(
         FlashBag $flashBag,
         int $itemId,
         string $entityType,
-        int $entityId
+        int $entityId,
     ): JsonResponse {
         try {
             $customItem = $customItemModel->fetchEntity($itemId);

Controller/CustomItem/ViewController.php

@@ -26,7 +26,7 @@ public function viewAction(
         CustomItemPermissionProvider $permissionProvider,
         CustomItemRouteProvider $routeProvider,
         int $objectId,
-        int $itemId
+        int $itemId,
     ): Response {
         $request = $this->getCurrentRequest();
 

Controller/CustomObject/CancelController.php

@@ -16,7 +16,7 @@ public function cancelAction(
         SessionProviderFactory $sessionProviderFactory,
         CustomObjectRouteProvider $routeProvider,
         CustomObjectModel $customObjectModel,
-        ?int $objectId
+        ?int $objectId,
     ): Response {
         $page = $sessionProviderFactory->createObjectProvider()->getPage();
 

Controller/CustomObject/DeleteController.php

@@ -25,7 +25,7 @@ public function deleteAction(
         FlashBag $flashBag,
         CustomObjectPermissionProvider $permissionProvider,
         EventDispatcherInterface $eventDispatcher,
-        int $objectId
+        int $objectId,
     ): Response {
         $controller = 'MauticPlugin\CustomObjectsBundle\Controller\CustomObject\ListController:listAction';
         $page       = [

Controller/CustomObject/FormController.php

@@ -25,7 +25,7 @@ public function newAction(
         FormFactoryInterface $formFactory,
         CustomObjectRouteProvider $routeProvider,
         CustomFieldTypeProvider $customFieldTypeProvider,
-        CustomFieldModel $customFieldModel
+        CustomFieldModel $customFieldModel,
     ): Response {
         try {
             $permissionProvider->canCreate();
@@ -52,7 +52,7 @@ public function editAction(
         CustomObjectRouteProvider $routeProvider,
         CustomFieldTypeProvider $customFieldTypeProvider,
         CustomFieldModel $customFieldModel,
-        int $objectId
+        int $objectId,
     ): Response {
         try {
             $customObject = $customObjectModel->fetchEntity($objectId);
@@ -93,7 +93,7 @@ public function cloneAction(
         CustomObjectRouteProvider $routeProvider,
         CustomFieldTypeProvider $customFieldTypeProvider,
         CustomFieldModel $customFieldModel,
-        int $objectId
+        int $objectId,
     ): Response {
         try {
             $customObject = clone $customObjectModel->fetchEntity($objectId);
@@ -120,7 +120,7 @@ private function renderFormForObject(
         CustomFieldTypeProvider $customFieldTypeProvider,
         CustomFieldModel $customFieldModel,
         CustomObject $customObject,
-        string $route
+        string $route,
     ): Response {
         $form = $formFactory->create(
             CustomObjectType::class,

Controller/CustomObject/ListController.php

@@ -22,7 +22,7 @@ public function listAction(
         CustomObjectModel $customObjectModel,
         CustomObjectPermissionProvider $permissionProvider,
         CustomObjectRouteProvider $routeProvider,
-        int $page = 1
+        int $page = 1,
     ): Response {
         $request = $this->getCurrentRequest();
 

Controller/CustomObject/SaveController.php

@@ -37,7 +37,7 @@ public function saveAction(
         ParamsToStringTransformer $paramsToStringTransformer,
         OptionsToStringTransformer $optionsToStringTransformer,
         LockFlashMessageHelper $lockFlashMessageHelper,
-        ?int $objectId = null
+        ?int $objectId = null,
     ): Response {
         $request = $this->getCurrentRequest();
 
@@ -133,7 +133,7 @@ private function handleRawPost(
         ParamsToStringTransformer $paramsToStringTransformer,
         OptionsToStringTransformer $optionsToStringTransformer,
         CustomObject $customObject,
-        array $rawCustomObject
+        array $rawCustomObject,
     ): void {
         if (empty($rawCustomObject['customFields'])) {
             return;

Controller/CustomObject/ViewController.php

@@ -23,7 +23,7 @@ public function viewAction(
         AuditLogModel $auditLogModel,
         CustomObjectPermissionProvider $permissionProvider,
         CustomObjectRouteProvider $routeProvider,
-        int $objectId
+        int $objectId,
     ): Response {
         $request = $this->getCurrentRequest();
 

CustomFieldType/AbstractCustomFieldType.php

@@ -26,7 +26,7 @@ abstract class AbstractCustomFieldType implements CustomFieldTypeInterface, \Str
 
     public function __construct(
         protected TranslatorInterface $translator,
-        protected FilterOperatorProviderInterface $filterOperatorProvider
+        protected FilterOperatorProviderInterface $filterOperatorProvider,
     ) {
     }
 

CustomFieldType/AbstractMultivalueType.php

@@ -25,7 +25,7 @@ abstract class AbstractMultivalueType extends AbstractCustomFieldType
     public function __construct(
         TranslatorInterface $translator,
         FilterOperatorProviderInterface $filterOperatorProvider,
-        private CsvHelper $csvHelper
+        private CsvHelper $csvHelper,
     ) {
         parent::__construct($translator, $filterOperatorProvider);
     }