Add comprehensive unit tests and CI pipeline

.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+      - 'claude/**'
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  test:
+    name: PHP ${{ matrix.php-version }} Tests
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.0', '8.1', '8.2']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, intl, pdo
+          coverage: none
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache Composer packages
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-${{ matrix.php-version }}-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-interaction
+
+      - name: Run PHPUnit tests
+        run: vendor/bin/phpunit --configuration phpunit.xml.dist --testdox

.gitignore

@@ -50,3 +50,4 @@
 
 # Embedded web-server pid file
 /.web-server-pid
+.phpunit.result.cache

EventListener/CartEventListener.php

@@ -3,6 +3,8 @@
 namespace Plugin\MPBC43\EventListener;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Eccube\Entity\Product;
+use Eccube\Entity\ProductClass;
 use Eccube\Event\EccubeEvents;
 use Eccube\Event\EventArgs;
 use Eccube\Service\CartService;
@@ -50,15 +52,14 @@ public function __construct(
     public static function getSubscribedEvents()
     {
         return [
-            // CartEventListenerを一時的に無効化してEntityNotFoundExceptionを回避
-            // EccubeEvents::FRONT_CART_ADD_COMPLETE => 'onCartAdd',
-            // EccubeEvents::FRONT_CART_INDEX_INITIALIZE => 'onCartIndex',
+            EccubeEvents::FRONT_CART_ADD_COMPLETE => 'onCartAdd',
+            EccubeEvents::FRONT_CART_INDEX_INITIALIZE => 'onCartIndex',
         ];
     }
 
     /**
      * カート追加時の処理
-     * 
+     *
      * @param EventArgs $event
      */
     public function onCartAdd(EventArgs $event)
@@ -68,7 +69,7 @@ public function onCartAdd(EventArgs $event)
 
     /**
      * カート表示時の処理
-     * 
+     *
      * @param EventArgs $event
      */
     public function onCartIndex(EventArgs $event)
@@ -77,110 +78,99 @@ public function onCartIndex(EventArgs $event)
     }
 
     /**
-     * カート内の商品を検証し、不正な商品を削除
+     * カート内の商品を検証し、不正な商品を削除する。
+     * セッション不一致の商品、購入済み商品を除去する。
      */
-    private function validateCartProducts()
+    private function validateCartProducts(): void
     {
         $request = $this->requestStack->getCurrentRequest();
         if (!$request) {
             return;
         }
 
-        $currentSessionId = $request->getSession()->getId();
         $Cart = $this->cartService->getCart();
-
         if (!$Cart) {
             return;
         }
 
-        error_log('[MPBC] Cart validation started. Current session: ' . substr($currentSessionId, 0, 8));
-        error_log('[MPBC] Cart has ' . count($Cart->getCartItems()) . ' items');
+        $currentSessionId = $request->getSession()->getId();
+        $currentSessionPrefix = substr($currentSessionId, 0, 8);
 
-        try {
-            $hasRemovedItems = false;
+        $hasRemovedItems = false;
 
-            foreach ($Cart->getCartItems() as $CartItem) {
-                $ProductClass = $CartItem->getProductClass();
-                if (!$ProductClass) {
-                    error_log('[MPBC] Cart item has no ProductClass - skipping');
-                    continue;
-                }
+        foreach ($Cart->getCartItems() as $CartItem) {
+            $ProductClass = $CartItem->getProductClass();
+            if (!$ProductClass) {
+                continue;
+            }
 
-                $Product = $ProductClass->getProduct();
-                if (!$Product) {
-                    error_log('[MPBC] ProductClass has no Product - skipping');
-                    continue;
+            // エンティティの遅延ロードで EntityNotFoundException が発生する可能性があるため
+            // EntityManagerから直接取得して安全にチェックする
+            $Product = null;
+            try {
+                $productId = null;
+                if ($ProductClass->getProduct()) {
+                    $productId = $ProductClass->getProduct()->getId();
                 }
-
-                error_log('[MPBC] Validating product: ' . $Product->getName() . ' (ID: ' . $Product->getId() . ')');
-
-                // カスタム商品かどうかチェック
-                $description = $Product->getDescriptionDetail();
-                if ($description && strpos($description, '[セッション:') !== false) {
-                    // セッション情報を抽出
-                    if (preg_match('/\[セッション:\s*([^\]]+)\]/', $description, $matches)) {
-                        $productSessionId = $matches[1];
-                        $currentSessionPrefix = substr($currentSessionId, 0, 8);
-
-                        error_log('[MPBC] Custom product session check: product=' . $productSessionId . ', current=' . $currentSessionPrefix);
-
-                        // セッションが一致しない場合は削除
-                        if ($productSessionId !== $currentSessionPrefix) {
-                            error_log('[MPBC] Session mismatch - removing product from cart');
-                            $this->logger->info('[MPBC] Removing unauthorized custom product from cart', [
-                                'product_id' => $Product->getId(),
-                                'product_name' => $Product->getName(),
-                                'product_session' => $productSessionId,
-                                'current_session' => $currentSessionPrefix
-                            ]);
-
-                            // カートアイテムを安全に削除
-                            try {
-                                $Cart->removeCartItem($CartItem);
-                                $hasRemovedItems = true;
-                            } catch (\Exception $e) {
-                                error_log('[MPBC] Error removing cart item: ' . $e->getMessage());
-                            }
-                        } else {
-                            error_log('[MPBC] Session matches - keeping product');
-                        }
-                    }
-                } else {
-                    error_log('[MPBC] Not a custom product - keeping');
+                if ($productId) {
+                    $Product = $this->entityManager->find(Product::class, $productId);
                 }
+            } catch (\Exception $e) {
+                $this->logger->warning('[MPBC] Could not load product for cart validation', [
+                    'error' => $e->getMessage(),
+                ]);
+                continue;
+            }
 
-                // 購入済み商品かどうかチェック
-                if (strpos($Product->getName(), '[購入済み]') !== false) {
-                    error_log('[MPBC] Product already purchased - removing');
-                    $this->logger->info('[MPBC] Removing already purchased product from cart', [
-                        'product_id' => $Product->getId(),
-                        'product_name' => $Product->getName()
-                    ]);
+            if (!$Product) {
+                continue;
+            }
 
-                    // カートアイテムを安全に削除
-                    try {
-                        $Cart->removeCartItem($CartItem);
-                        $hasRemovedItems = true;
-                    } catch (\Exception $e) {
-                        error_log('[MPBC] Error removing purchased cart item: ' . $e->getMessage());
-                    }
+            // 購入済み商品チェック
+            if (strpos($Product->getName(), '[購入済み]') !== false) {
+                $this->logger->info('[MPBC] Removing already purchased product from cart', [
+                    'product_id' => $Product->getId(),
+                    'product_name' => $Product->getName(),
+                ]);
+                try {
+                    $Cart->removeCartItem($CartItem);
+                    $hasRemovedItems = true;
+                } catch (\Exception $e) {
+                    $this->logger->warning('[MPBC] Failed to remove purchased product from cart', [
+                        'error' => $e->getMessage(),
+                    ]);
                 }
+                continue;
             }
 
-            if ($hasRemovedItems) {
-                $this->cartService->save();
-                error_log('[MPBC] Cart cleaned up, unauthorized products removed');
-                $this->logger->info('[MPBC] Cart cleaned up, unauthorized products removed');
-            } else {
-                error_log('[MPBC] Cart validation completed - no items removed');
+            // カスタム商品のセッション検証
+            $description = $Product->getDescriptionDetail();
+            if ($description && strpos($description, '[セッション:') !== false) {
+                if (preg_match('/\[セッション:\s*([^\]]+)\]/', $description, $matches)) {
+                    $productSessionPrefix = trim($matches[1]);
+
+                    if ($productSessionPrefix !== $currentSessionPrefix) {
+                        $this->logger->info('[MPBC] Removing unauthorized custom product from cart', [
+                            'product_id' => $Product->getId(),
+                            'product_session' => $productSessionPrefix,
+                            'current_session' => $currentSessionPrefix,
+                        ]);
+                        try {
+                            $Cart->removeCartItem($CartItem);
+                            $hasRemovedItems = true;
+                        } catch (\Exception $e) {
+                            $this->logger->warning('[MPBC] Failed to remove unauthorized product from cart', [
+                                'error' => $e->getMessage(),
+                            ]);
+                        }
+                    }
+                }
             }
+        }
 
-        } catch (\Exception $e) {
-            error_log('[MPBC] Cart validation error: ' . $e->getMessage());
-            $this->logger->error('[MPBC] Error validating cart products', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
+        if ($hasRemovedItems) {
+            $this->cartService->save();
+            $this->logger->info('[MPBC] Cart cleaned up, unauthorized products removed');
         }
     }
 }

EventListener/OrderEventListener.php

@@ -39,71 +39,68 @@ public static function getSubscribedEvents()
     }
 
     /**
-     * 注文完了時の処理
-     * 
+     * 注文完了時の処理。
+     * セッションマーカー付きカスタム商品を購入不可能な状態にする。
+     *
      * @param EventArgs $event
      */
     public function onShoppingComplete(EventArgs $event)
     {
         /** @var \Eccube\Entity\Order $Order */
         $Order = $event->getArgument('Order');
-        
+
         if (!$Order) {
             return;
         }
 
-        try {
-            $this->logger->info('[MPBC] Order completed, checking for custom products', [
-                'order_id' => $Order->getId()
-            ]);
+        $this->logger->info('[MPBC] Order completed, checking for custom products', [
+            'order_id' => $Order->getId(),
+        ]);
+
+        foreach ($Order->getOrderItems() as $OrderItem) {
+            $Product = $OrderItem->getProduct();
 
-            // 注文内の商品をチェック
-            foreach ($Order->getOrderItems() as $OrderItem) {
-                $Product = $OrderItem->getProduct();
-
-                if (!$Product) {
-                    continue;
-                }
-
-                // カスタム商品（セッション情報を含む商品）かどうかチェック
-                $description = $Product->getDescriptionDetail();
-                if ($description && strpos($description, '[セッション:') !== false) {
-                    $this->logger->info('[MPBC] Found custom product in order, marking as unavailable', [
-                        'product_id' => $Product->getId(),
-                        'product_name' => $Product->getName()
-                    ]);
-
-                    // 商品を購入不可能な状態に変更
-                    $this->disableCustomProduct($Product);
-                }
+            if (!$Product) {
+                continue;
             }
 
-            $this->entityManager->flush();
+            $description = $Product->getDescriptionDetail();
+            if (!$description || strpos($description, '[セッション:') === false) {
+                continue;
+            }
 
-        } catch (\Exception $e) {
-            $this->logger->error('[MPBC] Error in order completion handler', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
+            $this->logger->info('[MPBC] Found custom product in order, marking as purchased', [
+                'product_id' => $Product->getId(),
+                'product_name' => $Product->getName(),
             ]);
+
+            try {
+                $this->disableCustomProduct($Product);
+                $this->entityManager->flush();
+            } catch (\Exception $e) {
+                $this->logger->error('[MPBC] Failed to disable custom product after order', [
+                    'product_id' => $Product->getId(),
+                    'error' => $e->getMessage(),
+                ]);
+                // 他の商品の処理を継続する
+            }
         }
     }
 
     /**
-     * カスタム商品を無効化
-     * 
+     * カスタム商品を購入済み状態にして再購入を防止する
+     *
      * @param \Eccube\Entity\Product $Product
      */
-    private function disableCustomProduct(\Eccube\Entity\Product $Product)
+    private function disableCustomProduct(\Eccube\Entity\Product $Product): void
     {
-        // すべてのProductClassを非表示にして購入を不可能にする
         foreach ($Product->getProductClasses() as $ProductClass) {
             $ProductClass->setVisible(false);
             $ProductClass->setStockUnlimited(false);
             $ProductClass->setStock(0);
             $this->entityManager->persist($ProductClass);
         }
 
-        // 商品名に購入済みマークを追加
         $currentName = $Product->getName();
         if (strpos($currentName, '[購入済み]') === false) {
             $Product->setName($currentName . ' [購入済み]');
@@ -113,7 +110,7 @@ private function disableCustomProduct(\Eccube\Entity\Product $Product)
 
         $this->logger->info('[MPBC] Custom product disabled after purchase', [
             'product_id' => $Product->getId(),
-            'product_name' => $Product->getName()
+            'product_name' => $Product->getName(),
         ]);
     }
 }