From 2217c8c3de8e4ec8d7f9ec0f37078dbc2183d14e Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Mon, 30 Sep 2024 17:34:51 +0000
Subject: [PATCH] Fixed method arguments issue.

---
 VERSION                                  |  2 +-
 src/Bencode/BencodeSerialisableTrait.php |  8 ++++----
 src/Json/JsonSerializableTrait.php       |  8 ++++----
 tests/BencodeSerialisableTest.php        | 10 +++++++++-
 tests/JsonSerializableTest.php           | 10 +++++++++-
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/VERSION b/VERSION
index 0bed13c..4979880 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2408.610150
+0.2408.611934
diff --git a/src/Bencode/BencodeSerialisableTrait.php b/src/Bencode/BencodeSerialisableTrait.php
index 6d203b2..6c42e90 100644
--- a/src/Bencode/BencodeSerialisableTrait.php
+++ b/src/Bencode/BencodeSerialisableTrait.php
@@ -1,7 +1,7 @@
 <?php
 // BencodeSerialisableTrait.php
 // Created: 2024-09-29
-// Updated: 2024-09-29
+// Updated: 2024-09-30
 
 namespace Index\Bencode;
 
@@ -55,15 +55,15 @@ trait BencodeSerialisableTrait {
 
         $methodInfos = $objectInfo->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach($methodInfos as $methodInfo) {
-            if($methodInfo->getNumberOfRequiredParameters() > 0)
-                throw new RuntimeException('Methods marked with the BencodeProperty attribute must not have any required arguments.');
-
             $attrInfos = $methodInfo->getAttributes(BencodeProperty::class);
             if(count($attrInfos) < 1)
                 continue;
             if(count($attrInfos) > 1)
                 throw new RuntimeException('Methods may only carry a single instance of the BencodeProperty attribute.');
 
+            if($methodInfo->getNumberOfRequiredParameters() > 0)
+                throw new RuntimeException('Methods marked with the BencodeProperty attribute must not have any required arguments.');
+
             $info = $attrInfos[0]->newInstance();
 
             $name = $info->getName() ?? $methodInfo->getName();
diff --git a/src/Json/JsonSerializableTrait.php b/src/Json/JsonSerializableTrait.php
index bab1a78..e65a496 100644
--- a/src/Json/JsonSerializableTrait.php
+++ b/src/Json/JsonSerializableTrait.php
@@ -1,7 +1,7 @@
 <?php
 // JsonSerializableTrait.php
 // Created: 2024-09-29
-// Updated: 2024-09-29
+// Updated: 2024-09-30
 
 namespace Index\Json;
 
@@ -53,15 +53,15 @@ trait JsonSerializableTrait {
 
         $methodInfos = $objectInfo->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach($methodInfos as $methodInfo) {
-            if($methodInfo->getNumberOfRequiredParameters() > 0)
-                throw new RuntimeException('Methods marked with the JsonProperty attribute must not have any required arguments.');
-
             $attrInfos = $methodInfo->getAttributes(JsonProperty::class);
             if(count($attrInfos) < 1)
                 continue;
             if(count($attrInfos) > 1)
                 throw new RuntimeException('Methods may only carry a single instance of the JsonProperty attribute.');
 
+            if($methodInfo->getNumberOfRequiredParameters() > 0)
+                throw new RuntimeException('Methods marked with the JsonProperty attribute must not have any required arguments.');
+
             $info = $attrInfos[0]->newInstance();
 
             $name = $info->getName() ?? $methodInfo->getName();
diff --git a/tests/BencodeSerialisableTest.php b/tests/BencodeSerialisableTest.php
index cc2df8c..001182a 100644
--- a/tests/BencodeSerialisableTest.php
+++ b/tests/BencodeSerialisableTest.php
@@ -1,7 +1,7 @@
 <?php
 // BencodeSerialisableTest.php
 // Created: 2024-09-29
-// Updated: 2024-09-29
+// Updated: 2024-09-30
 
 declare(strict_types=1);
 
@@ -134,6 +134,14 @@ final class BencodeSerialisableTest extends TestCase {
                     }
                 };
             }
+
+            public function methodWithArguments(string $meow): string {
+                return $meow;
+            }
+
+            public static function staticMethodWithArguments(string $meow): string {
+                return $meow;
+            }
         };
 
         $this->assertEquals(self::BASIC_BENCODED_ENCODED, Bencode::encode($test));
diff --git a/tests/JsonSerializableTest.php b/tests/JsonSerializableTest.php
index 407b997..8988151 100644
--- a/tests/JsonSerializableTest.php
+++ b/tests/JsonSerializableTest.php
@@ -1,7 +1,7 @@
 <?php
 // JsonSerializableTest.php
 // Created: 2024-09-29
-// Updated: 2024-09-29
+// Updated: 2024-09-30
 
 declare(strict_types=1);
 
@@ -132,6 +132,14 @@ final class JsonSerializableTest extends TestCase {
                     }
                 };
             }
+
+            public function methodWithArguments(string $meow, string $mewow): string {
+                return $meow . $mewow;
+            }
+
+            public static function staticMethodWithArguments(string $meow, string $mewow): string {
+                return $meow . $mewow;
+            }
         };
 
         $this->assertEquals(self::BASIC_JSON_ENCODED, json_encode($test));