diff --git a/src/Testing/TypeInferenceTestCase.php b/src/Testing/TypeInferenceTestCase.php
index 070fbd9292..ee134d7154 100644
--- a/src/Testing/TypeInferenceTestCase.php
+++ b/src/Testing/TypeInferenceTestCase.php
@@ -22,6 +22,7 @@
 use function array_map;
 use function array_merge;
 use function count;
+use function implode;
 use function is_string;
 use function sprintf;
 
@@ -74,6 +75,40 @@ public function processFile(
 		);
 	}
 
+	/**
+	 * @param callable(): array<string, array<mixed>> $assertionsCallback
+	 * @api
+	 */
+	public function assertAssertions(callable $assertionsCallback): void
+	{
+		$assertions = $assertionsCallback();
+
+		$errors = [];
+		foreach ($assertions as $args) {
+			$type = $args[0];
+			$file = $args[1];
+			if ($type === 'type') {
+				$expectedType = $args[2];
+				$this->assertInstanceOf(ConstantScalarType::class, $expectedType);
+				$expected = $expectedType->getValue();
+				$actual = $args[3]->describe(VerbosityLevel::precise());
+				$line = $args[4];
+				if ($expected !== $actual) {
+					$errors[] = sprintf('Expected type %s, got type %s in %s on line %d.', $expected, $actual, $file, $line);
+				}
+			} elseif ($type === 'variableCertainty') {
+				$expectedCertainty = $args[2];
+				$actualCertainty = $args[3];
+				$variableName = $args[4];
+				$line = $args[5];
+				if (!$expectedCertainty->equals($actualCertainty)) {
+					$errors[] = sprintf('Expected %s, actual certainty of variable $%s is %s in %s on line %d.', $expectedCertainty->describe(), $variableName, $actualCertainty->describe(), $file, $line);
+				}
+			}
+		}
+		$this->assertEmpty($errors, implode("\n", $errors));
+	}
+
 	/**
 	 * @api
 	 * @param mixed ...$args
@@ -106,6 +141,15 @@ public function assertFileAsserts(
 		}
 	}
 
+	/**
+	 * @api
+	 * @return iterable<string, array{callable(): array<string, array<mixed>>}>
+	 */
+	public function gatherAssertions(string $file): iterable
+	{
+		yield $file => [fn () => $this->gatherAssertTypes($file)];
+	}
+
 	/**
 	 * @api
 	 * @return array<string, mixed[]>
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
index ac8b6a84bc..aa13319384 100644
--- a/tests/PHPStan/Analyser/NodeScopeResolverTest.php
+++ b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -13,567 +13,567 @@
 class NodeScopeResolverTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public function dataAssertions(): iterable
 	{
 		require_once __DIR__ . '/data/implode.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/implode.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/implode.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/narrow_type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/narrow_type_with_force_array.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/invalid_type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/json_object_as_array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/json-decode/narrow_type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/json-decode/narrow_type_with_force_array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/json-decode/invalid_type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/json-decode/json_object_as_array.php');
 
 		require_once __DIR__ . '/data/bug2574.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug2574.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug2574.php');
 
 		require_once __DIR__ . '/data/bug2577.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug2577.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug2577.php');
 
 		require_once __DIR__ . '/data/generics.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generics.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generics.php');
 
 		require_once __DIR__ . '/data/generic-class-string.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-class-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-class-string.php');
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-enum-class-string.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/generic-enum-class-string.php');
 		}
 
 		require_once __DIR__ . '/data/generic-generalization.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-generalization.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-generalization.php');
 
 		require_once __DIR__ . '/data/instanceof.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/named-arguments.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/date.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/instanceof.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/integer-range-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/named-arguments.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/date.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/instanceof.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/integer-range-types.php');
 		if (PHP_INT_SIZE === 8) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/random-int.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/strtotime-return-type-extensions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-return-type-extensions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-key.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/intersection-static.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/static-properties.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/static-methods.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2612.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2677.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2676.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/psalm-prefix-unresolvable.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/complex-generics-example.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2648.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2740.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2822.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inheritdoc-parameter-remapping.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inheritdoc-constructors.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/list-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2835.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2443.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2750.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2850.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2863.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/native-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/type-change-after-array-access-assignment.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/iterator_to_array.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/key-of.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/value-of.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/ext-ds.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/arrow-function-return-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/is-numeric.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/is-a.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/is-subclass-of.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3142.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-shapes-keys-strings.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1216.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/const-expr-phpdoc-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3226.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2001.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2232.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3009.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-var.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-param.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-return.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-template.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3266.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3269.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assign-nested-arrays.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3276.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/shadowed-trait-methods.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/const-in-functions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/const-in-functions-namespaced.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/root-scope-maybe-defined.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/random-int.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/data/strtotime-return-type-extensions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/closure-return-type-extensions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-key.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/intersection-static.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/static-properties.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/static-methods.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2612.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2677.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2676.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/psalm-prefix-unresolvable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/complex-generics-example.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2648.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2740.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2822.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/inheritdoc-parameter-remapping.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/inheritdoc-constructors.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/list-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2835.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2443.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2750.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2850.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2863.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/native-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/type-change-after-array-access-assignment.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/iterator_to_array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/key-of.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/value-of.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/ext-ds.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/arrow-function-return-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/is-numeric.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/is-a.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/is-subclass-of.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3142.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-shapes-keys-strings.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1216.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/const-expr-phpdoc-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3226.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2001.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2232.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3009.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/inherit-phpdoc-merging-var.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/inherit-phpdoc-merging-param.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/inherit-phpdoc-merging-return.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/inherit-phpdoc-merging-template.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3266.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3269.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assign-nested-arrays.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3276.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/shadowed-trait-methods.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/const-in-functions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/const-in-functions-namespaced.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/root-scope-maybe-defined.php');
 		if (PHP_VERSION_ID < 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3336.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-3336.php');
 		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/catch-without-variable.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/mixed-typehint.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/catch-without-variable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/mixed-typehint.php');
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2600-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-2600-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2600.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-2600.php');
 		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-typehint-without-null-in-phpdoc.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/override-root-scope-variable.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bitwise-not.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-typehint-without-null-in-phpdoc.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/override-root-scope-variable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bitwise-not.php');
 		if (extension_loaded('gd')) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/graphics-draw-return-types.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/graphics-draw-return-types.php');
 		}
 
 		require_once __DIR__ . '/../../../stubs/runtime/ReflectionUnionType.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Reflection/data/unionTypes.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Reflection/data/unionTypes.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Reflection/data/mixedType.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Reflection/data/mixedType.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Reflection/data/staticReturnType.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Reflection/data/staticReturnType.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/minmax-arrays.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/classPhpDocs.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-array-key-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3133.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-2550.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2899.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/preg_split.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/minmax-arrays.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/classPhpDocs.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-array-key-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3133.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-2550.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2899.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/preg_split.php');
 
 		if (PHP_VERSION_ID < 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bcmath-dynamic-return-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bcmath-dynamic-return-php7.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bcmath-dynamic-return-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bcmath-dynamic-return-php8.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3875.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2611.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3548.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3866.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1014.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-pr-339.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/pow.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-expr.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5351.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3875.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2611.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3548.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3866.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1014.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-pr-339.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/pow.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-expr.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5351.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-array.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/class-constant-on-expr.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/class-constant-on-expr.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3961-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-3961-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3961.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-3961.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1924.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1924.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/extra-int-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/extra-int-types.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/count-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/count-type.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2816.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2816.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2816-2.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2816-2.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3985.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3985.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-shift.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-slice.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-shift.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-slice.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3990.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3990.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3991.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3991.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3993.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3993.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3997.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3997.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4016.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4016.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/promoted-properties-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/promoted-properties-types.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/early-termination-phpdoc.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/early-termination-phpdoc.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3915.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3915.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2378.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2378.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/match-expr.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/match-expr.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/nullsafe.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/nullsafe.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/specified-types-closure-use.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/specified-types-closure-edge.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/specified-types-closure-use.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/specified-types-closure-edge.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/cast-to-numeric-string.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2539.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2733.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3132.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1233.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/comparison-operators.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3880.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/inc-dec-in-conditions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4099.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3760.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2997.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1657.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2945.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4207.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4206.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-empty-array.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4205.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dependent-variable-certainty.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dependent-expression-certainty.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1865.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-non-empty-array.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/foreach-dependent-key-value.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dependent-variables-type-guard-same-as-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/cast-to-numeric-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2539.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2733.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3132.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1233.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/comparison-operators.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3880.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/inc-dec-in-conditions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4099.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3760.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2997.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1657.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2945.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4207.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4206.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-empty-array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4205.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/dependent-variable-certainty.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/dependent-expression-certainty.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1865.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/conditional-non-empty-array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/foreach-dependent-key-value.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/dependent-variables-type-guard-same-as-type.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dependent-variables-arrow-function.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/dependent-variables-arrow-function.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-801.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1209.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2980.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3986.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-801.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1209.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2980.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3986.php');
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4188.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-4188.php');
 		}
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4339.php');
-		}
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4343.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/impure-method.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/impure-constructor.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4351.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/var-above-use.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/var-above-declare.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-return-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4398.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4415.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/compact.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4500.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4504.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4436.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Properties/data/bug-3777.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2549.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1945.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2003.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-651.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1283.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4538.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/proc_get_status.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-4552.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1897.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1801.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2927.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4558.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4557.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4209.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4209-2.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2869.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3024.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3134.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/infer-array-key.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/offset-value-after-assign.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2112.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter-callables.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter-string-callables.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-4339.php');
+		}
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4343.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/impure-method.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/impure-constructor.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4351.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/var-above-use.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/var-above-declare.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/closure-return-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4398.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4415.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/compact.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4500.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4504.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4436.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Properties/data/bug-3777.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2549.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1945.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2003.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-651.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1283.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4538.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/proc_get_status.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-4552.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1897.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1801.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2927.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4558.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4557.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4209.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4209-2.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2869.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3024.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3134.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/infer-array-key.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/offset-value-after-assign.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2112.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-filter.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-filter-callables.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-filter-string-callables.php');
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter-arrow-functions.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-filter-arrow-functions.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-map.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-map-closure.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-merge.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-merge2.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-sum.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-plus.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4573.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4577.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4579.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3321.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-map.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-map-closure.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-merge.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-merge2.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-sum.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-plus.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4573.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4577.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4579.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3321.php');
 
 		require_once __DIR__ . '/../Rules/Generics/data/bug-3769.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Generics/data/bug-3769.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Generics/data/bug-6301.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/instanceof-class-string.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4498.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4587.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4606.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/nested-generic-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3922.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/nested-generic-types-unwrapping.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/nested-generic-types-unwrapping-covariant.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/nested-generic-incomplete-constructor.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/iterator-iterator.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4642.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/PhpDoc/data/bug-4643.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Generics/data/bug-3769.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Generics/data/bug-6301.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/instanceof-class-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4498.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4587.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4606.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/nested-generic-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3922.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/nested-generic-types-unwrapping.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/nested-generic-types-unwrapping-covariant.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/nested-generic-incomplete-constructor.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/iterator-iterator.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4642.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/PhpDoc/data/bug-4643.php');
 		require_once __DIR__ . '/data/throw-points/helpers.php';
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/php8/null-safe-method-call.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/and.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/array.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/array-dim-fetch.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/assign.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/assign-op.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/do-while.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/for.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/foreach.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/func-call.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/if.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/method-call.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/or.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/property-fetch.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/static-call.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/switch.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/throw.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/try-catch-finally.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/variable.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/while.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/throw-points/try-catch.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/phpdoc-pseudotype-override.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/php8/null-safe-method-call.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/and.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/array-dim-fetch.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/assign.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/assign-op.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/do-while.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/for.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/foreach.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/func-call.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/if.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/method-call.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/or.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/property-fetch.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/static-call.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/switch.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/throw.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/try-catch-finally.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/variable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/while.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/throw-points/try-catch.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/phpdoc-pseudotype-override.php');
 		require_once __DIR__ . '/data/phpdoc-pseudotype-namespace.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/phpdoc-pseudotype-namespace.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/phpdoc-pseudotype-global.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-traits.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4423.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-unions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-parent.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4247.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4267.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2231.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3558.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3351.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4213.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4657.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4707.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4545.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4714.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4725.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4733.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4326.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-987.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3677.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4215.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4695.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2977.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3190.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/ternary-specified-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-560.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/do-not-remember-impure-functions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4190.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/clear-stat-cache.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/invalidate-object-argument.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/invalidate-object-argument-static.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/phpdoc-pseudotype-namespace.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/phpdoc-pseudotype-global.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-traits.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4423.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-unions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-parent.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4247.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4267.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2231.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3558.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3351.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4213.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4657.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4707.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4545.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4714.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4725.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4733.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4326.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-987.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3677.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4215.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4695.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2977.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3190.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/ternary-specified-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-560.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/do-not-remember-impure-functions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4190.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/clear-stat-cache.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/invalidate-object-argument.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/invalidate-object-argument-static.php');
 
 		require_once __DIR__ . '/data/invalidate-object-argument-function.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/invalidate-object-argument-function.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4588.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4091.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3382.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4177.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2288.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1157.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1597.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3617.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-778.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2969.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3004.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3710.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3822.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-505.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1670.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1219.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3302.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1511.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4434.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4231.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4287.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4700.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/phpdoc-in-closure-bind.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/multi-assign.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generics-reduce-types-first.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4803.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/invalidate-object-argument-function.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4588.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4091.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3382.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4177.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2288.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1157.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1597.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3617.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-778.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2969.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3004.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3710.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3822.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-505.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1670.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1219.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3302.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1511.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4434.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4231.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4287.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4700.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/phpdoc-in-closure-bind.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/multi-assign.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generics-reduce-types-first.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4803.php');
 
 		require_once __DIR__ . '/data/type-aliases.php';
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/type-aliases.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4650.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2906.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/DateTimeCreateDynamicReturnTypes.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/DateTimeDynamicReturnTypes.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/DateTimeModifyReturnTypes.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4821.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4838.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4879.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4820.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4822.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4816.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4757.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4814.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4982.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4761.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3331.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3106.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2640.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2413.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3446.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/getopt.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generics-default.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4985.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5000.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/number_format.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5140.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-4857.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/empty-array-shape.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-5089.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3158.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/unable-to-resolve-callback-parameter-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/type-aliases.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4650.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2906.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/DateTimeCreateDynamicReturnTypes.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/DateTimeDynamicReturnTypes.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/DateTimeModifyReturnTypes.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4821.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4838.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4879.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4820.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4822.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4816.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4757.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4814.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4982.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4761.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3331.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3106.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2640.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2413.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3446.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/getopt.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generics-default.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4985.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5000.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/number_format.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5140.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-4857.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/empty-array-shape.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-5089.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3158.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/unable-to-resolve-callback-parameter-type.php');
 
 		require_once __DIR__ . '/../Rules/Functions/data/varying-acceptor.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/varying-acceptor.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Functions/data/varying-acceptor.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/uksort-bug.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/uksort-bug.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/arrow-function-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/arrow-function-types.php');
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4902-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-4902-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4902.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-4902.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5219.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/strval.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-next.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/closure-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5219.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/strval.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-next.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-replace-functions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-replace-functions.php');
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-substr.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-substr.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-substr-pre-80.php');
-		}
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3981.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4711.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/sscanf.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-offset-get.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generic-object-lower-bound.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/class-reflection-interfaces.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-4415.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5259.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5293.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5129.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4970.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5322.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5336.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6845.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/splfixedarray-iterator-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-5372.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-5372_2.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-substr-pre-80.php');
+		}
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3981.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4711.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/sscanf.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-offset-get.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generic-object-lower-bound.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/class-reflection-interfaces.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-4415.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5259.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5293.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5129.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4970.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5322.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5336.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6845.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/splfixedarray-iterator-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-5372.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/bug-5372_2.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/mb_substitute_character-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/mb_substitute_character-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/mb_substitute_character.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/mb_substitute_character.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/class-constant-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/class-constant-types.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3379.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3379.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/reflectionclass-issue-5511-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/reflectionclass-issue-5511-php8.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/modulo-operator.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/modulo-operator.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/literal-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/literal-string.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/filter-var-returns-non-empty-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/filter-var-returns-non-empty-string.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/model-mixin.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/model-mixin.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5529.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5529.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/sizeof.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/sizeof.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/div-by-zero.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/div-by-zero.php');
 
 		if (PHP_INT_SIZE === 8) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5072.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5530.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1861.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4843.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4602.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4499.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2142.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5584.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/math.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1870.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-5562.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5615.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-unshift.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array_map_multiple.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/range-numeric-string.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/missing-closure-native-return-typehint.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4741.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/more-type-strings.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5072.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5530.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1861.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4843.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4602.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4499.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2142.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5584.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/math.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1870.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-5562.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5615.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-unshift.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array_map_multiple.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/range-numeric-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/missing-closure-native-return-typehint.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4741.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/more-type-strings.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/variadic-parameter-php8.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/no-named-arguments.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4896.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5843.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/variadic-parameter-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/no-named-arguments.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-4896.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5843.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/eval-implicit-throw.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5628.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5501.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4743.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5017.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5992.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6001.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/eval-implicit-throw.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5628.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5501.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4743.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5017.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5992.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6001.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/round-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/round-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/round.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/round.php');
 		}
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5287-php81.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5287-php81.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5287.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5287.php');
 		}
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5458.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5458.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/never.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/never.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/native-intersection.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/native-intersection.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2760.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2760.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/new-in-initializers.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/new-in-initializers.php');
 
 		if (PHP_VERSION_ID >= 80100) {
 			define('TEST_OBJECT_CONSTANT', new stdClass());
@@ -582,569 +582,565 @@ public function dataFileAsserts(): iterable
 			define('TEST_FALSE_CONSTANT', false);
 			define('TEST_ARRAY_CONSTANT', [true, false, null]);
 			define('TEST_ENUM_CONSTANT', Foo::ONE);
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/new-in-initializers-runtime.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/new-in-initializers-runtime.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/first-class-callables.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/first-class-callables.php');
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-is-list-type-specifying.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-is-list-unset.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-is-list-type-specifying.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-is-list-unset.php');
 		}
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-unpacking-string-keys.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-unpacking-string-keys.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/filesystem-functions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/filesystem-functions.php');
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/enums.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/enums-import-alias.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7176.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/enums.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/enums-import-alias.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7176.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6293.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6293.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/predefined-constants-php72.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/predefined-constants-php72.php');
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/predefined-constants-php74.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/predefined-constants-php74.php');
 		}
 		if (PHP_INT_SIZE === 8) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/predefined-constants-64bit.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/predefined-constants-64bit.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/predefined-constants-32bit.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/predefined-constants-32bit.php');
 		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/predefined-constants.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/predefined-constants.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/classPhpDocs-phpstanPropertyPrefix.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/classPhpDocs-phpstanPropertyPrefix.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-destructuring-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-prepare.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-type-set.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/for-loop-i-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5316.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3858.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2806.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5328.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3044.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-destructuring-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/pdo-prepare.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/constant-array-type-set.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/for-loop-i-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5316.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3858.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2806.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5328.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3044.php');
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/invalidate-readonly-properties.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/invalidate-readonly-properties.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/weird-array_key_exists-issue.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/equal.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/identical.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/weird-array_key_exists-issue.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/equal.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/identical.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5698-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5698-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5698-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5698-php7.php');
 		}
 
 		if (PHP_VERSION_ID >= 70304) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/date-period-return-types.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/date-period-return-types.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6404.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6399.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4357.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5817.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6404.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6399.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4357.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5817.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-chunk.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-chunk.php');
 
 		if (PHP_VERSION_ID < 80200) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-column.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-column.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-column-php82.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-column-php82.php');
 		}
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-column-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-column-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-column-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-column-php7.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6497.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6497.php');
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/isset-coalesce-empty-type.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/isset-coalesce-empty-type-root.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/isset-coalesce-empty-type.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/isset-coalesce-empty-type-root.php');
 		}
 
 		if (PHP_VERSION_ID < 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/isset-coalesce-empty-type-pre-81.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/isset-coalesce-empty-type-pre-81.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/isset-coalesce-empty-type-post-81.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/isset-coalesce-empty-type-post-81.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/template-null-bound.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4592.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4903.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2420.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2718.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3126.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4586.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4887.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/template-null-bound.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4592.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4903.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2420.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2718.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3126.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4586.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4887.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/hash-functions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/hash-functions.php');
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/hash-functions-80.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/hash-functions-80.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/hash-functions-74.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/hash-functions-74.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6308.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6308.php');
 		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6329.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6329.php');
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-6473.php');
+			yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-6473.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6566-types.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6566-types.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6500.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6500.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6488.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6624.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6488.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6624.php');
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/property-template-tag.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/property-template-tag.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6672.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6687.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6672.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6687.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/callable-in-union.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/callable-in-union.php');
 
 		if (PHP_VERSION_ID < 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/preg_match_php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/preg_match_php7.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/preg_match_php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/preg_match_php8.php');
 		}
 
 		if (PHP_VERSION_ID >= 70300) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6654.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6654.php');
 		}
 
 		require_once __DIR__ . '/data/countable.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/countable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/countable.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6696.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6704.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/filter-iterator-child-class.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/smaller-than-benevolent.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6696.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6704.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/filter-iterator-child-class.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/smaller-than-benevolent.php');
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6695.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6433.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6695.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6433.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6698.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/date-format.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6070.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6108.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1516.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6138.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6174.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-5749.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5675.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6698.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/date-format.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6070.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6108.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1516.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6138.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6174.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-5749.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5675.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6505.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6505.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6305.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6699.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6715.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6682.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6305.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6699.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6715.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6682.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/preg_filter.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5759.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5783.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5668.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/generics-empty-array.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-5757.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/preg_filter.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5759.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5783.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5668.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/generics-empty-array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-5757.php');
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/nullable-closure-parameter.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/nullable-closure-parameter.php');
 		}
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-6635.php');
+			yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-6635.php');
 		}
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6591.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6591.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6790.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6790.php');
 		}
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6859.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6859.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/curl_getinfo.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/curl_getinfo.php');
 		if (PHP_VERSION_ID >= 70300) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/curl_getinfo_7.3.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/curl_getinfo_7.3.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6251.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6870.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4885.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6251.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6870.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-4885.php');
 		}
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/value-of-enum.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/value-of-enum.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6576.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6584.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6576.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6584.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/weird-strlen-cases.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6439.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6748.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/weird-strlen-cases.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6439.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6748.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-fill-keys.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-flip.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-intersect-key.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-intersect-key-constant.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-search.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-fill-keys.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-flip.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-intersect-key.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-intersect-key-constant.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-search.php');
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-fill-keys-php8.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-flip-php8.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-intersect-key-php8.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-search-php8.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array_keys.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array_values.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-fill-keys-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-flip-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-intersect-key-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-search-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array_keys.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array_values.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-fill-keys-php7.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-flip-php7.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-intersect-key-php7.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-search-php7.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array_keys-php7.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array_values-php7.php');
-		}
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-search-type-specifying.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-pop.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-push.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-replace.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-reverse.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6889.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6891.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/shuffle.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/simplexml.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-fill-keys-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-flip-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-intersect-key-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-search-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array_keys-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array_values-php7.php');
+		}
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-search-type-specifying.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-pop.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-push.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-replace.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-reverse.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6889.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6891.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/shuffle.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/simplexml.php');
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6904.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6904.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-combine-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-combine-php8.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/array-combine-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/array-combine-php7.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6917.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6936-limit.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6917.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6936-limit.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5262.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-5262.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2471.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5846.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5896.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6927.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2471.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5846.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5896.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6927.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3853.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-optional-set.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7000.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6383.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-3284.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-3853.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/conditional-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/constant-array-optional-set.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7000.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6383.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-3284.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/int-mask.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/int-mask.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-types-constant.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/conditional-types-constant.php');
 
 		require_once __DIR__ . '/data/constant-phpdoc-type.php';
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-phpdoc-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/constant-phpdoc-type.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6993.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7078.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6993.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7078.php');
 		}
 
 		if (PHP_VERSION_ID >= 80200) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/mb-strlen-php82.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/mb-strlen-php82.php');
 		} elseif (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/mb-strlen-php8.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/mb-strlen-php8.php');
 		} elseif (PHP_VERSION_ID < 70300) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/mb-strlen-php72.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/mb-strlen-php72.php');
 		} else {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/mb-strlen-php73.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/mb-strlen-php73.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7096.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7096.php');
 		}
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7167.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6864.php');
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7776.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7167.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-6864.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7776.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7068.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7115.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-type-identical.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-str-containing-fns.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/fizz-buzz.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4875.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6609.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7068.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7115.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/constant-array-type-identical.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-str-containing-fns.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/fizz-buzz.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4875.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6609.php');
 
 		//define('ALREADY_DEFINED_CONSTANT', true);
-		//yield from $this->gatherAssertTypes(__DIR__ . '/data/already-defined-constant.php');
+		//yield from $this->gatherAssertTypesCallbacks(__DIR__ . '/data/already-defined-constant.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/value-of-generic.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/key-of-generic.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7106.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4950.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/native-reflection-default-values.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/value-of-generic.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/key-of-generic.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7106.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4950.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/native-reflection-default-values.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/pr-1244.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7144.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7144-composer-integration.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4371.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/initializer-expr-type-resolver.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/pr-1244.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7144.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7144-composer-integration.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4371.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/initializer-expr-type-resolver.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/offset-access.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/offset-access.php');
 
 		if (PHP_VERSION_ID >= 70300) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/str-casing.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-substr-specifying.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/unset-conditional-expressions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-types-inference.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7210.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7341.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-strstr-specifying.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-strrchr-specifying.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-strcasing-specifying.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/conditional-complex-templates.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7374.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/template-constant-bound.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7391.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/finally-scope.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7387.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7353.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7031.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-intersect.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7153.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/in-array-non-empty.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4117.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7490.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/remember-possibly-impure-function-values.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/emptyiterator.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/collected-data.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7550.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7580.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/this-subtractable.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/match-expression-inference.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1519.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/str-casing.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-substr-specifying.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/unset-conditional-expressions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/conditional-types-inference.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7210.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7341.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-strstr-specifying.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-strrchr-specifying.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-empty-string-strcasing-specifying.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/conditional-complex-templates.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7374.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/template-constant-bound.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7391.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/finally-scope.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7387.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7353.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7031.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/constant-array-intersect.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7153.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/in-array-non-empty.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4117.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7490.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/remember-possibly-impure-function-values.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/emptyiterator.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/collected-data.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7550.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7580.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/this-subtractable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/match-expression-inference.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1519.php');
 
 		if (PHP_VERSION_ID < 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7663-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7663-php7.php');
 		}
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7663-php8.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7663.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7688.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7689.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/has-offset-type-bug.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5920.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7621-1.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7621-2.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7621-3.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-7511.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7224.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6556.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-4708.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4708.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2911.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-7156.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6728.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-6364.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-5758.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-3931.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5223.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7698.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-falsy-string.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7483.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7056.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Variables/data/bug-7417.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-7469.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Variables/data/bug-3391.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6901.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/bug-7663-php8.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7663.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7688.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7689.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/has-offset-type-bug.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5920.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7621-1.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7621-2.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7621-3.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-7511.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7224.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6556.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-4708.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-4708.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-2911.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Functions/data/bug-7156.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6728.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/bug-6364.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/bug-5758.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Functions/data/bug-3931.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5223.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7698.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/non-falsy-string.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7483.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7056.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Variables/data/bug-7417.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/bug-7469.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Variables/data/bug-3391.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6901.php');
 
 		if (PHP_VERSION_ID >= 70400) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/arrow-function-argument-type.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/arrow-function-argument-type.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-argument-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/ctype-digit.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7788.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7809.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-non-empty-array-after-unset.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/closure-argument-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/ctype-digit.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7788.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7809.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/composer-non-empty-array-after-unset.php');
 
 		if (PHP_VERSION_ID >= 80200) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/true-typehint.php');
+			yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/true-typehint.php');
 		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-6000.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/prestashop-breakdowns-empty-array.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/bug-6000.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/prestashop-breakdowns-empty-array.php');
 
 		if (PHP_VERSION_ID < 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/loose-comparisons-php7.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/loose-comparisons-php7.php');
 		}
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/loose-comparisons-php8.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/loose-comparisons.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7563.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7764.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5845.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-flip-constant.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter-constant.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-array-bug.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/tagged-unions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7492.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7877.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1021.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/slevomat-foreach-unset-bug.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6170.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/slevomat-foreach-array-key-exists-bug.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-key-exists.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/key-exists.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7909.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/loose-comparisons-php8.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/data/loose-comparisons.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7563.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7764.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5845.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-flip-constant.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-filter-constant.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/composer-array-bug.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/tagged-unions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7492.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7877.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-1021.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/slevomat-foreach-unset-bug.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-6170.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/slevomat-foreach-array-key-exists-bug.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-key-exists.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/key-exists.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7909.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-7898.php');
+			yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-7898.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-7823.php');
+			yield from $this->gatherAssertions(__DIR__ . '/../Rules/Functions/data/bug-7823.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7921.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7928.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7921.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7928.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7949.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7639.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5304.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7244.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7501.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7949.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7639.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5304.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7244.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7501.php');
 		if (PHP_VERSION_ID >= 80200) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/standalone-types.php');
-		}
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Arrays/data/bug-7954.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/scope-generalization.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8015.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7993.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7996.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7141.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/cli-globals.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8033.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-union-unshift.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7987.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7963-three.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8017.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8004.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/global-namespace.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/standalone-types.php');
+		}
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Arrays/data/bug-7954.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/scope-generalization.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8015.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7993.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7996.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7141.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/cli-globals.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8033.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/constant-array-union-unshift.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7987.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7963-three.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8017.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8004.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/global-namespace.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/dnf.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/dnf.php');
 		}
 
 		if (PHP_VERSION_ID >= 70300) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/fpm-get-status.php');
-		}
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-offset-unset.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-docblock.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-empty.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-method.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-property.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-methods.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-intersected.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-invariant.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-conditional.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/docblock-assert-equality.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8008.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-class-type.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5552.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/extra-extra-int-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/list-count.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Properties/data/bug-7839.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/self-out.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/native-expressions.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Classes/data/bug-5333.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/fpm-get-status.php');
+		}
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/array-offset-unset.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-docblock.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-empty.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-method.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-property.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-methods.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-intersected.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-invariant.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-conditional.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/docblock-assert-equality.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8008.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/assert-class-type.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5552.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/extra-extra-int-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/list-count.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Properties/data/bug-7839.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/self-out.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/native-expressions.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Classes/data/bug-5333.php');
 
 		if (PHP_VERSION_ID >= 80100) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/allowed-subtypes-enum.php');
-		}
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/allowed-subtypes-datetime.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/allowed-subtypes-throwable.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-8174.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-8169.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7519.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8087.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5785.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/callable-object.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/callable-string.php');
-
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8225.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8242.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-treatPhpDocTypesAsCertainBug.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-retain-expression-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7913.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-8280.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8272.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-8277.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/strtr.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/static-has-method.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/mixed-to-number.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Variables/data/bug-8113.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/phpunit-integration.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8361.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8373.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-8389.php');
+			yield from $this->gatherAssertions(__DIR__ . '/data/allowed-subtypes-enum.php');
+		}
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/allowed-subtypes-datetime.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/allowed-subtypes-throwable.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Methods/data/bug-8174.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-8169.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7519.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8087.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-5785.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/callable-object.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/callable-string.php');
+
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8225.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8242.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/composer-treatPhpDocTypesAsCertainBug.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/closure-retain-expression-types.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-7913.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Functions/data/bug-8280.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8272.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Comparison/data/bug-8277.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/strtr.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/static-has-method.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/mixed-to-number.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Variables/data/bug-8113.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/phpunit-integration.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8361.php');
+		yield from $this->gatherAssertions(__DIR__ . '/data/bug-8373.php');
+		yield from $this->gatherAssertions(__DIR__ . '/../Rules/Functions/data/bug-8389.php');
 	}
 
 	/**
-	 * @dataProvider dataFileAsserts
-	 * @param mixed ...$args
+	 * @dataProvider dataAssertions
+	 * @param callable(): array<string, array<mixed>> $assertionsCallback
 	 */
-	public function testFileAsserts(
-		string $assertType,
-		string $file,
-		...$args,
-	): void
+	public function testAssertions(callable $assertionsCallback): void
 	{
-		$this->assertFileAsserts($assertType, $file, ...$args);
+		$this->assertAssertions($assertionsCallback);
 	}
 
 	public static function getAdditionalConfigFiles(): array