feat: Support Shopware 5.6

FriendsOfShopware · Jun 17, 2021 · 13e09af · 13e09af
1 parent cfeef97
commit 13e09af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Commands/ExportMailTemplatesCommand.php b/Commands/ExportMailTemplatesCommand.php
@@ -64,5 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io = new SymfonyStyle($input, $output);
         $io->success(sprintf('Exported %d mail templates from database to "%s"', count($mailTemplates), realpath($folder)));
+
+        return 0;
     }
-}
+}
diff --git a/Components/TemplateMailFactory.php b/Components/TemplateMailFactory.php
@@ -18,16 +18,16 @@ public function factory(Container $container)
         $container->load('MailTransport');
 
         $stringCompiler = new \Shopware_Components_StringCompiler(
-            clone $container->get('Template')
+            clone $container->get('template')
         );
         $mailer = new TemplateMail(
             $container->get('theme_inheritance'),
             $container->get('frosh_template_mail.template_mail_loader')
         );
-        if ($container->initialized('Shop')) {
-            $mailer->setShop($container->get('Shop'));
+        if ($container->initialized('shop')) {
+            $mailer->setShop($container->get('shop'));
         }
-        $mailer->setModelManager($container->get('Models'));
+        $mailer->setModelManager($container->get('models'));
         $mailer->setStringCompiler($stringCompiler);
 
         return $mailer;

diff --git a/Resources/services.xml b/Resources/services.xml
@@ -5,6 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
+        <defaults public="true"/>
         <service id="frosh_template_mail.template_mail_loader" class="FroshTemplateMail\Components\TemplateMailLoader">
             <argument type="tagged" tag="frosh_template_mail.loader"/>
         </service>