Feat/update laminas (#186)

* use only serializer json

* remove xendit serializer all at once

* Update to laminas and remove XenditSerializer class

* Modify testing environment for 8.2 PHP

* Add change log

.gitignore

@@ -91,4 +91,4 @@ telepresence.log
 
 .DS_Store
 
-docker/magento2
+docker-magento/magento2

CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG
+## 12.0.4 (2025-02-25)
+- Fix Undefined variable $xenditSerializerJson
+- Upgrade using Laminas\Http\Request from previous Zend\Http\Request on several class
 
 ## 12.0.3 (2024-11-25)
 - Remove UangMe as a payment method (regular & invoice multishipping)

Controller/Checkout/Invoice.php

@@ -7,7 +7,7 @@
 use Magento\Framework\Phrase;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\Order;
-use Zend\Http\Request;
+use Laminas\Http\Request;
 
 /**
  * Class Invoice

Controller/Checkout/InvoiceMultishipping.php

@@ -7,7 +7,7 @@
 use Magento\Framework\Phrase;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\Order;
-use Zend\Http\Request;
+use Laminas\Http\Request;
 
 /**
  * Class InvoiceMultishipping

Controller/Checkout/Notification.php

@@ -23,7 +23,7 @@
 use Xendit\M2Invoice\Helper\Data;
 use Xendit\M2Invoice\Logger\Logger as XenditLogger;
 use Xendit\M2Invoice\Model\Payment\Xendit;
-use Zend\Http\Request;
+use Laminas\Http\Request;
 
 /**
  * Class Notification
@@ -146,7 +146,7 @@ public function execute()
     {
         $post = $this->getRequest()->getContent();
         $callbackPayload = json_decode($post, true);
-        $this->logger->info("callbackPayload", $callbackPayload);
+        $this->logger->info("callbackPayload", array('payload' => $callbackPayload));
 
         try {
             // Invoice: Regular CC, Ewallet, Retail Outlet, PayLater

Helper/ApiRequest.php

@@ -6,7 +6,7 @@
 use Magento\Framework\Phrase;
 use Xendit\M2Invoice\Logger\Logger as XenditLogger;
 use Xendit\M2Invoice\Model\Payment\Xendit;
-use Zend\Http\Request;
+use Laminas\Http\Request;
 
 /**
  * Class ApiRequest

Helper/Metric.php

@@ -78,7 +78,7 @@ public function trackMetricCount(array $requestData)
         try {
             return $this->apiRequestHelper->request(
                 $this->dataHelper->getXenditApiUrl() . "/tpi/log/metrics/count",
-                \Zend\Http\Request::METHOD_POST,
+                \Laminas\Http\Request::METHOD_POST,
                 $requestData
             );
         } catch (LocalizedException $e) {

Model/Adminhtml/Source/CartRule.php

@@ -5,7 +5,6 @@
 use Magento\Framework\Model\Context;
 use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory;
 use Magento\Framework\Serialize\Serializer\Json as MagentoSerializerJson;
-use Xendit\M2Invoice\External\Serialize\Serializer\Json  as XenditSerializerJson;
 
 /**
  * Class CartRule
@@ -48,23 +47,16 @@ class CartRule implements \Magento\Framework\Option\ArrayInterface
      * @param Context $context
      * @param CollectionFactory $ruleCollectionFactory
      * @param MagentoSerializerJson $magentoSerializerJson
-     * @param XenditSerializerJson $xenditSerializerJson
      */
     public function __construct(
         Context $context,
         CollectionFactory $ruleCollectionFactory,
-        MagentoSerializerJson $magentoSerializerJson,
-        XenditSerializerJson $xenditSerializerJson
+        MagentoSerializerJson $magentoSerializerJson
     ) {
         $this->ruleCollectionFactory = $ruleCollectionFactory;
         $this->cache = $context->getCacheManager();
         $this->magentoSerializerJson = $magentoSerializerJson;
-        $this->xenditSerializerJson = $xenditSerializerJson;
-        if (interface_exists("Magento\Framework\Serialize\Serializer\Json")) {
-            $this->serializer = $this->magentoSerializerJson;
-        } else {
-            $this->serializer = $this->xenditSerializerJson;
-        }
+        $this->serializer = $this->magentoSerializerJson;
     }
 
     /**

Model/Payment/AbstractInvoice.php

@@ -16,7 +16,6 @@
 use Xendit\M2Invoice\Helper\ApiRequest;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\Serialize\Serializer\Json as MagentoSerializerJson;
-use Xendit\M2Invoice\External\Serialize\Serializer\Json  as XenditSerializerJson;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Xendit\M2Invoice\Helper\Metric;
@@ -109,7 +108,6 @@ class AbstractInvoice extends AbstractMethod
      * @param RuleRepository $ruleRepo
      * @param CartRepositoryInterface $quoteRepository
      * @param MagentoSerializerJson $magentoSerializerJson
-     * @param XenditSerializerJson $xenditSerializerJson
      * @param CustomerSession $customerSession
      */
     public function __construct(
@@ -126,7 +124,7 @@ public function __construct(
         RuleRepository $ruleRepo,
         CartRepositoryInterface $quoteRepository,
         MagentoSerializerJson $magentoSerializerJson,
-        XenditSerializerJson $xenditSerializerJson,
+        // XenditSerializerJson $xenditSerializerJson,
         CustomerSession $customerSession,
         Metric $metricHelper
     ) {
@@ -147,15 +145,9 @@ public function __construct(
         $this->ruleRepo                 = $ruleRepo;
         $this->quoteRepository          = $quoteRepository;
         $this->magentoSerializerJson    = $magentoSerializerJson;
-        $this->xenditSerializerJson     = $xenditSerializerJson;
         $this->customerSession          = $customerSession;
         $this->metricHelper             = $metricHelper;
-
-        if (interface_exists("Magento\Framework\Serialize\Serializer\Json")) {
-            $this->serializer = $this->magentoSerializerJson;
-        } else {
-            $this->serializer = $this->xenditSerializerJson;
-        }
+        $this->serializer               = $this->magentoSerializerJson;
     }
 
     /**

Model/Payment/CC.php

@@ -107,7 +107,7 @@ private function handleRefundResult($payment, $refund, $canRefundMore)
     private function requestRefund($chargeId, $requestData)
     {
         $refundUrl = $this->dataHelper->getXenditApiUrl() . "/tpi/payment/xendit/credit-card/charges/$chargeId/refund";
-        $refundMethod = \Zend\Http\Request::METHOD_POST;
+        $refundMethod = \Laminas\Http\Request::METHOD_POST;
 
         try {
             $refund = $this->apiHelper->request($refundUrl, $refundMethod, $requestData);

bin/copy-plugin.sh

@@ -10,12 +10,14 @@ fi
 SOURCE_DIR="$1"
 
 # Define the files and directories to zip
-FILES_TO_COPY="Block Controller etc External Gateway Helper Logger Model Plugin Setup Test view CHANGELOG.md LICENSE README.md registration.php composer.json setup-compile.sh"
+FILES_TO_COPY="Block Controller etc External Gateway Helper Logger Model Plugin Setup Test view CHANGELOG.md LICENSE README.md registration.php composer.json"
 
 if [ "$SOURCE_DIR" = "devilbox" ]; then
     DESTINATION="../devilbox/data/www/magento/magento2/app/code/Xendit/M2Invoice"
 elif [ "$SOURCE_DIR" = "demosites" ]; then
     DESTINATION="../public_html/app/code/Xendit/M2Invoice"
+elif [ "$SOURCE_DIR" = "local-74" ]; then
+    DESTINATION="./docker-magento/magento2/app/code/Xendit/M2Invoice"
 else
     echo "Invalid source directory"
     exit 1
@@ -28,7 +30,10 @@ cp -r $FILES_TO_COPY $DESTINATION || mkdir -p $DESTINATION && cp -r $FILES_TO_CO
 
 # Check if the copy was successful
 if [ $? -eq 0 ]; then
-    echo "Files copied successfully, please run 'bash setup-compile.sh' to compile the module"
+    echo "Files copied successfully, please run 'bash setup-compile.sh' under folder \"app\" to compile the module"
+    if [ "$SOURCE_DIR" = "local-74" ]; then
+        docker exec web bash -c "cd /app && bash setup-compile.sh"
+    fi
 else
     echo "Failed to copy files"
     proxit 1

composer.json

@@ -2,7 +2,7 @@
   "name": "xendit/m2invoice",
   "description": "Xendit Payment Gateway Module",
   "type": "magento2-module",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "license": [
     "GPL-3.0"
   ],

docker/README.md → docker-magento/README.md

@@ -89,7 +89,9 @@ php bin/magento setup:install \
 --admin-use-security-key=1 \
 --session-save=files \
 --use-sample-data \
---elasticsearch-host=elasticsearch
+--search-engine=elasticsearch7 \
+--elasticsearch-host=elasticsearch \
+--elasticsearch-port=9200
 ```
 
 To include Xendit_M2Invoice module without composer, copy the inner `Xendit` folder into your `MAGENTO_DIR/app/code`
@@ -117,6 +119,8 @@ Install sample data:
 php bin/magento sampledata:deploy
 ```
 
+After that run setup & compile command again
+
 ### Alternative (Non auth)
 
 You can also get the sample data by adding several package from composer, add this package into your `composer.json` installation

docker/docker-compose.yml → docker-magento/docker-compose.yml

@@ -1,10 +1,10 @@
 version: '3'
 services:
     web:
-        image: webdevops/php-apache-dev:7.4
+        image: webdevops/php-apache-dev:8.2
         container_name: web
         restart: always
-        user: application
+        user: root
         environment:
           - WEB_ALIAS_DOMAIN=magento24.local
           - WEB_DOCUMENT_ROOT=/app/pub
@@ -15,7 +15,7 @@ services:
           - PHP_POST_MAX_SIZE=500M
           - PHP_UPLOAD_MAX_FILESIZE=1024M
         volumes:
-          - ./magento2:/app:cached
+          - ./magento2:/app
         ports:
           - "80:80"
           - "443:443"
@@ -53,9 +53,11 @@ services:
         container_name: elasticsearch
         ports:
             - "9200:9200"
-            - "9300:9300"
         environment:
             - discovery.type=single-node
+            - network.host=0.0.0.0  # Changed from localhost
+            - http.port=9200
+            - cluster.name=elasticsearch
         volumes:
             - elasticsearch_data:/var/lib/elastisearch
 volumes: