use oxNewService

src/Controller/OrderController.php

@@ -12,6 +12,7 @@
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Application\Controller\PaymentController;
 use OxidSolutionCatalysts\Adyen\Model\Payment;
+use OxidSolutionCatalysts\Adyen\Service\OxNewService;
 use OxidSolutionCatalysts\Adyen\Service\TranslationMapper;
 use OxidSolutionCatalysts\Adyen\Service\OrderReturnService;
 use OxidSolutionCatalysts\Adyen\Traits\ServiceContainer;
@@ -61,7 +62,8 @@ public function execute()
         /** @var Payment $payment */
         $payment = $this->getPayment();
         if ($payment->isAdyenCreditCardPayment()) {
-            $paymentController = oxNew(PaymentController::class);
+            $oxNewService = $this->getServiceFromContainer(OxNewService::class);
+            $paymentController = $oxNewService->oxNew(PaymentController::class);
 
             if ($paymentController->validatePayment() !== "order") {
                 Registry::getUtils()->redirect(Registry::getConfig()->getShopHomeUrl() . 'cl=payment');

src/Core/Webhook/Handler/WebhookHandlerBase.php

@@ -19,6 +19,7 @@
 use OxidSolutionCatalysts\Adyen\Model\AdyenHistoryList;
 use OxidSolutionCatalysts\Adyen\Model\Order as AdyenModel;
 use OxidSolutionCatalysts\Adyen\Service\Context;
+use OxidSolutionCatalysts\Adyen\Service\OxNewService;
 use OxidSolutionCatalysts\Adyen\Traits\ServiceContainer;
 use Psr\Log\LoggerInterface;
 
@@ -40,10 +41,12 @@ public function __construct(
         ?AdyenHistoryList $adyenHistoryList = null,
         ?Context $context = null
     ) {
+        $oxNewService = $this->getServiceFromContainer(OxNewService::class);
+
         // whether getting mock objects from unit test or new objects for production
-        $this->payment = $payment ?? oxNew(Payment::class);
-        $this->order = $order ?? oxNew(Order::class);
-        $this->adyenHistoryList = $adyenHistoryList ?? oxNew(AdyenHistoryList::class);
+        $this->payment = $payment ?? $oxNewService->oxNew(Payment::class);
+        $this->order = $order ?? $oxNewService->oxNew(Order::class);
+        $this->adyenHistoryList = $adyenHistoryList ?? $oxNewService->oxNew(AdyenHistoryList::class);
         $this->context = $context ?? $this->getServiceFromContainer(Context::class);
     }
 
@@ -143,7 +146,8 @@ protected function setHistoryEntry(
         string $action
     ): void {
         try {
-            $adyenHistory = oxNew(AdyenHistory::class);
+            $oxNewService = $this->getServiceFromContainer(OxNewService::class);
+            $adyenHistory = $oxNewService->oxNew(AdyenHistory::class);
             $adyenHistory->setOrderId($orderId);
             $adyenHistory->setShopId($shopId);
             $adyenHistory->setPrice($amount);