Merge pull request #27612 from laboro/fix/MMS-27_4.1

MMS-27: Remove unneeded mailchimp .class parameters from container in…
oroinc · Apr 27, 2020 · b5a7863 · b5a7863
2 parents 7580993 + c4e0748
commit b5a7863
Show file tree

Hide file tree

Showing 3 changed files with 185 additions and 337 deletions.
diff --git a/Command/MailChimpExportCommand.php b/Command/MailChimpExportCommand.php
@@ -139,9 +139,7 @@ protected function getStaticSegmentRepository()
         /** @var RegistryInterface $registry */
         $registry = $this->container->get('doctrine');
 
-        return $registry->getRepository(
-            $this->container->getParameter('oro_mailchimp.entity.static_segment.class')
-        );
+        return $registry->getRepository(StaticSegment::class);
     }
 
     /**

diff --git a/Resources/config/oro/datagrids.yml b/Resources/config/oro/datagrids.yml
@@ -52,7 +52,7 @@ datagrids:
         properties:
             id: ~
     oro_mailchimp_templates_grid:
-        extended_entity_name: '%oro_mailchimp.entity.template.class%'
+        extended_entity_name: 'Oro\Bundle\MailChimpBundle\Entity\Template'
         acl_resource: oro_email_campaign_view
         channel_limitation:
             channel_relation_path: .channel
@@ -68,7 +68,7 @@ datagrids:
                     - t.type
                     - t.layout
                 from:
-                    - { table: '%oro_mailchimp.entity.template.class%', alias: t }
+                    - { table: 'Oro\Bundle\MailChimpBundle\Entity\Template', alias: t }
                 where:
                     and:
                         - t.active = true
@@ -113,7 +113,7 @@ datagrids:
             id: ~
 
     oro_mailchimp_lists_grid:
-        extended_entity_name: '%oro_mailchimp.entity.subscribers_list.class%'
+        extended_entity_name: 'Oro\Bundle\MailChimpBundle\Entity\SubscribersList'
         channel_limitation:
             channel_relation_path: .channel
         options:
@@ -127,7 +127,7 @@ datagrids:
                     - l.createdAt
                     - l.updatedAt
                 from:
-                    - { table: '%oro_mailchimp.entity.subscribers_list.class%', alias: l }
+                    - { table: 'Oro\Bundle\MailChimpBundle\Entity\SubscribersList', alias: l }
                 where:
                     and:
                         - l.owner = @oro_security.token_accessor->getOrganizationId