Improve UB in exceptions

Author: SerafimArts

src/Exception/Definition/Template/OneOfTemplateArgumentsCountException.php

@@ -17,7 +17,7 @@ public function __construct(
          */
         public readonly int $passedArgumentsCount,
         /**
-         * @var list<int<0, max>>
+         * @var non-empty-list<int<0, max>>
          */
         public readonly array $expectedArgumentCountVariants,
         NamedTypeNode $type,
@@ -56,6 +56,7 @@ public static function becauseArgumentsCountDoesNotMatch(
         $template = 'Type "{{type}}" only accepts {{expectedArgumentCountVariants}}'
             . ' template argument(s), but {{passedArgumentsCount}} were passed';
 
+        /** @var non-empty-array<array-key, int<0, max>> $variants */
         return new self(
             passedArgumentsCount: $passedArgumentsCount,
             expectedArgumentCountVariants: \array_values($variants),

src/Exception/Definition/Template/TemplateArgumentException.php

@@ -24,30 +24,19 @@ public function __construct(
         int $code = 0,
         ?\Throwable $previous = null,
     ) {
-        $this->index = self::getArgumentIndex($argument, $type);
+        $this->index = $this->getArgumentIndex($type, $argument);
 
         parent::__construct($type, $template, $code, $previous);
     }
 
-    /**
-     * @return int<0, max>
-     */
-    private static function getArgumentIndex(TemplateArgumentNode $argument, NamedTypeNode $type): int
+    private function getArgumentIndex(NamedTypeNode $type, TemplateArgumentNode $argument): int
     {
-        $index = 0;
-
-        if ($type->arguments === null) {
-            return $index;
-        }
-
-        foreach ($type->arguments as $actual) {
-            if ($actual === $argument) {
-                return $index + 1;
-            }
+        $index = $type->arguments?->findIndex($argument);
 
-            ++$index;
-        }
+        assert($index !== null, new \InvalidArgumentException(
+            'Template argument is not a part of passed type',
+        ));
 
-        return $index;
+        return $index + 1;
     }
 }

tests/Exception/Definition/InvalidTemplateArgumentTest.php

@@ -38,8 +38,8 @@ public function testInvalidArgumentGiven(): void
     #[TestDox('[undefined behaviour] all works if pass an non-node\'s argument')]
     public function testOfNonOwnArgument(): void
     {
-        $this->expectException(InvalidTemplateArgumentException::class);
-        $this->expectExceptionMessage('Passed template argument #0 of type another-type must be of type string, but T given');
+        $this->skipIfAssertionsDisabled();
+        $this->expectExceptionMessage('Template argument is not a part of passed type');
 
         $type = self::parse('int<T>');
         assert($type instanceof NamedTypeNode);

tests/Exception/Definition/TemplateArgumentHintsNotSupportedTest.php

@@ -36,8 +36,8 @@ public function testManyArgumentsPassedWithGenericType(): void
     #[TestDox('[undefined behaviour] all works if pass an non-node\'s argument')]
     public function testOfNonOwnArgument(): void
     {
-        $this->expectException(TemplateArgumentHintsNotSupportedException::class);
-        $this->expectExceptionMessage('Template argument #1 (T) of "another-type<out T>" does not support any hints, but "in" were passed');
+        $this->skipIfAssertionsDisabled();
+        $this->expectExceptionMessage('Template argument is not a part of passed type');
 
         $type = self::parse('int<in T>');
         assert($type instanceof NamedTypeNode);