From f47bc24b2cccef74872a430d44ac921fcde2d557 Mon Sep 17 00:00:00 2001
From: Benjamin Cremer <benjamin.cremer@check24.de>
Date: Thu, 6 Apr 2023 11:04:32 +0200
Subject: [PATCH 1/4] Introduce PerformanceOptimizedDelegateCalculator

---
 ...PerformanceOptimizedDelegateCalculator.php | 87 +++++++++++++++++++
 ...ormanceOptimizedDelegateCalculatorTest.php | 24 +++++
 2 files changed, 111 insertions(+)
 create mode 100644 src/Calculator/PerformanceOptimizedDelegateCalculator.php
 create mode 100644 tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php

diff --git a/src/Calculator/PerformanceOptimizedDelegateCalculator.php b/src/Calculator/PerformanceOptimizedDelegateCalculator.php
new file mode 100644
index 00000000..bc9f91e4
--- /dev/null
+++ b/src/Calculator/PerformanceOptimizedDelegateCalculator.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Money\Calculator;
+
+use Money\Calculator;
+
+/**
+ * Optimized `Money\Calculator` that delegates to either
+ * `BcMathCalculator` or `GmpCalculator` depending on the operation.
+ *
+ * `GmpCalculator` is approx 25% faster for add and subtract.
+ * `BcMathCalculator` is faster for all decimal operations.
+ *
+ * @psalm-immutable
+ */
+final class PerformanceOptimizedDelegateCalculator implements Calculator
+{
+    /** @psalm-pure */
+    public static function compare(string $a, string $b): int
+    {
+        return BcMathCalculator::compare($a, $b);
+    }
+
+    /** @psalm-pure */
+    public static function add(string $amount, string $addend): string
+    {
+        return GmpCalculator::add($amount, $addend);
+    }
+
+    /** @psalm-pure */
+    public static function subtract(string $amount, string $subtrahend): string
+    {
+        return GmpCalculator::subtract($amount, $subtrahend);
+    }
+
+    /** @psalm-pure */
+    public static function multiply(string $amount, string $multiplier): string
+    {
+        return BcMathCalculator::multiply($amount, $multiplier);
+    }
+
+    /** @psalm-pure */
+    public static function divide(string $amount, string $divisor): string
+    {
+        return BcMathCalculator::divide($amount, $divisor);
+    }
+
+    /** @psalm-pure */
+    public static function ceil(string $number): string
+    {
+        return BcMathCalculator::ceil($number);
+    }
+
+    /** @psalm-pure */
+    public static function floor(string $number): string
+    {
+        return BcMathCalculator::floor($number);
+    }
+
+    /** @psalm-pure */
+    public static function absolute(string $number): string
+    {
+        return BcMathCalculator::absolute($number);
+    }
+
+    /**
+     * @psalm-pure
+     */
+    public static function round(string $number, int $roundingMode): string
+    {
+        return BcMathCalculator::round($number, $roundingMode);
+    }
+
+    /** @psalm-pure */
+    public static function share(string $amount, string $ratio, string $total): string
+    {
+        return BcMathCalculator::share($amount, $ratio, $total);
+    }
+
+    /** @psalm-pure */
+    public static function mod(string $amount, string $divisor): string
+    {
+        return BcMathCalculator::mod($amount, $divisor);
+    }
+}
diff --git a/tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php b/tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php
new file mode 100644
index 00000000..22eea5b2
--- /dev/null
+++ b/tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Money\Calculator;
+
+use Money\Calculator\PerformanceOptimizedDelegateCalculator;
+
+/**
+ * @requires extension bcmath
+ * @requires extension gmp
+ * @covers \Money\Calculator\PerformanceOptimizedDelegateCalculator
+ */
+class PerformanceOptimizedDelegateCalculatorTest extends CalculatorTestCase
+{
+    /**
+     * @return PerformanceOptimizedDelegateCalculator
+     * @psalm-return class-string<PerformanceOptimizedDelegateCalculator>
+     */
+    protected function getCalculator(): string
+    {
+        return PerformanceOptimizedDelegateCalculator::class;
+    }
+}

From fdfd57c0e10ac81f540cca156b0a81db25236cf0 Mon Sep 17 00:00:00 2001
From: Benjamin Cremer <benjamin.cremer@check24.de>
Date: Thu, 6 Apr 2023 11:43:14 +0200
Subject: [PATCH 2/4] Add phpbench stubs for calculators

---
 .../Calculator/BcMathCalculatorBench.php      | 15 ++++
 benchmark/Calculator/CalculatorBench.php      | 77 +++++++++++++++++++
 benchmark/Calculator/GmpCalculatorBench.php   | 15 ++++
 ...rmanceOptimizedDelegateCalculatorBench.php | 15 ++++
 benchmark/MoneyOperationBench.php             |  4 +-
 phpbench.json                                 |  7 +-
 6 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 benchmark/Calculator/BcMathCalculatorBench.php
 create mode 100644 benchmark/Calculator/CalculatorBench.php
 create mode 100644 benchmark/Calculator/GmpCalculatorBench.php
 create mode 100644 benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php

diff --git a/benchmark/Calculator/BcMathCalculatorBench.php b/benchmark/Calculator/BcMathCalculatorBench.php
new file mode 100644
index 00000000..cbb80ded
--- /dev/null
+++ b/benchmark/Calculator/BcMathCalculatorBench.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Benchmark\Money\Calculator;
+
+use Money\Calculator\BcMathCalculator;
+
+class BcMathCalculatorBench extends CalculatorBench
+{
+    protected function getCalculator(): string
+    {
+        return BcMathCalculator::class;
+    }
+}
diff --git a/benchmark/Calculator/CalculatorBench.php b/benchmark/Calculator/CalculatorBench.php
new file mode 100644
index 00000000..12e31a16
--- /dev/null
+++ b/benchmark/Calculator/CalculatorBench.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Benchmark\Money\Calculator;
+
+use Money\Calculator;
+use Money\Money;
+
+abstract class CalculatorBench
+{
+    /**
+     * @psalm-return class-string<Calculator>
+     */
+    abstract protected function getCalculator(): string;
+
+    public function benchCompare(): void
+    {
+        $this->getCalculator()::compare('1', '1');
+        $this->getCalculator()::compare('1', '5');
+        $this->getCalculator()::compare('5', '5');
+        $this->getCalculator()::compare('5.5', '1.5');
+        $this->getCalculator()::compare('1.5', '5.5');
+    }
+
+    public function benchAdd(): void
+    {
+        $this->getCalculator()::add('1', '5');
+    }
+
+    public function benchSubtract(): void
+    {
+        $this->getCalculator()::subtract('1', '5');
+    }
+
+    public function benchMultiply(): void
+    {
+        $this->getCalculator()::multiply('5', '25');
+        $this->getCalculator()::multiply('5', '1.5');
+    }
+
+    public function benchDivide(): void
+    {
+        $this->getCalculator()::divide('5', '4');
+    }
+
+    public function benchCeil(): void
+    {
+        $this->getCalculator()::ceil('5.5');
+    }
+
+    public function benchFloor(): void
+    {
+        $this->getCalculator()::floor('5.5');
+    }
+
+    public function benchAbsolute(): void
+    {
+        $this->getCalculator()::absolute('5');
+        $this->getCalculator()::absolute('-5');
+    }
+
+    public function benchRound(): void
+    {
+        $this->getCalculator()::round('2.6', Money::ROUND_HALF_EVEN);
+    }
+
+    public function benchShare(): void
+    {
+        $this->getCalculator()::share('10', '2', '4');
+    }
+
+    public function benchMod(): void
+    {
+        $this->getCalculator()::mod('11', '5');
+    }
+}
diff --git a/benchmark/Calculator/GmpCalculatorBench.php b/benchmark/Calculator/GmpCalculatorBench.php
new file mode 100644
index 00000000..a026f28c
--- /dev/null
+++ b/benchmark/Calculator/GmpCalculatorBench.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Benchmark\Money\Calculator;
+
+use Money\Calculator\GmpCalculator;
+
+class GmpCalculatorBench extends CalculatorBench
+{
+    protected function getCalculator(): string
+    {
+        return GmpCalculator::class;
+    }
+}
diff --git a/benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php b/benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php
new file mode 100644
index 00000000..381d37d0
--- /dev/null
+++ b/benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Benchmark\Money\Calculator;
+
+use Money\Calculator\PerformanceOptimizedDelegateCalculator;
+
+final class PerformanceOptimizedDelegateCalculatorBench extends CalculatorBench
+{
+    protected function getCalculator(): string
+    {
+        return PerformanceOptimizedDelegateCalculator::class;
+    }
+}
diff --git a/benchmark/MoneyOperationBench.php b/benchmark/MoneyOperationBench.php
index 4fe5d277..34cf22cf 100644
--- a/benchmark/MoneyOperationBench.php
+++ b/benchmark/MoneyOperationBench.php
@@ -57,12 +57,12 @@ public function benchMin(): void
 
     public function benchMax(): void
     {
-        Money::min($this->a, $this->b, $this->a, $this->b);
+        Money::max($this->a, $this->b, $this->a, $this->b);
     }
 
     public function benchAvg(): void
     {
-        Money::min($this->a, $this->b, $this->a, $this->b);
+        Money::avg($this->a, $this->b, $this->a, $this->b);
     }
 
     public function benchRatioOf(): void
diff --git a/phpbench.json b/phpbench.json
index 2b307866..a6615b16 100644
--- a/phpbench.json
+++ b/phpbench.json
@@ -1,4 +1,9 @@
 {
     "runner.bootstrap": "vendor/autoload.php",
-    "runner.path": "benchmark"
+    "runner.path": "benchmark",
+    "runner.php_config":
+    {
+        "opcache.enable": 1,
+        "opcache.enable_cli": 1
+    }
 }

From 46fb6ce7b6f78fce7d3f2e32353b541b0a26e67a Mon Sep 17 00:00:00 2001
From: Benjamin Cremer <benjamin.cremer@check24.de>
Date: Thu, 6 Apr 2023 13:26:00 +0200
Subject: [PATCH 3/4] Remove PerformanceOptimizedDelegateCalculator

---
 ...rmanceOptimizedDelegateCalculatorBench.php | 15 ----
 ...PerformanceOptimizedDelegateCalculator.php | 87 -------------------
 ...ormanceOptimizedDelegateCalculatorTest.php | 24 -----
 3 files changed, 126 deletions(-)
 delete mode 100644 benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php
 delete mode 100644 src/Calculator/PerformanceOptimizedDelegateCalculator.php
 delete mode 100644 tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php

diff --git a/benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php b/benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php
deleted file mode 100644
index 381d37d0..00000000
--- a/benchmark/Calculator/PerformanceOptimizedDelegateCalculatorBench.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Benchmark\Money\Calculator;
-
-use Money\Calculator\PerformanceOptimizedDelegateCalculator;
-
-final class PerformanceOptimizedDelegateCalculatorBench extends CalculatorBench
-{
-    protected function getCalculator(): string
-    {
-        return PerformanceOptimizedDelegateCalculator::class;
-    }
-}
diff --git a/src/Calculator/PerformanceOptimizedDelegateCalculator.php b/src/Calculator/PerformanceOptimizedDelegateCalculator.php
deleted file mode 100644
index bc9f91e4..00000000
--- a/src/Calculator/PerformanceOptimizedDelegateCalculator.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Money\Calculator;
-
-use Money\Calculator;
-
-/**
- * Optimized `Money\Calculator` that delegates to either
- * `BcMathCalculator` or `GmpCalculator` depending on the operation.
- *
- * `GmpCalculator` is approx 25% faster for add and subtract.
- * `BcMathCalculator` is faster for all decimal operations.
- *
- * @psalm-immutable
- */
-final class PerformanceOptimizedDelegateCalculator implements Calculator
-{
-    /** @psalm-pure */
-    public static function compare(string $a, string $b): int
-    {
-        return BcMathCalculator::compare($a, $b);
-    }
-
-    /** @psalm-pure */
-    public static function add(string $amount, string $addend): string
-    {
-        return GmpCalculator::add($amount, $addend);
-    }
-
-    /** @psalm-pure */
-    public static function subtract(string $amount, string $subtrahend): string
-    {
-        return GmpCalculator::subtract($amount, $subtrahend);
-    }
-
-    /** @psalm-pure */
-    public static function multiply(string $amount, string $multiplier): string
-    {
-        return BcMathCalculator::multiply($amount, $multiplier);
-    }
-
-    /** @psalm-pure */
-    public static function divide(string $amount, string $divisor): string
-    {
-        return BcMathCalculator::divide($amount, $divisor);
-    }
-
-    /** @psalm-pure */
-    public static function ceil(string $number): string
-    {
-        return BcMathCalculator::ceil($number);
-    }
-
-    /** @psalm-pure */
-    public static function floor(string $number): string
-    {
-        return BcMathCalculator::floor($number);
-    }
-
-    /** @psalm-pure */
-    public static function absolute(string $number): string
-    {
-        return BcMathCalculator::absolute($number);
-    }
-
-    /**
-     * @psalm-pure
-     */
-    public static function round(string $number, int $roundingMode): string
-    {
-        return BcMathCalculator::round($number, $roundingMode);
-    }
-
-    /** @psalm-pure */
-    public static function share(string $amount, string $ratio, string $total): string
-    {
-        return BcMathCalculator::share($amount, $ratio, $total);
-    }
-
-    /** @psalm-pure */
-    public static function mod(string $amount, string $divisor): string
-    {
-        return BcMathCalculator::mod($amount, $divisor);
-    }
-}
diff --git a/tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php b/tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php
deleted file mode 100644
index 22eea5b2..00000000
--- a/tests/Calculator/PerformanceOptimizedDelegateCalculatorTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Money\Calculator;
-
-use Money\Calculator\PerformanceOptimizedDelegateCalculator;
-
-/**
- * @requires extension bcmath
- * @requires extension gmp
- * @covers \Money\Calculator\PerformanceOptimizedDelegateCalculator
- */
-class PerformanceOptimizedDelegateCalculatorTest extends CalculatorTestCase
-{
-    /**
-     * @return PerformanceOptimizedDelegateCalculator
-     * @psalm-return class-string<PerformanceOptimizedDelegateCalculator>
-     */
-    protected function getCalculator(): string
-    {
-        return PerformanceOptimizedDelegateCalculator::class;
-    }
-}

From 0cdb07745a4d696f6fd3faf59eaac9e250695254 Mon Sep 17 00:00:00 2001
From: Benjamin Cremer <benjamin.cremer@check24.de>
Date: Thu, 6 Apr 2023 13:26:50 +0200
Subject: [PATCH 4/4] Optimize result representation for BcMathCalculator::add
 and BcMathCalculator::substract

---
 src/Calculator/BcMathCalculator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Calculator/BcMathCalculator.php b/src/Calculator/BcMathCalculator.php
index 0640c883..e610f679 100644
--- a/src/Calculator/BcMathCalculator.php
+++ b/src/Calculator/BcMathCalculator.php
@@ -31,13 +31,13 @@ public static function compare(string $a, string $b): int
     /** @psalm-pure */
     public static function add(string $amount, string $addend): string
     {
-        return bcadd($amount, $addend, self::SCALE);
+        return bcadd($amount, $addend, 0);
     }
 
     /** @psalm-pure */
     public static function subtract(string $amount, string $subtrahend): string
     {
-        return bcsub($amount, $subtrahend, self::SCALE);
+        return bcsub($amount, $subtrahend, 0);
     }
 
     /** @psalm-pure */