PT-846: Implement Plugin for Shopware 6.6

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "mondu/shopware6-payment",
   "description": "Mondu payment for Shopware 6",
-  "version": "1.1.4",
+  "version": "2.0.0",
   "type": "shopware-platform-plugin",
   "license": "proprietary",
   "authors": [
@@ -15,7 +15,7 @@
     }
   },
   "require": {
-    "shopware/core": "^6.5",
+    "shopware/core": "^6.6",
     "ext-json": "*"
   },
   "extra": {

src/Bootstrap/AbstractBootstrap.php

@@ -9,13 +9,10 @@
 use Shopware\Core\Framework\Plugin\Context\InstallContext;
 use Shopware\Core\Framework\Plugin\Context\UpdateContext;
 use Shopware\Core\Framework\Plugin\PluginEntity;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-abstract class AbstractBootstrap implements ContainerAwareInterface
+abstract class AbstractBootstrap
 {
-    use ContainerAwareTrait;
-
     /**
      * @var Context
      */
@@ -41,8 +38,12 @@ abstract class AbstractBootstrap implements ContainerAwareInterface
      */
     protected PluginEntity $plugin;
 
-    final public function __construct()
-    {
+    /**
+     * @param  ContainerInterface  $container
+     */
+    final public function __construct(
+        protected ContainerInterface $container,
+    ) {
     }
 
     abstract public function install(): void;

src/Components/Order/Controller/CreditNoteController.php

@@ -10,14 +10,11 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 
-/**
- * @Route(defaults={"_routeScope"={"api"}})
- */
+#[Route(defaults: ['_routeScope' => ['api']])]
 class CreditNoteController extends AbstractController
 {
     public function __construct(
@@ -28,9 +25,7 @@ public function __construct(
         private readonly EntityRepository $documentRepository
     ) {}
 
-    /**
-     * @Route(name="mondu-payment.credit_note.cancel", path="/api/mondu/orders/{orderId}/credit_notes/{creditNoteId}/cancel", defaults={"csrf_protected"=false}, methods={"POST"})
-     */
+    #[Route(path: '/api/mondu/orders/{orderId}/credit_notes/{creditNoteId}/cancel', name: 'mondu-payment.credit_note.cancel', methods: ['POST'])]
     public function cancel(Request $request, string $orderId, string $creditNoteId, Context $context): Response
     {
         try {

src/Components/Order/Controller/DocumentController.php

@@ -16,7 +16,6 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 #[Route(defaults: ['_routeScope' => ['storefront']])]
-
 class DocumentController extends AbstractController
 {
     /**
@@ -26,9 +25,7 @@ public function __construct(
         private readonly DocumentGenerator $documentGenerator
     ) {}
 
-    /**
-     * @Route(name="mondu-payment.payment.document", path="/mondu/document/{documentId}/{deepLinkCode}/{token}")
-     */
+    #[Route(path: '/mondu/document/{documentId}/{deepLinkCode}/{token}', name: 'mondu-payment.payment.document')]
     public function downloadDocument(Request $request, string $documentId, string $deepLinkCode, Context $context): Response
     {
         $documentUrlHelper = $this->container->get(DocumentUrlHelper::class);

src/Components/Order/Controller/InvoiceController.php

@@ -15,9 +15,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Mondu\MonduPayment\Util\CriteriaHelper;
 
-/**
- * @Route(defaults={"_routeScope"={"api"}})
- */
+#[Route(defaults: ['_routeScope' => ['api']])]
 class InvoiceController extends AbstractController
 {
     public function __construct(
@@ -27,9 +25,7 @@ public function __construct(
         private readonly EntityRepository $orderDataRepository
     ) {}
 
-    /**
-     * @Route(name="mondu-payment.invoice.cancel", path="/api/mondu/orders/{orderId}/{invoiceId}/cancel", defaults={"csrf_protected"=false}, methods={"POST"})
-     */
+    #[Route(path: '/api/mondu/orders/{orderId}/{invoiceId}/cancel', name: 'mondu-payment.invoice.cancel', methods: ['POST'])]
     public function cancel(Request $request, string $orderId, string $invoiceId, Context $context): Response
     {
         try {

src/Components/Order/DependencyInjection/controllers.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
         <defaults autowire="true" >
@@ -18,18 +18,18 @@
             <argument key="$monduClient" type="service" id="mondu.mondu_api" />
             <argument key="$invoiceDataRepository" type="service" id="mondu_invoice_data.repository"/>
             <argument key="$orderDataRepository" type="service" id="mondu_order_data.repository"/>
-                <call method="setContainer">
-                    <argument id="service_container" type="service"/>
-                </call>
+            <call method="setContainer">
+                <argument id="service_container" type="service"/>
+            </call>
         </service>
 
          <service id="Mondu\MonduPayment\Components\Order\Controller\CreditNoteController">
             <argument key="$monduClient" type="service" id="mondu.mondu_api" />
             <argument key="$invoiceDataRepository" type="service" id="mondu_invoice_data.repository"/>
             <argument key="$orderDataRepository" type="service" id="mondu_order_data.repository"/>
-                <call method="setContainer">
-                    <argument id="service_container" type="service"/>
-                </call>
+            <call method="setContainer">
+                <argument id="service_container" type="service"/>
+            </call>
         </service>
 
     </services>

src/Components/Order/Model/OrderDataEntity.php

@@ -47,7 +47,7 @@ class OrderDataEntity extends Entity
     /**
      * @var OrderEntity
      */
-    protected OrderEntity $order;
+    protected $order;
 
     /**
      * @var string

src/Components/PluginConfig/Controller/ConfigController.php

@@ -11,18 +11,14 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
-/**
- * @Route(defaults={"_routeScope"={"api"}})
- */
+#[Route(defaults: ['_routeScope' => ['api']])]
 class ConfigController extends AbstractController
 {
     public function __construct(
         private readonly MonduClient $monduClient
     ) {}
 
-    /**
-     * @Route(name="mondu-payment.config.test", path="/api/mondu/config/test", defaults={"csrf_protected"=false}, methods={"POST"})
-     */
+    #[Route(path: '/api/mondu/config/test', name: 'mondu-payment.config.test', methods: ['POST'])]
     public function test(Request $request, Context $context): Response
     {
         try {

src/Components/PluginConfig/DependencyInjection/controllers.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
         <defaults autowire="true" >

src/Components/PluginConfig/DependencyInjection/services.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <defaults autowire="true"/>
 

src/Components/StateMachine/DependencyInjection/services.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <defaults autowire="true" />
 

src/Components/StateMachine/DependencyInjection/subscriber.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
         <defaults autowire="true">

src/Components/Webhooks/Controller/WebhooksController.php

@@ -13,9 +13,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
+#[Route(defaults: ['_routeScope' => ['storefront']])]
 class WebhooksController extends StorefrontController
 {
     private ConfigService $configService;
@@ -29,9 +27,7 @@ public function __construct(
         $this->webhookService = $webhookService;
     }
 
-    /**
-      * @Route("/mondu/webhooks", name="mondu-payment.webhooks", defaults={"csrf_protected"=false}, methods={"POST"})
-      */
+    #[Route(path: '/mondu/webhooks', name: 'mondu-payment.webhooks', methods: ['POST'])]
     public function process(Request $request, Context $context): Response
     {
         $content = $request->getContent();

src/Components/Webhooks/DependencyInjection/controllers.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
         <defaults autowire="true" >

src/Components/Webhooks/DependencyInjection/services.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <defaults autowire="true"/>
 

src/Mond1SW6.php

@@ -13,6 +13,7 @@
 use Shopware\Core\Framework\Plugin\Context\UninstallContext;
 use Shopware\Core\Framework\Plugin\Context\UpdateContext;
 use Shopware\Core\Framework\Plugin\Context\ActivateContext;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class Mond1SW6 extends Plugin
 {
@@ -76,8 +77,8 @@ public function uninstall(UninstallContext $uninstallContext): void
     protected function getBootstrapClasses(InstallContext $installContext): array
     {
         $bootstrapper = [
-            new PaymentMethods(),
-            new Database()
+            new PaymentMethods($this->container),
+            new Database($this->container)
         ];
 
         $pluginRepository = $this->container->get('plugin.repository');
@@ -91,7 +92,6 @@ protected function getBootstrapClasses(InstallContext $installContext): array
         foreach ($bootstrapper as $bootstrap) {
             $bootstrap->setContext($installContext->getContext());
             $bootstrap->setInstallContext($installContext);
-            $bootstrap->setContainer($this->container);
             $bootstrap->injectServices();
             $bootstrap->setPlugin($plugin);
         }

src/Pos/Run/LoggerFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mondu\MonduPayment\Pos\Run;
+
+use Monolog\Logger;
+use Monolog\Processor\PsrLogMessageProcessor;
+use Shopware\Core\Framework\Log\Package;
+use Swag\PayPal\Pos\Run\LogHandler;
+
+#[Package('checkout')]
+class LoggerFactory
+{
+    public function createLogger(): Logger
+    {
+        $logger = new Logger('mondu_mondupayment_pos');
+        $logger->pushHandler(new LogHandler());
+        $logger->pushProcessor(new PsrLogMessageProcessor());
+
+        return $logger;
+    }
+}

src/Resources/config/routes.xml

@@ -2,7 +2,7 @@
 <routes xmlns="http://symfony.com/schema/routing"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing
-        http://symfony.com/schema/routing/routing-1.0.xsd">
+        https://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <import resource="../../Components/**/Controller/*" type="annotation" />
+    <import resource="../../Components/**/Controller/*" type="attribute" />
 </routes>

src/Resources/config/services.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+           xsi:schemaLocation="https://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <imports>
         <import resource="../../Components/*/DependencyInjection/services.xml"/>
@@ -104,8 +104,10 @@
             <argument type="service" key="$mediaRepository" id="media.repository"/>
         </service>
 
+        <service id="Mondu\MonduPayment\Pos\Run\LoggerFactory"/>
+
         <service id="mondu.logger" class="Monolog\Logger">
-            <factory service="Shopware\Core\Framework\Log\LoggerFactory" method="createRotating"/>
+            <factory service="Mondu\MonduPayment\Pos\Run\LoggerFactory" method="createLogger"/>
             <argument type="string">mondu_payment</argument>
         </service>