Improve exception messages for argument positions to match PHP 8+ format

Author: clue

src/Container.php

@@ -380,7 +380,7 @@ private static function parameterError(\ReflectionParameter $parameter): string
             $name = explode("\0", $class->getName())[0] . '::' . $name;
         }
 
-        return 'Argument ' . ($parameter->getPosition() + 1) . ' ($' . $parameter->getName() . ') of ' . $name . '()';
+        return 'Argument #' . ($parameter->getPosition() + 1) . ' ($' . $parameter->getName() . ') of ' . $name . '()';
     }
 
     /**

tests/AppTest.php

@@ -1529,25 +1529,25 @@ public function provideInvalidClasses(): \Generator
 
         yield [
             InvalidConstructorUntyped::class,
-            'Argument 1 ($value) of %s::__construct() has no type'
+            'Argument #1 ($value) of %s::__construct() has no type'
         ];
 
         yield [
             InvalidConstructorInt::class,
-            'Argument 1 ($value) of %s::__construct() expects unsupported type int'
+            'Argument #1 ($value) of %s::__construct() expects unsupported type int'
         ];
 
         if (PHP_VERSION_ID >= 80000) {
             yield [
                 InvalidConstructorUnion::class,
-                'Argument 1 ($value) of %s::__construct() expects unsupported type int|float'
+                'Argument #1 ($value) of %s::__construct() expects unsupported type int|float'
             ];
         }
 
         if (PHP_VERSION_ID >= 80100) {
             yield [
                 InvalidConstructorIntersection::class,
-                'Argument 1 ($value) of %s::__construct() expects unsupported type Traversable&ArrayAccess'
+                'Argument #1 ($value) of %s::__construct() expects unsupported type Traversable&ArrayAccess'
             ];
         }
 
@@ -1558,7 +1558,7 @@ public function provideInvalidClasses(): \Generator
 
         yield [
             InvalidConstructorSelf::class,
-            'Argument 1 ($value) of %s::__construct() is recursive'
+            'Argument #1 ($value) of %s::__construct() is recursive'
         ];
     }
 

tests/ContainerTest.php

@@ -1285,7 +1285,7 @@ public function __construct(\stdClass $data)
         $callable = $container->callable(get_class($controller));
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($username) of {closure:' . __FILE__ . ':' . $line .'}() is not defined');
+        $this->expectExceptionMessage('Argument #1 ($username) of {closure:' . __FILE__ . ':' . $line .'}() is not defined');
         $callable($request);
     }
 
@@ -1641,7 +1641,7 @@ public function __construct(string $name)
         $callable = $container->callable(get_class($controller));
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($name) of class@anonymous::__construct() expects unsupported type string');
+        $this->expectExceptionMessage('Argument #1 ($name) of class@anonymous::__construct() expects unsupported type string');
         $callable($request);
     }
 
@@ -1772,7 +1772,7 @@ public function testCallableReturnsCallableThatThrowsWhenFactoryRequiresUntypedA
         $callable = $container->callable(\stdClass::class);
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($undefined) of {closure:' . __FILE__ . ':' . $line .'}() has no type');
+        $this->expectExceptionMessage('Argument #1 ($undefined) of {closure:' . __FILE__ . ':' . $line .'}() has no type');
         $callable($request);
     }
 
@@ -1791,7 +1791,7 @@ public function testCallableReturnsCallableThatThrowsWhenFactoryRequiresUndefine
         $callable = $container->callable(\stdClass::class);
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($undefined) of {closure:' . __FILE__ . ':' . $line .'}() is not defined');
+        $this->expectExceptionMessage('Argument #1 ($undefined) of {closure:' . __FILE__ . ':' . $line .'}() is not defined');
         $callable($request);
     }
 
@@ -1807,7 +1807,7 @@ public function testCallableReturnsCallableThatThrowsWhenFactoryRequiresRecursiv
         $callable = $container->callable(\stdClass::class);
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($data) of {closure:' . __FILE__ . ':' . $line .'}() is recursive');
+        $this->expectExceptionMessage('Argument #1 ($data) of {closure:' . __FILE__ . ':' . $line .'}() is recursive');
         $callable($request);
     }
 
@@ -2098,7 +2098,7 @@ public function testGetEnvThrowsWhenFactoryUsesBuiltInFunctionThatReferencesUnkn
         ]);
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($extension) of extension_loaded() is not defined');
+        $this->expectExceptionMessage('Argument #1 ($extension) of extension_loaded() is not defined');
         $container->getEnv('X_FOO');
     }
 
@@ -2116,7 +2116,7 @@ public function foo(string $bar): string
         ]);
 
         $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Argument 1 ($bar) of class@anonymous::foo() is not defined');
+        $this->expectExceptionMessage('Argument #1 ($bar) of class@anonymous::foo() is not defined');
         $container->getEnv('X_FOO');
     }