Add compatibility for 6.3.4.0

CHANGELOG_de-DE.md

@@ -1,3 +1,7 @@
+# 0.3.3
+
+* Kompatiblität mit 6.3.4.0
+
 # 0.3.2
 
 * Kompatiblität mit 6.3.3.0

CHANGELOG_en-GB.md

@@ -1,14 +1,18 @@
+# 0.3.3
+
+* Compatibility 6.3.4.0
+
 # 0.3.2
 
-* Compability mit 6.3.3.0
+* Compatibility 6.3.3.0
 
 # 0.3.1
 
-* Compability mit 6.3.3.0
+* Compatibility 6.3.3.0
 
 # 0.3.0
 
-* Compability mit 6.3.3.0
+* Compatibility 6.3.3.0
 
 # 0.2.1
 
@@ -18,11 +22,11 @@
 
 # 0.2.0
 
-* Compability mit 6.3
+* Compatibility mit 6.3
 
 # 0.1.2
 
-* Compability mit 6.2
+* Compatibility mit 6.2
 
 # 0.1.1
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "frosh/frosh-platform-template-mail",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "type": "shopware-platform-plugin",
     "description": "Load mail templates from theme",
     "keywords": [
@@ -40,9 +40,8 @@
         }
     },
     "require": {
-        "shopware/core": "~6.3.3.0",
-        "shopware/administration": "~6.3.3.0",
-        "lorenzo/pinky": "^1.0",
-        "nikic/php-parser": "4.3.0"
+        "shopware/core": "~6.3.4.0",
+        "shopware/administration": "~6.3.4.0",
+        "lorenzo/pinky": "^1.0"
     }
 }

src/FroshPlatformTemplateMail.php

@@ -21,7 +21,6 @@ class FroshPlatformTemplateMail extends Plugin
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new CacheCompilerPass());
-        $container->addCompilerPass(new OrderServiceGeneratorPass());
         parent::build($container);
     }
 }

src/Resources/config/services.xml

@@ -9,16 +9,15 @@
     </imports>
     <services>
         <service id="Shopware\Core\Content\MailTemplate\Subscriber\MailSendSubscriber" class="Frosh\TemplateMail\Subscriber\MailSendSubscriber">
-            <tag name="kernel.event_subscriber"/>
             <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MailService"/>
             <argument type="service" id="mail_template.repository"/>
+            <argument type="service" id="Shopware\Core\Content\Media\MediaService"/>
+            <argument type="service" id="media.repository"/>
+            <argument type="service" id="document.repository"/>
+            <argument type="service" id="Shopware\Core\Checkout\Document\DocumentService"/>
+            <argument type="service" id="logger"/>
             <argument type="service" id="Frosh\TemplateMail\Services\MailFinderService"/>
-        </service>
-
-        <service id="Frosh\TemplateMail\Subscriber\MailDataBagFilterSubscriber">
             <tag name="kernel.event_subscriber"/>
-            <argument type="service" id="mail_template_type.repository"/>
-            <argument type="service" id="Frosh\TemplateMail\Services\MailFinderService"/>
         </service>
 
         <service id="Frosh\TemplateMail\Services\MailFinderService">

src/Services/MailFinderService.php

@@ -4,6 +4,7 @@
 
 use Frosh\TemplateMail\Services\MailLoader\LoaderInterface;
 use Shopware\Core\Framework\Adapter\Translation\Translator;
+use Shopware\Core\Framework\Api\Context\SalesChannelApiSource;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
@@ -54,7 +55,7 @@ public function findTemplateByTechnicalName(string $type, string $technicalName,
         $paths = $this->filesystemLoader->getPaths();
         $searchFolder = [$businessEvent->getContext()->getLanguageId(), 'global'];
 
-        if ($businessEvent->getContext()->getSource() instanceof Context\SalesChannelApiSource) {
+        if ($businessEvent->getContext()->getSource() instanceof SalesChannelApiSource) {
             array_unshift($searchFolder, $businessEvent->getContext()->getSource()->getSalesChannelId());
         }