Update method and dependency management

Refactor `generateParameterCode` to handle attributes irrespective of PHP version. Update composer dependencies to the latest versions for improved compatibility and security.
ray-di · Nov 15, 2024 · 56177ec · 56177ec
1 parent 7f1328f
commit 56177ec
Show file tree

Hide file tree

Showing 3 changed files with 406 additions and 245 deletions.
diff --git a/src/MethodSignatureString.php b/src/MethodSignatureString.php
@@ -140,11 +140,7 @@ private function formatArg($name, $value): string
     private function generateParameterCode(ReflectionParameter $param): string
     {
         // Support attributes
-        $attributesStr = '';
-        if (PHP_MAJOR_VERSION >= 8) {
-            $attributesStr = $this->getAttributeStr($param);
-        }
-
+        $attributesStr = $this->getAttributeStr($param);
         $typeStr = ($this->typeString)($param->getType());
         $typeStrWithSpace = $typeStr ? $typeStr . ' ' : $typeStr;
         $variadicStr = $param->isVariadic() ? '...' : '';

diff --git a/tests/Fake/FakePhp8Types.php b/tests/Fake/FakePhp8Types.php
@@ -75,7 +75,7 @@ public function method24() {}
     public function method25(
         #[FakeAttr1]
         $a,
-        #[FakeAttri1, FakeAttr2]
+        #[FakeAttr1, FakeAttr2]
         $b
     ): void {}
 }