Fix call undefined method

cknow · Mar 16, 2024 · 9995c9b · 9995c9b
1 parent d54ebc5
commit 9995c9b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/Money.php b/src/Money.php
@@ -2,6 +2,7 @@
 
 namespace Cknow\Money;
 
+use BadMethodCallException;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Renderable;
@@ -190,15 +191,21 @@ public function __toString()
      *
      * @param  string  $method
      * @return \Cknow\Money\Money|\Cknow\Money\Money[]|mixed
+     *
+     * @throws \BadMethodCallException
      */
     public function __call($method, array $arguments)
     {
         if (static::hasMacro($method)) {
             return $this->macroCall($method, $arguments);
         }
 
-        if (! method_exists($this->money, $method)) {
-            return $this;
+        if (!method_exists($this->money, $method)) {
+            throw new BadMethodCallException(sprintf(
+                'Call to undefined method %s::%s()',
+                static::class,
+                $method
+            ));
         }
 
         $result = call_user_func_array([$this->money, $method], static::getArguments($arguments));
@@ -210,7 +217,7 @@ public function __call($method, array $arguments)
             'absolute', 'negative',
         ];
 
-        if (! in_array($method, $methods)) {
+        if (!in_array($method, $methods)) {
             return $result;
         }
 
@@ -268,7 +275,7 @@ private static function getArguments(array $arguments = [])
      */
     private static function convertResult($result)
     {
-        if (! is_array($result)) {
+        if (!is_array($result)) {
             return static::convert($result);
         }
 
@@ -305,7 +312,7 @@ private static function resolveCalculator()
         ];
 
         foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
+            if (!class_exists($calculator)) {
                 continue;
             }
 

diff --git a/tests/MoneyTest.php b/tests/MoneyTest.php
@@ -2,6 +2,7 @@
 
 namespace Cknow\Money\Tests;
 
+use BadMethodCallException;
 use Cknow\Money\Money;
 use Money\Currency;
 
@@ -191,7 +192,10 @@ public function testAllocateTo()
 
     public function testCallUndefinedMethod()
     {
-        static::assertEquals(Money::USD(15), Money::USD(15)->undefined());
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Call to undefined method ' . Money::class . '::undefined()');
+
+        Money::USD(15)->undefined();
     }
 
     public function testGetters()