Merge pull request #1 from spiral/feature/attributes

Extra attributes bugfix
spiral · Jan 12, 2021 · 6b5b24f · 6b5b24f
2 parents 7bd6e78 + 5693349
commit 6b5b24f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Internal/FallbackAttributeReader.php b/src/Internal/FallbackAttributeReader.php
@@ -203,9 +203,11 @@ private function extractFunctionAttributes(array $attributes, \ReflectionFunctio
          *  $ast->getEndLine(); // 2 (last significant character of a function)
          * </code>
          */
-        while ($line-- > 0) {
-            if ($result = $attributes[$line] ?? null) {
-                return $result;
+        if ($function->isClosure()) {
+            while ($line-- > $function->getStartLine()) {
+                if ($result = $attributes[$line] ?? null) {
+                    return $result;
+                }
             }
         }
 

diff --git a/src/Internal/Instantiator/NamedArgumentsInstantiator.php b/src/Internal/Instantiator/NamedArgumentsInstantiator.php
@@ -108,13 +108,15 @@ private function resolveParameter(\ReflectionClass $ctx, \ReflectionParameter $p
                 } finally {
                     unset($arguments[$param->getName()]);
                 }
+            // no actual falling through
 
             case \array_key_exists($param->getPosition(), $arguments):
                 try {
                     return $arguments[$param->getPosition()];
                 } finally {
                     unset($arguments[$param->getPosition()]);
                 }
+            // no actual falling through
 
             case $param->isDefaultValueAvailable():
                 return $param->getDefaultValue();