Fix Division by zero on PHP8.0+

EC-CUBE · Sep 19, 2023 · 988f46c · 988f46c
1 parent 70717b9
commit 988f46c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
@@ -84,7 +84,10 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total
         $taxable_total = array_sum($arrTaxableTotal);
         $result = [];
         foreach ($arrTaxableTotal as $rate => $total) {
-            $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal);
+            if ($taxable_total > 0) {
+                $reduced_total = $total - $discount_total * $total / $taxable_total;
+            }
+
             $tax = $reduced_total * ($rate / (100 + $rate));
             $result[$rate] = [
                 'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])),

diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
@@ -59,6 +59,51 @@ public function testGetTaxPerTaxRateWithRound()
         );
     }
 
+    public function testGetTaxPerTaxRateWithZero()
+    {
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '1',
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 0,
+            8 => 0,
+        ];
+        $discount_total = 0;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'total' => 0,
+                    'tax' => 0
+                ],
+                10 => [
+                    'total' => 0,
+                    'tax' => 0
+                ]
+            ],
+            $actual
+        );
+
+        self::assertSame(
+            '(8%対象: 0円 内消費税: 0円)'.PHP_EOL.
+                '(10%対象: 0円 内消費税: 0円)'.PHP_EOL,
+            SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total)
+        );
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState disabled