Take advantage of gatherAssertTypesFromDirectory in NodeScopeResolver…

…Test
phpstan · Jun 14, 2024 · 36760e1 · 36760e1
1 parent 595de78
commit 36760e1
Show file tree

Hide file tree

Showing 899 changed files with 3 additions and 1,362 deletions.
diff --git a/build/phpstan.neon b/build/phpstan.neon
@@ -26,6 +26,7 @@ parameters:
 		- ../src/Reflection/SignatureMap/functionMetadata.php
 		- ../tests/*/data/*
 		- ../tests/tmp/*
+		- ../tests/PHPStan/Analyser/nsrt/*
 		- ../tests/PHPStan/Analyser/traits/*
 		- ../tests/notAutoloaded/*
 		- ../tests/PHPStan/Generics/functions.php

diff --git a/phpcs.xml b/phpcs.xml
@@ -205,6 +205,7 @@
 		</properties>
 	</rule>
 	<exclude-pattern>tests/*/data</exclude-pattern>
+	<exclude-pattern>tests/PHPStan/Analyser/nsrt</exclude-pattern>
 	<exclude-pattern>tests/*/Fixture</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_1.php</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_2.php</exclude-pattern>

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
diff --git a/...data/DateTimeCreateDynamicReturnTypes.php → ...nsrt/DateTimeCreateDynamicReturnTypes.php b/...data/DateTimeCreateDynamicReturnTypes.php → ...nsrt/DateTimeCreateDynamicReturnTypes.php
diff --git a/...lyser/data/DateTimeDynamicReturnTypes.php → ...lyser/nsrt/DateTimeDynamicReturnTypes.php b/...lyser/data/DateTimeDynamicReturnTypes.php → ...lyser/nsrt/DateTimeDynamicReturnTypes.php
diff --git a/...alyser/data/DateTimeModifyReturnTypes.php → ...alyser/nsrt/DateTimeModifyReturnTypes.php b/...alyser/data/DateTimeModifyReturnTypes.php → ...alyser/nsrt/DateTimeModifyReturnTypes.php
diff --git a/tests/PHPStan/Analyser/data/PDOStatement.php → tests/PHPStan/Analyser/nsrt/PDOStatement.php b/tests/PHPStan/Analyser/data/PDOStatement.php → tests/PHPStan/Analyser/nsrt/PDOStatement.php
diff --git a/...alyser/data/allowed-subtypes-datetime.php → ...alyser/nsrt/allowed-subtypes-datetime.php b/...alyser/data/allowed-subtypes-datetime.php → ...alyser/nsrt/allowed-subtypes-datetime.php
diff --git a/...n/Analyser/data/allowed-subtypes-enum.php → ...n/Analyser/nsrt/allowed-subtypes-enum.php b/...n/Analyser/data/allowed-subtypes-enum.php → ...n/Analyser/nsrt/allowed-subtypes-enum.php
diff --git a/...lyser/data/allowed-subtypes-throwable.php → ...lyser/nsrt/allowed-subtypes-throwable.php b/...lyser/data/allowed-subtypes-throwable.php → ...lyser/nsrt/allowed-subtypes-throwable.php
diff --git a/...Stan/Analyser/data/always-true-elseif.php → ...Stan/Analyser/nsrt/always-true-elseif.php b/...Stan/Analyser/data/always-true-elseif.php → ...Stan/Analyser/nsrt/always-true-elseif.php
diff --git a/...HPStan/Analyser/data/array-chunk-php8.php → ...HPStan/Analyser/nsrt/array-chunk-php8.php b/...HPStan/Analyser/data/array-chunk-php8.php → ...HPStan/Analyser/nsrt/array-chunk-php8.php
diff --git a/...PStan/Analyser/data/array-chunk-php81.php → ...PStan/Analyser/nsrt/array-chunk-php81.php b/...PStan/Analyser/data/array-chunk-php81.php → ...PStan/Analyser/nsrt/array-chunk-php81.php
diff --git a/tests/PHPStan/Analyser/data/array-chunk.php → tests/PHPStan/Analyser/nsrt/array-chunk.php b/tests/PHPStan/Analyser/data/array-chunk.php → tests/PHPStan/Analyser/nsrt/array-chunk.php
diff --git a/...PStan/Analyser/data/array-column-php8.php → ...PStan/Analyser/nsrt/array-column-php8.php b/...PStan/Analyser/data/array-column-php8.php → ...PStan/Analyser/nsrt/array-column-php8.php
diff --git a/...Stan/Analyser/data/array-column-php82.php → ...Stan/Analyser/nsrt/array-column-php82.php b/...Stan/Analyser/data/array-column-php82.php → ...Stan/Analyser/nsrt/array-column-php82.php
diff --git a/...Stan/Analyser/data/array-combine-php8.php → ...Stan/Analyser/nsrt/array-combine-php8.php b/...Stan/Analyser/data/array-combine-php8.php → ...Stan/Analyser/nsrt/array-combine-php8.php
diff --git a/...alyser/data/array-destructuring-types.php → ...alyser/nsrt/array-destructuring-types.php b/...alyser/data/array-destructuring-types.php → ...alyser/nsrt/array-destructuring-types.php
diff --git a/...an/Analyser/data/array-fill-keys-php8.php → ...an/Analyser/nsrt/array-fill-keys-php8.php b/...an/Analyser/data/array-fill-keys-php8.php → ...an/Analyser/nsrt/array-fill-keys-php8.php
diff --git a/...PHPStan/Analyser/data/array-fill-keys.php → ...PHPStan/Analyser/nsrt/array-fill-keys.php b/...PHPStan/Analyser/data/array-fill-keys.php → ...PHPStan/Analyser/nsrt/array-fill-keys.php
diff --git a/...ser/data/array-filter-arrow-functions.php → ...ser/nsrt/array-filter-arrow-functions.php b/...ser/data/array-filter-arrow-functions.php → ...ser/nsrt/array-filter-arrow-functions.php
diff --git a/.../Analyser/data/array-filter-callables.php → .../Analyser/nsrt/array-filter-callables.php b/.../Analyser/data/array-filter-callables.php → .../Analyser/nsrt/array-filter-callables.php
diff --git a/...n/Analyser/data/array-filter-constant.php → ...n/Analyser/nsrt/array-filter-constant.php b/...n/Analyser/data/array-filter-constant.php → ...n/Analyser/nsrt/array-filter-constant.php
diff --git a/...er/data/array-filter-string-callables.php → ...er/nsrt/array-filter-string-callables.php b/...er/data/array-filter-string-callables.php → ...er/nsrt/array-filter-string-callables.php
diff --git a/tests/PHPStan/Analyser/data/array-filter.php → tests/PHPStan/Analyser/nsrt/array-filter.php b/tests/PHPStan/Analyser/data/array-filter.php → tests/PHPStan/Analyser/nsrt/array-filter.php
diff --git a/...tan/Analyser/data/array-flip-constant.php → ...tan/Analyser/nsrt/array-flip-constant.php b/...tan/Analyser/data/array-flip-constant.php → ...tan/Analyser/nsrt/array-flip-constant.php
diff --git a/...PHPStan/Analyser/data/array-flip-php8.php → ...PHPStan/Analyser/nsrt/array-flip-php8.php b/...PHPStan/Analyser/data/array-flip-php8.php → ...PHPStan/Analyser/nsrt/array-flip-php8.php
diff --git a/tests/PHPStan/Analyser/data/array-flip.php → tests/PHPStan/Analyser/nsrt/array-flip.php b/tests/PHPStan/Analyser/data/array-flip.php → tests/PHPStan/Analyser/nsrt/array-flip.php
diff --git a/...ser/data/array-intersect-key-constant.php → ...ser/nsrt/array-intersect-key-constant.php b/...ser/data/array-intersect-key-constant.php → ...ser/nsrt/array-intersect-key-constant.php
diff --git a/...nalyser/data/array-intersect-key-php8.php → ...nalyser/nsrt/array-intersect-key-php8.php b/...nalyser/data/array-intersect-key-php8.php → ...nalyser/nsrt/array-intersect-key-php8.php
diff --git a/...tan/Analyser/data/array-intersect-key.php → ...tan/Analyser/nsrt/array-intersect-key.php b/...tan/Analyser/data/array-intersect-key.php → ...tan/Analyser/nsrt/array-intersect-key.php
diff --git a/...er/data/array-is-list-type-specifying.php → ...er/nsrt/array-is-list-type-specifying.php b/...er/data/array-is-list-type-specifying.php → ...er/nsrt/array-is-list-type-specifying.php
diff --git a/...tan/Analyser/data/array-is-list-unset.php → ...tan/Analyser/nsrt/array-is-list-unset.php b/...tan/Analyser/data/array-is-list-unset.php → ...tan/Analyser/nsrt/array-is-list-unset.php
diff --git a/...HPStan/Analyser/data/array-key-exists.php → ...HPStan/Analyser/nsrt/array-key-exists.php b/...HPStan/Analyser/data/array-key-exists.php → ...HPStan/Analyser/nsrt/array-key-exists.php
diff --git a/tests/PHPStan/Analyser/data/array-key.php → tests/PHPStan/Analyser/nsrt/array-key.php b/tests/PHPStan/Analyser/data/array-key.php → tests/PHPStan/Analyser/nsrt/array-key.php
diff --git a/...PStan/Analyser/data/array-map-closure.php → ...PStan/Analyser/nsrt/array-map-closure.php b/...PStan/Analyser/data/array-map-closure.php → ...PStan/Analyser/nsrt/array-map-closure.php
diff --git a/tests/PHPStan/Analyser/data/array-map.php → tests/PHPStan/Analyser/nsrt/array-map.php b/tests/PHPStan/Analyser/data/array-map.php → tests/PHPStan/Analyser/nsrt/array-map.php
diff --git a/tests/PHPStan/Analyser/data/array-merge.php → tests/PHPStan/Analyser/nsrt/array-merge.php b/tests/PHPStan/Analyser/data/array-merge.php → tests/PHPStan/Analyser/nsrt/array-merge.php
diff --git a/tests/PHPStan/Analyser/data/array-merge2.php → tests/PHPStan/Analyser/nsrt/array-merge2.php b/tests/PHPStan/Analyser/data/array-merge2.php → tests/PHPStan/Analyser/nsrt/array-merge2.php
diff --git a/tests/PHPStan/Analyser/data/array-next.php → tests/PHPStan/Analyser/nsrt/array-next.php b/tests/PHPStan/Analyser/data/array-next.php → tests/PHPStan/Analyser/nsrt/array-next.php
diff --git a/...Stan/Analyser/data/array-offset-unset.php → ...Stan/Analyser/nsrt/array-offset-unset.php b/...Stan/Analyser/data/array-offset-unset.php → ...Stan/Analyser/nsrt/array-offset-unset.php
diff --git a/tests/PHPStan/Analyser/data/array-plus.php → tests/PHPStan/Analyser/nsrt/array-plus.php b/tests/PHPStan/Analyser/data/array-plus.php → tests/PHPStan/Analyser/nsrt/array-plus.php
diff --git a/tests/PHPStan/Analyser/data/array-pop.php → tests/PHPStan/Analyser/nsrt/array-pop.php b/tests/PHPStan/Analyser/data/array-pop.php → tests/PHPStan/Analyser/nsrt/array-pop.php
diff --git a/tests/PHPStan/Analyser/data/array-push.php → tests/PHPStan/Analyser/nsrt/array-push.php b/tests/PHPStan/Analyser/data/array-push.php → tests/PHPStan/Analyser/nsrt/array-push.php
diff --git a/...s/PHPStan/Analyser/data/array-replace.php → ...s/PHPStan/Analyser/nsrt/array-replace.php b/...s/PHPStan/Analyser/data/array-replace.php → ...s/PHPStan/Analyser/nsrt/array-replace.php
diff --git a/...s/PHPStan/Analyser/data/array-reverse.php → ...s/PHPStan/Analyser/nsrt/array-reverse.php b/...s/PHPStan/Analyser/data/array-reverse.php → ...s/PHPStan/Analyser/nsrt/array-reverse.php
diff --git a/...PStan/Analyser/data/array-search-php8.php → ...PStan/Analyser/nsrt/array-search-php8.php b/...PStan/Analyser/data/array-search-php8.php → ...PStan/Analyser/nsrt/array-search-php8.php
diff --git a/...ser/data/array-search-type-specifying.php → ...ser/nsrt/array-search-type-specifying.php b/...ser/data/array-search-type-specifying.php → ...ser/nsrt/array-search-type-specifying.php
diff --git a/tests/PHPStan/Analyser/data/array-search.php → tests/PHPStan/Analyser/nsrt/array-search.php b/tests/PHPStan/Analyser/data/array-search.php → tests/PHPStan/Analyser/nsrt/array-search.php
diff --git a/...alyser/data/array-shape-list-optional.php → ...alyser/nsrt/array-shape-list-optional.php b/...alyser/data/array-shape-list-optional.php → ...alyser/nsrt/array-shape-list-optional.php
diff --git a/...alyser/data/array-shapes-keys-strings.php → ...alyser/nsrt/array-shapes-keys-strings.php b/...alyser/data/array-shapes-keys-strings.php → ...alyser/nsrt/array-shapes-keys-strings.php
diff --git a/tests/PHPStan/Analyser/data/array-shift.php → tests/PHPStan/Analyser/nsrt/array-shift.php b/tests/PHPStan/Analyser/data/array-shift.php → tests/PHPStan/Analyser/nsrt/array-shift.php
diff --git a/tests/PHPStan/Analyser/data/array-slice.php → tests/PHPStan/Analyser/nsrt/array-slice.php b/tests/PHPStan/Analyser/data/array-slice.php → tests/PHPStan/Analyser/nsrt/array-slice.php
diff --git a/tests/PHPStan/Analyser/data/array-sum.php → tests/PHPStan/Analyser/nsrt/array-sum.php b/tests/PHPStan/Analyser/data/array-sum.php → tests/PHPStan/Analyser/nsrt/array-sum.php
diff --git a/...array-typehint-without-null-in-phpdoc.php → ...array-typehint-without-null-in-phpdoc.php b/...array-typehint-without-null-in-phpdoc.php → ...array-typehint-without-null-in-phpdoc.php
diff --git a/...yser/data/array-unpacking-string-keys.php → ...yser/nsrt/array-unpacking-string-keys.php b/...yser/data/array-unpacking-string-keys.php → ...yser/nsrt/array-unpacking-string-keys.php
diff --git a/...s/PHPStan/Analyser/data/array-unshift.php → ...s/PHPStan/Analyser/nsrt/array-unshift.php b/...s/PHPStan/Analyser/data/array-unshift.php → ...s/PHPStan/Analyser/nsrt/array-unshift.php
diff --git a/tests/PHPStan/Analyser/data/array_keys.php → tests/PHPStan/Analyser/nsrt/array_keys.php b/tests/PHPStan/Analyser/data/array_keys.php → tests/PHPStan/Analyser/nsrt/array_keys.php
diff --git a/...Stan/Analyser/data/array_map_multiple.php → ...Stan/Analyser/nsrt/array_map_multiple.php b/...Stan/Analyser/data/array_map_multiple.php → ...Stan/Analyser/nsrt/array_map_multiple.php
diff --git a/tests/PHPStan/Analyser/data/array_splice.php → tests/PHPStan/Analyser/nsrt/array_splice.php b/tests/PHPStan/Analyser/data/array_splice.php → tests/PHPStan/Analyser/nsrt/array_splice.php
diff --git a/tests/PHPStan/Analyser/data/array_values.php → tests/PHPStan/Analyser/nsrt/array_values.php b/tests/PHPStan/Analyser/data/array_values.php → tests/PHPStan/Analyser/nsrt/array_values.php
diff --git a/...ser/data/arrow-function-argument-type.php → ...ser/nsrt/arrow-function-argument-type.php b/...ser/data/arrow-function-argument-type.php → ...ser/nsrt/arrow-function-argument-type.php
diff --git a/...lyser/data/arrow-function-return-type.php → ...lyser/nsrt/arrow-function-return-type.php b/...lyser/data/arrow-function-return-type.php → ...lyser/nsrt/arrow-function-return-type.php
diff --git a/...an/Analyser/data/arrow-function-types.php → ...an/Analyser/nsrt/arrow-function-types.php b/...an/Analyser/data/arrow-function-types.php → ...an/Analyser/nsrt/arrow-function-types.php
diff --git a/...PStan/Analyser/data/assert-class-type.php → ...PStan/Analyser/nsrt/assert-class-type.php b/...PStan/Analyser/data/assert-class-type.php → ...PStan/Analyser/nsrt/assert-class-type.php
diff --git a/...Stan/Analyser/data/assert-conditional.php → ...Stan/Analyser/nsrt/assert-conditional.php b/...Stan/Analyser/data/assert-conditional.php → ...Stan/Analyser/nsrt/assert-conditional.php
diff --git a/...Stan/Analyser/data/assert-constructor.php → ...Stan/Analyser/nsrt/assert-constructor.php b/...Stan/Analyser/data/assert-constructor.php → ...Stan/Analyser/nsrt/assert-constructor.php
diff --git a/...PHPStan/Analyser/data/assert-docblock.php → ...PHPStan/Analyser/nsrt/assert-docblock.php b/...PHPStan/Analyser/data/assert-docblock.php → ...PHPStan/Analyser/nsrt/assert-docblock.php
diff --git a/tests/PHPStan/Analyser/data/assert-empty.php → tests/PHPStan/Analyser/nsrt/assert-empty.php b/tests/PHPStan/Analyser/data/assert-empty.php → tests/PHPStan/Analyser/nsrt/assert-empty.php
diff --git a/...Stan/Analyser/data/assert-inheritance.php → ...Stan/Analyser/nsrt/assert-inheritance.php b/...Stan/Analyser/data/assert-inheritance.php → ...Stan/Analyser/nsrt/assert-inheritance.php
diff --git a/...Stan/Analyser/data/assert-intersected.php → ...Stan/Analyser/nsrt/assert-intersected.php b/...Stan/Analyser/data/assert-intersected.php → ...Stan/Analyser/nsrt/assert-intersected.php
diff --git a/...HPStan/Analyser/data/assert-invariant.php → ...HPStan/Analyser/nsrt/assert-invariant.php b/...HPStan/Analyser/data/assert-invariant.php → ...HPStan/Analyser/nsrt/assert-invariant.php
diff --git a/...s/PHPStan/Analyser/data/assert-method.php → ...s/PHPStan/Analyser/nsrt/assert-method.php b/...s/PHPStan/Analyser/data/assert-method.php → ...s/PHPStan/Analyser/nsrt/assert-method.php
diff --git a/.../PHPStan/Analyser/data/assert-methods.php → .../PHPStan/Analyser/nsrt/assert-methods.php b/.../PHPStan/Analyser/data/assert-methods.php → .../PHPStan/Analyser/nsrt/assert-methods.php
diff --git a/...PHPStan/Analyser/data/assert-property.php → ...PHPStan/Analyser/nsrt/assert-property.php b/...PHPStan/Analyser/data/assert-property.php → ...PHPStan/Analyser/nsrt/assert-property.php
diff --git a/tests/PHPStan/Analyser/data/assert-this.php → tests/PHPStan/Analyser/nsrt/assert-this.php b/tests/PHPStan/Analyser/data/assert-this.php → tests/PHPStan/Analyser/nsrt/assert-this.php
diff --git a/...an/Analyser/data/assign-nested-arrays.php → ...an/Analyser/nsrt/assign-nested-arrays.php b/...an/Analyser/data/assign-nested-arrays.php → ...an/Analyser/nsrt/assign-nested-arrays.php
diff --git a/...n/Analyser/data/asymmetric-properties.php → ...n/Analyser/nsrt/asymmetric-properties.php b/...n/Analyser/data/asymmetric-properties.php → ...n/Analyser/nsrt/asymmetric-properties.php
diff --git a/...s/PHPStan/Analyser/data/base64_decode.php → ...s/PHPStan/Analyser/nsrt/base64_decode.php b/...s/PHPStan/Analyser/data/base64_decode.php → ...s/PHPStan/Analyser/nsrt/base64_decode.php
diff --git a/...lyser/data/bcmath-dynamic-return-php8.php → ...lyser/nsrt/bcmath-dynamic-return-php8.php b/...lyser/data/bcmath-dynamic-return-php8.php → ...lyser/nsrt/bcmath-dynamic-return-php8.php
diff --git a/...n/Analyser/data/benevolent-union-math.php → ...n/Analyser/nsrt/benevolent-union-math.php b/...n/Analyser/data/benevolent-union-math.php → ...n/Analyser/nsrt/benevolent-union-math.php
diff --git a/tests/PHPStan/Analyser/data/bitwise-not.php → tests/PHPStan/Analyser/nsrt/bitwise-not.php b/tests/PHPStan/Analyser/data/bitwise-not.php → tests/PHPStan/Analyser/nsrt/bitwise-not.php
diff --git a/tests/PHPStan/Analyser/data/bug-10002.php → tests/PHPStan/Analyser/nsrt/bug-10002.php b/tests/PHPStan/Analyser/data/bug-10002.php → tests/PHPStan/Analyser/nsrt/bug-10002.php
diff --git a/tests/PHPStan/Analyser/data/bug-10037.php → tests/PHPStan/Analyser/nsrt/bug-10037.php b/tests/PHPStan/Analyser/data/bug-10037.php → tests/PHPStan/Analyser/nsrt/bug-10037.php
diff --git a/tests/PHPStan/Analyser/data/bug-10071.php → tests/PHPStan/Analyser/nsrt/bug-10071.php b/tests/PHPStan/Analyser/data/bug-10071.php → tests/PHPStan/Analyser/nsrt/bug-10071.php
diff --git a/tests/PHPStan/Analyser/data/bug-10080.php → tests/PHPStan/Analyser/nsrt/bug-10080.php b/tests/PHPStan/Analyser/data/bug-10080.php → tests/PHPStan/Analyser/nsrt/bug-10080.php
diff --git a/tests/PHPStan/Analyser/data/bug-10084.php → tests/PHPStan/Analyser/nsrt/bug-10084.php b/tests/PHPStan/Analyser/data/bug-10084.php → tests/PHPStan/Analyser/nsrt/bug-10084.php
diff --git a/tests/PHPStan/Analyser/data/bug-10088.php → tests/PHPStan/Analyser/nsrt/bug-10088.php b/tests/PHPStan/Analyser/data/bug-10088.php → tests/PHPStan/Analyser/nsrt/bug-10088.php
diff --git a/tests/PHPStan/Analyser/data/bug-10092.php → tests/PHPStan/Analyser/nsrt/bug-10092.php b/tests/PHPStan/Analyser/data/bug-10092.php → tests/PHPStan/Analyser/nsrt/bug-10092.php
diff --git a/tests/PHPStan/Analyser/data/bug-10122.php → tests/PHPStan/Analyser/nsrt/bug-10122.php b/tests/PHPStan/Analyser/data/bug-10122.php → tests/PHPStan/Analyser/nsrt/bug-10122.php
diff --git a/tests/PHPStan/Analyser/data/bug-10131.php → tests/PHPStan/Analyser/nsrt/bug-10131.php b/tests/PHPStan/Analyser/data/bug-10131.php → tests/PHPStan/Analyser/nsrt/bug-10131.php
diff --git a/tests/PHPStan/Analyser/data/bug-1014.php → tests/PHPStan/Analyser/nsrt/bug-1014.php b/tests/PHPStan/Analyser/data/bug-1014.php → tests/PHPStan/Analyser/nsrt/bug-1014.php
diff --git a/tests/PHPStan/Analyser/data/bug-10187.php → tests/PHPStan/Analyser/nsrt/bug-10187.php b/tests/PHPStan/Analyser/data/bug-10187.php → tests/PHPStan/Analyser/nsrt/bug-10187.php
diff --git a/tests/PHPStan/Analyser/data/bug-10189.php → tests/PHPStan/Analyser/nsrt/bug-10189.php b/tests/PHPStan/Analyser/data/bug-10189.php → tests/PHPStan/Analyser/nsrt/bug-10189.php
diff --git a/tests/PHPStan/Analyser/data/bug-10201.php → tests/PHPStan/Analyser/nsrt/bug-10201.php b/tests/PHPStan/Analyser/data/bug-10201.php → tests/PHPStan/Analyser/nsrt/bug-10201.php
diff --git a/tests/PHPStan/Analyser/data/bug-1021.php → tests/PHPStan/Analyser/nsrt/bug-1021.php b/tests/PHPStan/Analyser/data/bug-1021.php → tests/PHPStan/Analyser/nsrt/bug-1021.php
diff --git a/tests/PHPStan/Analyser/data/bug-10224.php → tests/PHPStan/Analyser/nsrt/bug-10224.php b/tests/PHPStan/Analyser/data/bug-10224.php → tests/PHPStan/Analyser/nsrt/bug-10224.php
diff --git a/tests/PHPStan/Analyser/data/bug-10254.php → tests/PHPStan/Analyser/nsrt/bug-10254.php b/tests/PHPStan/Analyser/data/bug-10254.php → tests/PHPStan/Analyser/nsrt/bug-10254.php
diff --git a/tests/PHPStan/Analyser/data/bug-10264.php → tests/PHPStan/Analyser/nsrt/bug-10264.php b/tests/PHPStan/Analyser/data/bug-10264.php → tests/PHPStan/Analyser/nsrt/bug-10264.php
diff --git a/tests/PHPStan/Analyser/data/bug-10283.php → tests/PHPStan/Analyser/nsrt/bug-10283.php b/tests/PHPStan/Analyser/data/bug-10283.php → tests/PHPStan/Analyser/nsrt/bug-10283.php
diff --git a/...yser/data/bug-10302-interface-extends.php → ...yser/nsrt/bug-10302-interface-extends.php b/...yser/data/bug-10302-interface-extends.php → ...yser/nsrt/bug-10302-interface-extends.php
diff --git a/...Analyser/data/bug-10302-trait-extends.php → ...Analyser/nsrt/bug-10302-trait-extends.php b/...Analyser/data/bug-10302-trait-extends.php → ...Analyser/nsrt/bug-10302-trait-extends.php
diff --git a/...lyser/data/bug-10302-trait-implements.php → ...lyser/nsrt/bug-10302-trait-implements.php b/...lyser/data/bug-10302-trait-implements.php → ...lyser/nsrt/bug-10302-trait-implements.php
diff --git a/tests/PHPStan/Analyser/data/bug-10317.php → tests/PHPStan/Analyser/nsrt/bug-10317.php b/tests/PHPStan/Analyser/data/bug-10317.php → tests/PHPStan/Analyser/nsrt/bug-10317.php
diff --git a/tests/PHPStan/Analyser/data/bug-10327.php → tests/PHPStan/Analyser/nsrt/bug-10327.php b/tests/PHPStan/Analyser/data/bug-10327.php → tests/PHPStan/Analyser/nsrt/bug-10327.php
diff --git a/tests/PHPStan/Analyser/data/bug-10373.php → tests/PHPStan/Analyser/nsrt/bug-10373.php b/tests/PHPStan/Analyser/data/bug-10373.php → tests/PHPStan/Analyser/nsrt/bug-10373.php
diff --git a/tests/PHPStan/Analyser/data/bug-10442.php → tests/PHPStan/Analyser/nsrt/bug-10442.php b/tests/PHPStan/Analyser/data/bug-10442.php → tests/PHPStan/Analyser/nsrt/bug-10442.php
diff --git a/tests/PHPStan/Analyser/data/bug-10445.php → tests/PHPStan/Analyser/nsrt/bug-10445.php b/tests/PHPStan/Analyser/data/bug-10445.php → tests/PHPStan/Analyser/nsrt/bug-10445.php
diff --git a/tests/PHPStan/Analyser/data/bug-10468.php → tests/PHPStan/Analyser/nsrt/bug-10468.php b/tests/PHPStan/Analyser/data/bug-10468.php → tests/PHPStan/Analyser/nsrt/bug-10468.php
diff --git a/tests/PHPStan/Analyser/data/bug-10473.php → tests/PHPStan/Analyser/nsrt/bug-10473.php b/tests/PHPStan/Analyser/data/bug-10473.php → tests/PHPStan/Analyser/nsrt/bug-10473.php
diff --git a/tests/PHPStan/Analyser/data/bug-10477.php → tests/PHPStan/Analyser/nsrt/bug-10477.php b/tests/PHPStan/Analyser/data/bug-10477.php → tests/PHPStan/Analyser/nsrt/bug-10477.php
diff --git a/tests/PHPStan/Analyser/data/bug-10566.php → tests/PHPStan/Analyser/nsrt/bug-10566.php b/tests/PHPStan/Analyser/data/bug-10566.php → tests/PHPStan/Analyser/nsrt/bug-10566.php
diff --git a/tests/PHPStan/Analyser/data/bug-10627.php → tests/PHPStan/Analyser/nsrt/bug-10627.php b/tests/PHPStan/Analyser/data/bug-10627.php → tests/PHPStan/Analyser/nsrt/bug-10627.php
diff --git a/tests/PHPStan/Analyser/data/bug-10699.php → tests/PHPStan/Analyser/nsrt/bug-10699.php b/tests/PHPStan/Analyser/data/bug-10699.php → tests/PHPStan/Analyser/nsrt/bug-10699.php
diff --git a/tests/PHPStan/Analyser/data/bug-10721.php → tests/PHPStan/Analyser/nsrt/bug-10721.php b/tests/PHPStan/Analyser/data/bug-10721.php → tests/PHPStan/Analyser/nsrt/bug-10721.php
diff --git a/tests/PHPStan/Analyser/data/bug-10834.php → tests/PHPStan/Analyser/nsrt/bug-10834.php b/tests/PHPStan/Analyser/data/bug-10834.php → tests/PHPStan/Analyser/nsrt/bug-10834.php
diff --git a/tests/PHPStan/Analyser/data/bug-10863.php → tests/PHPStan/Analyser/nsrt/bug-10863.php b/tests/PHPStan/Analyser/data/bug-10863.php → tests/PHPStan/Analyser/nsrt/bug-10863.php
diff --git a/tests/PHPStan/Analyser/data/bug-10893.php → tests/PHPStan/Analyser/nsrt/bug-10893.php b/tests/PHPStan/Analyser/data/bug-10893.php → tests/PHPStan/Analyser/nsrt/bug-10893.php
diff --git a/tests/PHPStan/Analyser/data/bug-10952.php → tests/PHPStan/Analyser/nsrt/bug-10952.php b/tests/PHPStan/Analyser/data/bug-10952.php → tests/PHPStan/Analyser/nsrt/bug-10952.php
diff --git a/tests/PHPStan/Analyser/data/bug-10952b.php → tests/PHPStan/Analyser/nsrt/bug-10952b.php b/tests/PHPStan/Analyser/data/bug-10952b.php → tests/PHPStan/Analyser/nsrt/bug-10952b.php
diff --git a/tests/PHPStan/Analyser/data/bug-11035.php → tests/PHPStan/Analyser/nsrt/bug-11035.php b/tests/PHPStan/Analyser/data/bug-11035.php → tests/PHPStan/Analyser/nsrt/bug-11035.php
diff --git a/tests/PHPStan/Analyser/data/bug-11129.php → tests/PHPStan/Analyser/nsrt/bug-11129.php b/tests/PHPStan/Analyser/data/bug-11129.php → tests/PHPStan/Analyser/nsrt/bug-11129.php
diff --git a/tests/PHPStan/Analyser/data/bug-1157.php → tests/PHPStan/Analyser/nsrt/bug-1157.php b/tests/PHPStan/Analyser/data/bug-1157.php → tests/PHPStan/Analyser/nsrt/bug-1157.php
diff --git a/tests/PHPStan/Analyser/data/bug-1209.php → tests/PHPStan/Analyser/nsrt/bug-1209.php b/tests/PHPStan/Analyser/data/bug-1209.php → tests/PHPStan/Analyser/nsrt/bug-1209.php
diff --git a/tests/PHPStan/Analyser/data/bug-1216.php → tests/PHPStan/Analyser/nsrt/bug-1216.php b/tests/PHPStan/Analyser/data/bug-1216.php → tests/PHPStan/Analyser/nsrt/bug-1216.php
diff --git a/tests/PHPStan/Analyser/data/bug-1219.php → tests/PHPStan/Analyser/nsrt/bug-1219.php b/tests/PHPStan/Analyser/data/bug-1219.php → tests/PHPStan/Analyser/nsrt/bug-1219.php
diff --git a/tests/PHPStan/Analyser/data/bug-1233.php → tests/PHPStan/Analyser/nsrt/bug-1233.php b/tests/PHPStan/Analyser/data/bug-1233.php → tests/PHPStan/Analyser/nsrt/bug-1233.php
diff --git a/tests/PHPStan/Analyser/data/bug-1283.php → tests/PHPStan/Analyser/nsrt/bug-1283.php b/tests/PHPStan/Analyser/data/bug-1283.php → tests/PHPStan/Analyser/nsrt/bug-1283.php
diff --git a/tests/PHPStan/Analyser/data/bug-1511.php → tests/PHPStan/Analyser/nsrt/bug-1511.php b/tests/PHPStan/Analyser/data/bug-1511.php → tests/PHPStan/Analyser/nsrt/bug-1511.php
diff --git a/tests/PHPStan/Analyser/data/bug-1516.php → tests/PHPStan/Analyser/nsrt/bug-1516.php b/tests/PHPStan/Analyser/data/bug-1516.php → tests/PHPStan/Analyser/nsrt/bug-1516.php
diff --git a/tests/PHPStan/Analyser/data/bug-1519.php → tests/PHPStan/Analyser/nsrt/bug-1519.php b/tests/PHPStan/Analyser/data/bug-1519.php → tests/PHPStan/Analyser/nsrt/bug-1519.php
diff --git a/tests/PHPStan/Analyser/data/bug-1597.php → tests/PHPStan/Analyser/nsrt/bug-1597.php b/tests/PHPStan/Analyser/data/bug-1597.php → tests/PHPStan/Analyser/nsrt/bug-1597.php
diff --git a/tests/PHPStan/Analyser/data/bug-1657.php → tests/PHPStan/Analyser/nsrt/bug-1657.php b/tests/PHPStan/Analyser/data/bug-1657.php → tests/PHPStan/Analyser/nsrt/bug-1657.php
diff --git a/tests/PHPStan/Analyser/data/bug-1670.php → tests/PHPStan/Analyser/nsrt/bug-1670.php b/tests/PHPStan/Analyser/data/bug-1670.php → tests/PHPStan/Analyser/nsrt/bug-1670.php
diff --git a/tests/PHPStan/Analyser/data/bug-1801.php → tests/PHPStan/Analyser/nsrt/bug-1801.php b/tests/PHPStan/Analyser/data/bug-1801.php → tests/PHPStan/Analyser/nsrt/bug-1801.php
diff --git a/tests/PHPStan/Analyser/data/bug-1861.php → tests/PHPStan/Analyser/nsrt/bug-1861.php b/tests/PHPStan/Analyser/data/bug-1861.php → tests/PHPStan/Analyser/nsrt/bug-1861.php
diff --git a/tests/PHPStan/Analyser/data/bug-1865.php → tests/PHPStan/Analyser/nsrt/bug-1865.php b/tests/PHPStan/Analyser/data/bug-1865.php → tests/PHPStan/Analyser/nsrt/bug-1865.php
diff --git a/tests/PHPStan/Analyser/data/bug-1870.php → tests/PHPStan/Analyser/nsrt/bug-1870.php b/tests/PHPStan/Analyser/data/bug-1870.php → tests/PHPStan/Analyser/nsrt/bug-1870.php
diff --git a/tests/PHPStan/Analyser/data/bug-1897.php → tests/PHPStan/Analyser/nsrt/bug-1897.php b/tests/PHPStan/Analyser/data/bug-1897.php → tests/PHPStan/Analyser/nsrt/bug-1897.php
diff --git a/tests/PHPStan/Analyser/data/bug-1924.php → tests/PHPStan/Analyser/nsrt/bug-1924.php b/tests/PHPStan/Analyser/data/bug-1924.php → tests/PHPStan/Analyser/nsrt/bug-1924.php
diff --git a/tests/PHPStan/Analyser/data/bug-1945.php → tests/PHPStan/Analyser/nsrt/bug-1945.php b/tests/PHPStan/Analyser/data/bug-1945.php → tests/PHPStan/Analyser/nsrt/bug-1945.php
diff --git a/tests/PHPStan/Analyser/data/bug-2001.php → tests/PHPStan/Analyser/nsrt/bug-2001.php b/tests/PHPStan/Analyser/data/bug-2001.php → tests/PHPStan/Analyser/nsrt/bug-2001.php
diff --git a/tests/PHPStan/Analyser/data/bug-2003.php → tests/PHPStan/Analyser/nsrt/bug-2003.php b/tests/PHPStan/Analyser/data/bug-2003.php → tests/PHPStan/Analyser/nsrt/bug-2003.php
diff --git a/tests/PHPStan/Analyser/data/bug-2112.php → tests/PHPStan/Analyser/nsrt/bug-2112.php b/tests/PHPStan/Analyser/data/bug-2112.php → tests/PHPStan/Analyser/nsrt/bug-2112.php
diff --git a/tests/PHPStan/Analyser/data/bug-2142.php → tests/PHPStan/Analyser/nsrt/bug-2142.php b/tests/PHPStan/Analyser/data/bug-2142.php → tests/PHPStan/Analyser/nsrt/bug-2142.php
diff --git a/tests/PHPStan/Analyser/data/bug-2231.php → tests/PHPStan/Analyser/nsrt/bug-2231.php b/tests/PHPStan/Analyser/data/bug-2231.php → tests/PHPStan/Analyser/nsrt/bug-2231.php
diff --git a/tests/PHPStan/Analyser/data/bug-2232.php → tests/PHPStan/Analyser/nsrt/bug-2232.php b/tests/PHPStan/Analyser/data/bug-2232.php → tests/PHPStan/Analyser/nsrt/bug-2232.php
diff --git a/tests/PHPStan/Analyser/data/bug-2288.php → tests/PHPStan/Analyser/nsrt/bug-2288.php b/tests/PHPStan/Analyser/data/bug-2288.php → tests/PHPStan/Analyser/nsrt/bug-2288.php
diff --git a/tests/PHPStan/Analyser/data/bug-2378.php → tests/PHPStan/Analyser/nsrt/bug-2378.php b/tests/PHPStan/Analyser/data/bug-2378.php → tests/PHPStan/Analyser/nsrt/bug-2378.php
diff --git a/tests/PHPStan/Analyser/data/bug-2413.php → tests/PHPStan/Analyser/nsrt/bug-2413.php b/tests/PHPStan/Analyser/data/bug-2413.php → tests/PHPStan/Analyser/nsrt/bug-2413.php
diff --git a/tests/PHPStan/Analyser/data/bug-2420.php → tests/PHPStan/Analyser/nsrt/bug-2420.php b/tests/PHPStan/Analyser/data/bug-2420.php → tests/PHPStan/Analyser/nsrt/bug-2420.php
diff --git a/tests/PHPStan/Analyser/data/bug-2443.php → tests/PHPStan/Analyser/nsrt/bug-2443.php b/tests/PHPStan/Analyser/data/bug-2443.php → tests/PHPStan/Analyser/nsrt/bug-2443.php
diff --git a/tests/PHPStan/Analyser/data/bug-2471.php → tests/PHPStan/Analyser/nsrt/bug-2471.php b/tests/PHPStan/Analyser/data/bug-2471.php → tests/PHPStan/Analyser/nsrt/bug-2471.php
diff --git a/tests/PHPStan/Analyser/data/bug-2539.php → tests/PHPStan/Analyser/nsrt/bug-2539.php b/tests/PHPStan/Analyser/data/bug-2539.php → tests/PHPStan/Analyser/nsrt/bug-2539.php
diff --git a/tests/PHPStan/Analyser/data/bug-2549.php → tests/PHPStan/Analyser/nsrt/bug-2549.php b/tests/PHPStan/Analyser/data/bug-2549.php → tests/PHPStan/Analyser/nsrt/bug-2549.php
diff --git a/tests/PHPStan/Analyser/data/bug-2580.php → tests/PHPStan/Analyser/nsrt/bug-2580.php b/tests/PHPStan/Analyser/data/bug-2580.php → tests/PHPStan/Analyser/nsrt/bug-2580.php
diff --git a/...s/PHPStan/Analyser/data/bug-2600-php8.php → ...s/PHPStan/Analyser/nsrt/bug-2600-php8.php b/...s/PHPStan/Analyser/data/bug-2600-php8.php → ...s/PHPStan/Analyser/nsrt/bug-2600-php8.php
diff --git a/tests/PHPStan/Analyser/data/bug-2611.php → tests/PHPStan/Analyser/nsrt/bug-2611.php b/tests/PHPStan/Analyser/data/bug-2611.php → tests/PHPStan/Analyser/nsrt/bug-2611.php
diff --git a/tests/PHPStan/Analyser/data/bug-2612.php → tests/PHPStan/Analyser/nsrt/bug-2612.php b/tests/PHPStan/Analyser/data/bug-2612.php → tests/PHPStan/Analyser/nsrt/bug-2612.php
diff --git a/tests/PHPStan/Analyser/data/bug-2640.php → tests/PHPStan/Analyser/nsrt/bug-2640.php b/tests/PHPStan/Analyser/data/bug-2640.php → tests/PHPStan/Analyser/nsrt/bug-2640.php
diff --git a/tests/PHPStan/Analyser/data/bug-2648.php → tests/PHPStan/Analyser/nsrt/bug-2648.php b/tests/PHPStan/Analyser/data/bug-2648.php → tests/PHPStan/Analyser/nsrt/bug-2648.php
diff --git a/tests/PHPStan/Analyser/data/bug-2676.php → tests/PHPStan/Analyser/nsrt/bug-2676.php b/tests/PHPStan/Analyser/data/bug-2676.php → tests/PHPStan/Analyser/nsrt/bug-2676.php
diff --git a/tests/PHPStan/Analyser/data/bug-2677.php → tests/PHPStan/Analyser/nsrt/bug-2677.php b/tests/PHPStan/Analyser/data/bug-2677.php → tests/PHPStan/Analyser/nsrt/bug-2677.php
diff --git a/tests/PHPStan/Analyser/data/bug-2718.php → tests/PHPStan/Analyser/nsrt/bug-2718.php b/tests/PHPStan/Analyser/data/bug-2718.php → tests/PHPStan/Analyser/nsrt/bug-2718.php
diff --git a/tests/PHPStan/Analyser/data/bug-2733.php → tests/PHPStan/Analyser/nsrt/bug-2733.php b/tests/PHPStan/Analyser/data/bug-2733.php → tests/PHPStan/Analyser/nsrt/bug-2733.php
diff --git a/tests/PHPStan/Analyser/data/bug-2740.php → tests/PHPStan/Analyser/nsrt/bug-2740.php b/tests/PHPStan/Analyser/data/bug-2740.php → tests/PHPStan/Analyser/nsrt/bug-2740.php
diff --git a/tests/PHPStan/Analyser/data/bug-2750.php → tests/PHPStan/Analyser/nsrt/bug-2750.php b/tests/PHPStan/Analyser/data/bug-2750.php → tests/PHPStan/Analyser/nsrt/bug-2750.php
diff --git a/tests/PHPStan/Analyser/data/bug-2760.php → tests/PHPStan/Analyser/nsrt/bug-2760.php b/tests/PHPStan/Analyser/data/bug-2760.php → tests/PHPStan/Analyser/nsrt/bug-2760.php
diff --git a/tests/PHPStan/Analyser/data/bug-2806.php → tests/PHPStan/Analyser/nsrt/bug-2806.php b/tests/PHPStan/Analyser/data/bug-2806.php → tests/PHPStan/Analyser/nsrt/bug-2806.php
diff --git a/tests/PHPStan/Analyser/data/bug-2816-2.php → tests/PHPStan/Analyser/nsrt/bug-2816-2.php b/tests/PHPStan/Analyser/data/bug-2816-2.php → tests/PHPStan/Analyser/nsrt/bug-2816-2.php
diff --git a/tests/PHPStan/Analyser/data/bug-2816.php → tests/PHPStan/Analyser/nsrt/bug-2816.php b/tests/PHPStan/Analyser/data/bug-2816.php → tests/PHPStan/Analyser/nsrt/bug-2816.php
diff --git a/tests/PHPStan/Analyser/data/bug-2822.php → tests/PHPStan/Analyser/nsrt/bug-2822.php b/tests/PHPStan/Analyser/data/bug-2822.php → tests/PHPStan/Analyser/nsrt/bug-2822.php
diff --git a/tests/PHPStan/Analyser/data/bug-2835.php → tests/PHPStan/Analyser/nsrt/bug-2835.php b/tests/PHPStan/Analyser/data/bug-2835.php → tests/PHPStan/Analyser/nsrt/bug-2835.php
diff --git a/tests/PHPStan/Analyser/data/bug-2850.php → tests/PHPStan/Analyser/nsrt/bug-2850.php b/tests/PHPStan/Analyser/data/bug-2850.php → tests/PHPStan/Analyser/nsrt/bug-2850.php
diff --git a/tests/PHPStan/Analyser/data/bug-2863.php → tests/PHPStan/Analyser/nsrt/bug-2863.php b/tests/PHPStan/Analyser/data/bug-2863.php → tests/PHPStan/Analyser/nsrt/bug-2863.php
diff --git a/tests/PHPStan/Analyser/data/bug-2869.php → tests/PHPStan/Analyser/nsrt/bug-2869.php b/tests/PHPStan/Analyser/data/bug-2869.php → tests/PHPStan/Analyser/nsrt/bug-2869.php
diff --git a/tests/PHPStan/Analyser/data/bug-2899.php → tests/PHPStan/Analyser/nsrt/bug-2899.php b/tests/PHPStan/Analyser/data/bug-2899.php → tests/PHPStan/Analyser/nsrt/bug-2899.php
diff --git a/tests/PHPStan/Analyser/data/bug-2906.php → tests/PHPStan/Analyser/nsrt/bug-2906.php b/tests/PHPStan/Analyser/data/bug-2906.php → tests/PHPStan/Analyser/nsrt/bug-2906.php
diff --git a/tests/PHPStan/Analyser/data/bug-2911.php → tests/PHPStan/Analyser/nsrt/bug-2911.php b/tests/PHPStan/Analyser/data/bug-2911.php → tests/PHPStan/Analyser/nsrt/bug-2911.php
diff --git a/tests/PHPStan/Analyser/data/bug-2927.php → tests/PHPStan/Analyser/nsrt/bug-2927.php b/tests/PHPStan/Analyser/data/bug-2927.php → tests/PHPStan/Analyser/nsrt/bug-2927.php
diff --git a/tests/PHPStan/Analyser/data/bug-2945.php → tests/PHPStan/Analyser/nsrt/bug-2945.php b/tests/PHPStan/Analyser/data/bug-2945.php → tests/PHPStan/Analyser/nsrt/bug-2945.php
diff --git a/tests/PHPStan/Analyser/data/bug-2969.php → tests/PHPStan/Analyser/nsrt/bug-2969.php b/tests/PHPStan/Analyser/data/bug-2969.php → tests/PHPStan/Analyser/nsrt/bug-2969.php
diff --git a/tests/PHPStan/Analyser/data/bug-2977.php → tests/PHPStan/Analyser/nsrt/bug-2977.php b/tests/PHPStan/Analyser/data/bug-2977.php → tests/PHPStan/Analyser/nsrt/bug-2977.php
diff --git a/tests/PHPStan/Analyser/data/bug-2980.php → tests/PHPStan/Analyser/nsrt/bug-2980.php b/tests/PHPStan/Analyser/data/bug-2980.php → tests/PHPStan/Analyser/nsrt/bug-2980.php
diff --git a/tests/PHPStan/Analyser/data/bug-2997.php → tests/PHPStan/Analyser/nsrt/bug-2997.php b/tests/PHPStan/Analyser/data/bug-2997.php → tests/PHPStan/Analyser/nsrt/bug-2997.php
diff --git a/tests/PHPStan/Analyser/data/bug-3004.php → tests/PHPStan/Analyser/nsrt/bug-3004.php b/tests/PHPStan/Analyser/data/bug-3004.php → tests/PHPStan/Analyser/nsrt/bug-3004.php
diff --git a/tests/PHPStan/Analyser/data/bug-3009.php → tests/PHPStan/Analyser/nsrt/bug-3009.php b/tests/PHPStan/Analyser/data/bug-3009.php → tests/PHPStan/Analyser/nsrt/bug-3009.php
diff --git a/tests/PHPStan/Analyser/data/bug-3013.php → tests/PHPStan/Analyser/nsrt/bug-3013.php b/tests/PHPStan/Analyser/data/bug-3013.php → tests/PHPStan/Analyser/nsrt/bug-3013.php
diff --git a/tests/PHPStan/Analyser/data/bug-3019.php → tests/PHPStan/Analyser/nsrt/bug-3019.php b/tests/PHPStan/Analyser/data/bug-3019.php → tests/PHPStan/Analyser/nsrt/bug-3019.php
diff --git a/tests/PHPStan/Analyser/data/bug-3024.php → tests/PHPStan/Analyser/nsrt/bug-3024.php b/tests/PHPStan/Analyser/data/bug-3024.php → tests/PHPStan/Analyser/nsrt/bug-3024.php
diff --git a/tests/PHPStan/Analyser/data/bug-3044.php → tests/PHPStan/Analyser/nsrt/bug-3044.php b/tests/PHPStan/Analyser/data/bug-3044.php → tests/PHPStan/Analyser/nsrt/bug-3044.php
diff --git a/tests/PHPStan/Analyser/data/bug-3106.php → tests/PHPStan/Analyser/nsrt/bug-3106.php b/tests/PHPStan/Analyser/data/bug-3106.php → tests/PHPStan/Analyser/nsrt/bug-3106.php
diff --git a/tests/PHPStan/Analyser/data/bug-3126.php → tests/PHPStan/Analyser/nsrt/bug-3126.php b/tests/PHPStan/Analyser/data/bug-3126.php → tests/PHPStan/Analyser/nsrt/bug-3126.php
diff --git a/tests/PHPStan/Analyser/data/bug-3132.php → tests/PHPStan/Analyser/nsrt/bug-3132.php b/tests/PHPStan/Analyser/data/bug-3132.php → tests/PHPStan/Analyser/nsrt/bug-3132.php
diff --git a/tests/PHPStan/Analyser/data/bug-3133.php → tests/PHPStan/Analyser/nsrt/bug-3133.php b/tests/PHPStan/Analyser/data/bug-3133.php → tests/PHPStan/Analyser/nsrt/bug-3133.php
diff --git a/tests/PHPStan/Analyser/data/bug-3134.php → tests/PHPStan/Analyser/nsrt/bug-3134.php b/tests/PHPStan/Analyser/data/bug-3134.php → tests/PHPStan/Analyser/nsrt/bug-3134.php
diff --git a/tests/PHPStan/Analyser/data/bug-3142.php → tests/PHPStan/Analyser/nsrt/bug-3142.php b/tests/PHPStan/Analyser/data/bug-3142.php → tests/PHPStan/Analyser/nsrt/bug-3142.php
diff --git a/tests/PHPStan/Analyser/data/bug-3158.php → tests/PHPStan/Analyser/nsrt/bug-3158.php b/tests/PHPStan/Analyser/data/bug-3158.php → tests/PHPStan/Analyser/nsrt/bug-3158.php
diff --git a/tests/PHPStan/Analyser/data/bug-3190.php → tests/PHPStan/Analyser/nsrt/bug-3190.php b/tests/PHPStan/Analyser/data/bug-3190.php → tests/PHPStan/Analyser/nsrt/bug-3190.php
diff --git a/tests/PHPStan/Analyser/data/bug-3226.php → tests/PHPStan/Analyser/nsrt/bug-3226.php b/tests/PHPStan/Analyser/data/bug-3226.php → tests/PHPStan/Analyser/nsrt/bug-3226.php
diff --git a/tests/PHPStan/Analyser/data/bug-3266.php → tests/PHPStan/Analyser/nsrt/bug-3266.php b/tests/PHPStan/Analyser/data/bug-3266.php → tests/PHPStan/Analyser/nsrt/bug-3266.php
diff --git a/tests/PHPStan/Analyser/data/bug-3269.php → tests/PHPStan/Analyser/nsrt/bug-3269.php b/tests/PHPStan/Analyser/data/bug-3269.php → tests/PHPStan/Analyser/nsrt/bug-3269.php
diff --git a/tests/PHPStan/Analyser/data/bug-3276.php → tests/PHPStan/Analyser/nsrt/bug-3276.php b/tests/PHPStan/Analyser/data/bug-3276.php → tests/PHPStan/Analyser/nsrt/bug-3276.php
diff --git a/tests/PHPStan/Analyser/data/bug-3302.php → tests/PHPStan/Analyser/nsrt/bug-3302.php b/tests/PHPStan/Analyser/data/bug-3302.php → tests/PHPStan/Analyser/nsrt/bug-3302.php
diff --git a/tests/PHPStan/Analyser/data/bug-3312.php → tests/PHPStan/Analyser/nsrt/bug-3312.php b/tests/PHPStan/Analyser/data/bug-3312.php → tests/PHPStan/Analyser/nsrt/bug-3312.php
diff --git a/tests/PHPStan/Analyser/data/bug-3321.php → tests/PHPStan/Analyser/nsrt/bug-3321.php b/tests/PHPStan/Analyser/data/bug-3321.php → tests/PHPStan/Analyser/nsrt/bug-3321.php
diff --git a/tests/PHPStan/Analyser/data/bug-3331.php → tests/PHPStan/Analyser/nsrt/bug-3331.php b/tests/PHPStan/Analyser/data/bug-3331.php → tests/PHPStan/Analyser/nsrt/bug-3331.php
diff --git a/tests/PHPStan/Analyser/data/bug-3351.php → tests/PHPStan/Analyser/nsrt/bug-3351.php b/tests/PHPStan/Analyser/data/bug-3351.php → tests/PHPStan/Analyser/nsrt/bug-3351.php
diff --git a/tests/PHPStan/Analyser/data/bug-3379.php → tests/PHPStan/Analyser/nsrt/bug-3379.php b/tests/PHPStan/Analyser/data/bug-3379.php → tests/PHPStan/Analyser/nsrt/bug-3379.php
diff --git a/tests/PHPStan/Analyser/data/bug-3382.php → tests/PHPStan/Analyser/nsrt/bug-3382.php b/tests/PHPStan/Analyser/data/bug-3382.php → tests/PHPStan/Analyser/nsrt/bug-3382.php
diff --git a/tests/PHPStan/Analyser/data/bug-3446.php → tests/PHPStan/Analyser/nsrt/bug-3446.php b/tests/PHPStan/Analyser/data/bug-3446.php → tests/PHPStan/Analyser/nsrt/bug-3446.php
diff --git a/tests/PHPStan/Analyser/data/bug-3548.php → tests/PHPStan/Analyser/nsrt/bug-3548.php b/tests/PHPStan/Analyser/data/bug-3548.php → tests/PHPStan/Analyser/nsrt/bug-3548.php
diff --git a/tests/PHPStan/Analyser/data/bug-3558.php → tests/PHPStan/Analyser/nsrt/bug-3558.php b/tests/PHPStan/Analyser/data/bug-3558.php → tests/PHPStan/Analyser/nsrt/bug-3558.php
diff --git a/tests/PHPStan/Analyser/data/bug-3617.php → tests/PHPStan/Analyser/nsrt/bug-3617.php b/tests/PHPStan/Analyser/data/bug-3617.php → tests/PHPStan/Analyser/nsrt/bug-3617.php
diff --git a/tests/PHPStan/Analyser/data/bug-3677.php → tests/PHPStan/Analyser/nsrt/bug-3677.php b/tests/PHPStan/Analyser/data/bug-3677.php → tests/PHPStan/Analyser/nsrt/bug-3677.php
diff --git a/tests/PHPStan/Analyser/data/bug-3710.php → tests/PHPStan/Analyser/nsrt/bug-3710.php b/tests/PHPStan/Analyser/data/bug-3710.php → tests/PHPStan/Analyser/nsrt/bug-3710.php
diff --git a/tests/PHPStan/Analyser/data/bug-3760.php → tests/PHPStan/Analyser/nsrt/bug-3760.php b/tests/PHPStan/Analyser/data/bug-3760.php → tests/PHPStan/Analyser/nsrt/bug-3760.php
diff --git a/tests/PHPStan/Analyser/data/bug-3789.php → tests/PHPStan/Analyser/nsrt/bug-3789.php b/tests/PHPStan/Analyser/data/bug-3789.php → tests/PHPStan/Analyser/nsrt/bug-3789.php
diff --git a/tests/PHPStan/Analyser/data/bug-3822.php → tests/PHPStan/Analyser/nsrt/bug-3822.php b/tests/PHPStan/Analyser/data/bug-3822.php → tests/PHPStan/Analyser/nsrt/bug-3822.php
diff --git a/tests/PHPStan/Analyser/data/bug-3853.php → tests/PHPStan/Analyser/nsrt/bug-3853.php b/tests/PHPStan/Analyser/data/bug-3853.php → tests/PHPStan/Analyser/nsrt/bug-3853.php
diff --git a/tests/PHPStan/Analyser/data/bug-3858.php → tests/PHPStan/Analyser/nsrt/bug-3858.php b/tests/PHPStan/Analyser/data/bug-3858.php → tests/PHPStan/Analyser/nsrt/bug-3858.php
diff --git a/tests/PHPStan/Analyser/data/bug-3866.php → tests/PHPStan/Analyser/nsrt/bug-3866.php b/tests/PHPStan/Analyser/data/bug-3866.php → tests/PHPStan/Analyser/nsrt/bug-3866.php
diff --git a/tests/PHPStan/Analyser/data/bug-3875.php → tests/PHPStan/Analyser/nsrt/bug-3875.php b/tests/PHPStan/Analyser/data/bug-3875.php → tests/PHPStan/Analyser/nsrt/bug-3875.php
diff --git a/tests/PHPStan/Analyser/data/bug-3880.php → tests/PHPStan/Analyser/nsrt/bug-3880.php b/tests/PHPStan/Analyser/data/bug-3880.php → tests/PHPStan/Analyser/nsrt/bug-3880.php
diff --git a/tests/PHPStan/Analyser/data/bug-3915.php → tests/PHPStan/Analyser/nsrt/bug-3915.php b/tests/PHPStan/Analyser/data/bug-3915.php → tests/PHPStan/Analyser/nsrt/bug-3915.php
diff --git a/tests/PHPStan/Analyser/data/bug-3922.php → tests/PHPStan/Analyser/nsrt/bug-3922.php b/tests/PHPStan/Analyser/data/bug-3922.php → tests/PHPStan/Analyser/nsrt/bug-3922.php
diff --git a/...s/PHPStan/Analyser/data/bug-3961-php8.php → ...s/PHPStan/Analyser/nsrt/bug-3961-php8.php b/...s/PHPStan/Analyser/data/bug-3961-php8.php → ...s/PHPStan/Analyser/nsrt/bug-3961-php8.php
diff --git a/tests/PHPStan/Analyser/data/bug-3981.php → tests/PHPStan/Analyser/nsrt/bug-3981.php b/tests/PHPStan/Analyser/data/bug-3981.php → tests/PHPStan/Analyser/nsrt/bug-3981.php
diff --git a/tests/PHPStan/Analyser/data/bug-3985.php → tests/PHPStan/Analyser/nsrt/bug-3985.php b/tests/PHPStan/Analyser/data/bug-3985.php → tests/PHPStan/Analyser/nsrt/bug-3985.php
diff --git a/tests/PHPStan/Analyser/data/bug-3986.php → tests/PHPStan/Analyser/nsrt/bug-3986.php b/tests/PHPStan/Analyser/data/bug-3986.php → tests/PHPStan/Analyser/nsrt/bug-3986.php
diff --git a/tests/PHPStan/Analyser/data/bug-3990.php → tests/PHPStan/Analyser/nsrt/bug-3990.php b/tests/PHPStan/Analyser/data/bug-3990.php → tests/PHPStan/Analyser/nsrt/bug-3990.php
diff --git a/tests/PHPStan/Analyser/data/bug-3991.php → tests/PHPStan/Analyser/nsrt/bug-3991.php b/tests/PHPStan/Analyser/data/bug-3991.php → tests/PHPStan/Analyser/nsrt/bug-3991.php
diff --git a/tests/PHPStan/Analyser/data/bug-3993.php → tests/PHPStan/Analyser/nsrt/bug-3993.php b/tests/PHPStan/Analyser/data/bug-3993.php → tests/PHPStan/Analyser/nsrt/bug-3993.php
diff --git a/tests/PHPStan/Analyser/data/bug-3997.php → tests/PHPStan/Analyser/nsrt/bug-3997.php b/tests/PHPStan/Analyser/data/bug-3997.php → tests/PHPStan/Analyser/nsrt/bug-3997.php
diff --git a/tests/PHPStan/Analyser/data/bug-4016.php → tests/PHPStan/Analyser/nsrt/bug-4016.php b/tests/PHPStan/Analyser/data/bug-4016.php → tests/PHPStan/Analyser/nsrt/bug-4016.php
diff --git a/tests/PHPStan/Analyser/data/bug-4091.php → tests/PHPStan/Analyser/nsrt/bug-4091.php b/tests/PHPStan/Analyser/data/bug-4091.php → tests/PHPStan/Analyser/nsrt/bug-4091.php
diff --git a/tests/PHPStan/Analyser/data/bug-4099.php → tests/PHPStan/Analyser/nsrt/bug-4099.php b/tests/PHPStan/Analyser/data/bug-4099.php → tests/PHPStan/Analyser/nsrt/bug-4099.php
diff --git a/tests/PHPStan/Analyser/data/bug-4117.php → tests/PHPStan/Analyser/nsrt/bug-4117.php b/tests/PHPStan/Analyser/data/bug-4117.php → tests/PHPStan/Analyser/nsrt/bug-4117.php
diff --git a/tests/PHPStan/Analyser/data/bug-4177.php → tests/PHPStan/Analyser/nsrt/bug-4177.php b/tests/PHPStan/Analyser/data/bug-4177.php → tests/PHPStan/Analyser/nsrt/bug-4177.php
diff --git a/tests/PHPStan/Analyser/data/bug-4188.php → tests/PHPStan/Analyser/nsrt/bug-4188.php b/tests/PHPStan/Analyser/data/bug-4188.php → tests/PHPStan/Analyser/nsrt/bug-4188.php
diff --git a/tests/PHPStan/Analyser/data/bug-4190.php → tests/PHPStan/Analyser/nsrt/bug-4190.php b/tests/PHPStan/Analyser/data/bug-4190.php → tests/PHPStan/Analyser/nsrt/bug-4190.php
diff --git a/tests/PHPStan/Analyser/data/bug-4205.php → tests/PHPStan/Analyser/nsrt/bug-4205.php b/tests/PHPStan/Analyser/data/bug-4205.php → tests/PHPStan/Analyser/nsrt/bug-4205.php
diff --git a/tests/PHPStan/Analyser/data/bug-4206.php → tests/PHPStan/Analyser/nsrt/bug-4206.php b/tests/PHPStan/Analyser/data/bug-4206.php → tests/PHPStan/Analyser/nsrt/bug-4206.php
diff --git a/tests/PHPStan/Analyser/data/bug-4207.php → tests/PHPStan/Analyser/nsrt/bug-4207.php b/tests/PHPStan/Analyser/data/bug-4207.php → tests/PHPStan/Analyser/nsrt/bug-4207.php
diff --git a/tests/PHPStan/Analyser/data/bug-4209-2.php → tests/PHPStan/Analyser/nsrt/bug-4209-2.php b/tests/PHPStan/Analyser/data/bug-4209-2.php → tests/PHPStan/Analyser/nsrt/bug-4209-2.php
diff --git a/tests/PHPStan/Analyser/data/bug-4209.php → tests/PHPStan/Analyser/nsrt/bug-4209.php b/tests/PHPStan/Analyser/data/bug-4209.php → tests/PHPStan/Analyser/nsrt/bug-4209.php
diff --git a/tests/PHPStan/Analyser/data/bug-4213.php → tests/PHPStan/Analyser/nsrt/bug-4213.php b/tests/PHPStan/Analyser/data/bug-4213.php → tests/PHPStan/Analyser/nsrt/bug-4213.php
diff --git a/tests/PHPStan/Analyser/data/bug-4215.php → tests/PHPStan/Analyser/nsrt/bug-4215.php b/tests/PHPStan/Analyser/data/bug-4215.php → tests/PHPStan/Analyser/nsrt/bug-4215.php
diff --git a/tests/PHPStan/Analyser/data/bug-4231.php → tests/PHPStan/Analyser/nsrt/bug-4231.php b/tests/PHPStan/Analyser/data/bug-4231.php → tests/PHPStan/Analyser/nsrt/bug-4231.php
diff --git a/tests/PHPStan/Analyser/data/bug-4247.php → tests/PHPStan/Analyser/nsrt/bug-4247.php b/tests/PHPStan/Analyser/data/bug-4247.php → tests/PHPStan/Analyser/nsrt/bug-4247.php
diff --git a/tests/PHPStan/Analyser/data/bug-4267.php → tests/PHPStan/Analyser/nsrt/bug-4267.php b/tests/PHPStan/Analyser/data/bug-4267.php → tests/PHPStan/Analyser/nsrt/bug-4267.php
diff --git a/tests/PHPStan/Analyser/data/bug-4287.php → tests/PHPStan/Analyser/nsrt/bug-4287.php b/tests/PHPStan/Analyser/data/bug-4287.php → tests/PHPStan/Analyser/nsrt/bug-4287.php
diff --git a/tests/PHPStan/Analyser/data/bug-4302b.php → tests/PHPStan/Analyser/nsrt/bug-4302b.php b/tests/PHPStan/Analyser/data/bug-4302b.php → tests/PHPStan/Analyser/nsrt/bug-4302b.php
diff --git a/tests/PHPStan/Analyser/data/bug-4326.php → tests/PHPStan/Analyser/nsrt/bug-4326.php b/tests/PHPStan/Analyser/data/bug-4326.php → tests/PHPStan/Analyser/nsrt/bug-4326.php
diff --git a/tests/PHPStan/Analyser/data/bug-4339.php → tests/PHPStan/Analyser/nsrt/bug-4339.php b/tests/PHPStan/Analyser/data/bug-4339.php → tests/PHPStan/Analyser/nsrt/bug-4339.php
diff --git a/tests/PHPStan/Analyser/data/bug-4343.php → tests/PHPStan/Analyser/nsrt/bug-4343.php b/tests/PHPStan/Analyser/data/bug-4343.php → tests/PHPStan/Analyser/nsrt/bug-4343.php
diff --git a/tests/PHPStan/Analyser/data/bug-4351.php → tests/PHPStan/Analyser/nsrt/bug-4351.php b/tests/PHPStan/Analyser/data/bug-4351.php → tests/PHPStan/Analyser/nsrt/bug-4351.php
diff --git a/tests/PHPStan/Analyser/data/bug-4357.php → tests/PHPStan/Analyser/nsrt/bug-4357.php b/tests/PHPStan/Analyser/data/bug-4357.php → tests/PHPStan/Analyser/nsrt/bug-4357.php
diff --git a/tests/PHPStan/Analyser/data/bug-4371.php → tests/PHPStan/Analyser/nsrt/bug-4371.php b/tests/PHPStan/Analyser/data/bug-4371.php → tests/PHPStan/Analyser/nsrt/bug-4371.php
diff --git a/tests/PHPStan/Analyser/data/bug-4398.php → tests/PHPStan/Analyser/nsrt/bug-4398.php b/tests/PHPStan/Analyser/data/bug-4398.php → tests/PHPStan/Analyser/nsrt/bug-4398.php
diff --git a/tests/PHPStan/Analyser/data/bug-4415.php → tests/PHPStan/Analyser/nsrt/bug-4415.php b/tests/PHPStan/Analyser/data/bug-4415.php → tests/PHPStan/Analyser/nsrt/bug-4415.php
diff --git a/tests/PHPStan/Analyser/data/bug-4423.php → tests/PHPStan/Analyser/nsrt/bug-4423.php b/tests/PHPStan/Analyser/data/bug-4423.php → tests/PHPStan/Analyser/nsrt/bug-4423.php
diff --git a/tests/PHPStan/Analyser/data/bug-4434.php → tests/PHPStan/Analyser/nsrt/bug-4434.php b/tests/PHPStan/Analyser/data/bug-4434.php → tests/PHPStan/Analyser/nsrt/bug-4434.php
diff --git a/tests/PHPStan/Analyser/data/bug-4436.php → tests/PHPStan/Analyser/nsrt/bug-4436.php b/tests/PHPStan/Analyser/data/bug-4436.php → tests/PHPStan/Analyser/nsrt/bug-4436.php
diff --git a/tests/PHPStan/Analyser/data/bug-4498.php → tests/PHPStan/Analyser/nsrt/bug-4498.php b/tests/PHPStan/Analyser/data/bug-4498.php → tests/PHPStan/Analyser/nsrt/bug-4498.php
diff --git a/tests/PHPStan/Analyser/data/bug-4499.php → tests/PHPStan/Analyser/nsrt/bug-4499.php b/tests/PHPStan/Analyser/data/bug-4499.php → tests/PHPStan/Analyser/nsrt/bug-4499.php
diff --git a/tests/PHPStan/Analyser/data/bug-4500.php → tests/PHPStan/Analyser/nsrt/bug-4500.php b/tests/PHPStan/Analyser/data/bug-4500.php → tests/PHPStan/Analyser/nsrt/bug-4500.php
diff --git a/tests/PHPStan/Analyser/data/bug-4504.php → tests/PHPStan/Analyser/nsrt/bug-4504.php b/tests/PHPStan/Analyser/data/bug-4504.php → tests/PHPStan/Analyser/nsrt/bug-4504.php
diff --git a/tests/PHPStan/Analyser/data/bug-4538.php → tests/PHPStan/Analyser/nsrt/bug-4538.php b/tests/PHPStan/Analyser/data/bug-4538.php → tests/PHPStan/Analyser/nsrt/bug-4538.php
diff --git a/tests/PHPStan/Analyser/data/bug-4545.php → tests/PHPStan/Analyser/nsrt/bug-4545.php b/tests/PHPStan/Analyser/data/bug-4545.php → tests/PHPStan/Analyser/nsrt/bug-4545.php
diff --git a/tests/PHPStan/Analyser/data/bug-4557.php → tests/PHPStan/Analyser/nsrt/bug-4557.php b/tests/PHPStan/Analyser/data/bug-4557.php → tests/PHPStan/Analyser/nsrt/bug-4557.php
diff --git a/tests/PHPStan/Analyser/data/bug-4558.php → tests/PHPStan/Analyser/nsrt/bug-4558.php b/tests/PHPStan/Analyser/data/bug-4558.php → tests/PHPStan/Analyser/nsrt/bug-4558.php
diff --git a/tests/PHPStan/Analyser/data/bug-4565.php → tests/PHPStan/Analyser/nsrt/bug-4565.php b/tests/PHPStan/Analyser/data/bug-4565.php → tests/PHPStan/Analyser/nsrt/bug-4565.php
diff --git a/tests/PHPStan/Analyser/data/bug-4573.php → tests/PHPStan/Analyser/nsrt/bug-4573.php b/tests/PHPStan/Analyser/data/bug-4573.php → tests/PHPStan/Analyser/nsrt/bug-4573.php
diff --git a/tests/PHPStan/Analyser/data/bug-4577.php → tests/PHPStan/Analyser/nsrt/bug-4577.php b/tests/PHPStan/Analyser/data/bug-4577.php → tests/PHPStan/Analyser/nsrt/bug-4577.php
diff --git a/tests/PHPStan/Analyser/data/bug-4579.php → tests/PHPStan/Analyser/nsrt/bug-4579.php b/tests/PHPStan/Analyser/data/bug-4579.php → tests/PHPStan/Analyser/nsrt/bug-4579.php
diff --git a/tests/PHPStan/Analyser/data/bug-4586.php → tests/PHPStan/Analyser/nsrt/bug-4586.php b/tests/PHPStan/Analyser/data/bug-4586.php → tests/PHPStan/Analyser/nsrt/bug-4586.php
diff --git a/tests/PHPStan/Analyser/data/bug-4587.php → tests/PHPStan/Analyser/nsrt/bug-4587.php b/tests/PHPStan/Analyser/data/bug-4587.php → tests/PHPStan/Analyser/nsrt/bug-4587.php
diff --git a/tests/PHPStan/Analyser/data/bug-4588.php → tests/PHPStan/Analyser/nsrt/bug-4588.php b/tests/PHPStan/Analyser/data/bug-4588.php → tests/PHPStan/Analyser/nsrt/bug-4588.php
diff --git a/tests/PHPStan/Analyser/data/bug-4592.php → tests/PHPStan/Analyser/nsrt/bug-4592.php b/tests/PHPStan/Analyser/data/bug-4592.php → tests/PHPStan/Analyser/nsrt/bug-4592.php
diff --git a/tests/PHPStan/Analyser/data/bug-4602.php → tests/PHPStan/Analyser/nsrt/bug-4602.php b/tests/PHPStan/Analyser/data/bug-4602.php → tests/PHPStan/Analyser/nsrt/bug-4602.php
diff --git a/tests/PHPStan/Analyser/data/bug-4606.php → tests/PHPStan/Analyser/nsrt/bug-4606.php b/tests/PHPStan/Analyser/data/bug-4606.php → tests/PHPStan/Analyser/nsrt/bug-4606.php
diff --git a/tests/PHPStan/Analyser/data/bug-4642.php → tests/PHPStan/Analyser/nsrt/bug-4642.php b/tests/PHPStan/Analyser/data/bug-4642.php → tests/PHPStan/Analyser/nsrt/bug-4642.php
diff --git a/tests/PHPStan/Analyser/data/bug-4650.php → tests/PHPStan/Analyser/nsrt/bug-4650.php b/tests/PHPStan/Analyser/data/bug-4650.php → tests/PHPStan/Analyser/nsrt/bug-4650.php
diff --git a/tests/PHPStan/Analyser/data/bug-4657.php → tests/PHPStan/Analyser/nsrt/bug-4657.php b/tests/PHPStan/Analyser/data/bug-4657.php → tests/PHPStan/Analyser/nsrt/bug-4657.php
diff --git a/tests/PHPStan/Analyser/data/bug-4695.php → tests/PHPStan/Analyser/nsrt/bug-4695.php b/tests/PHPStan/Analyser/data/bug-4695.php → tests/PHPStan/Analyser/nsrt/bug-4695.php
diff --git a/tests/PHPStan/Analyser/data/bug-4700.php → tests/PHPStan/Analyser/nsrt/bug-4700.php b/tests/PHPStan/Analyser/data/bug-4700.php → tests/PHPStan/Analyser/nsrt/bug-4700.php
diff --git a/tests/PHPStan/Analyser/data/bug-4707.php → tests/PHPStan/Analyser/nsrt/bug-4707.php b/tests/PHPStan/Analyser/data/bug-4707.php → tests/PHPStan/Analyser/nsrt/bug-4707.php
diff --git a/tests/PHPStan/Analyser/data/bug-4708.php → tests/PHPStan/Analyser/nsrt/bug-4708.php b/tests/PHPStan/Analyser/data/bug-4708.php → tests/PHPStan/Analyser/nsrt/bug-4708.php
diff --git a/tests/PHPStan/Analyser/data/bug-4711.php → tests/PHPStan/Analyser/nsrt/bug-4711.php b/tests/PHPStan/Analyser/data/bug-4711.php → tests/PHPStan/Analyser/nsrt/bug-4711.php
diff --git a/tests/PHPStan/Analyser/data/bug-4714.php → tests/PHPStan/Analyser/nsrt/bug-4714.php b/tests/PHPStan/Analyser/data/bug-4714.php → tests/PHPStan/Analyser/nsrt/bug-4714.php
diff --git a/tests/PHPStan/Analyser/data/bug-4725.php → tests/PHPStan/Analyser/nsrt/bug-4725.php b/tests/PHPStan/Analyser/data/bug-4725.php → tests/PHPStan/Analyser/nsrt/bug-4725.php
diff --git a/tests/PHPStan/Analyser/data/bug-4733.php → tests/PHPStan/Analyser/nsrt/bug-4733.php b/tests/PHPStan/Analyser/data/bug-4733.php → tests/PHPStan/Analyser/nsrt/bug-4733.php
diff --git a/tests/PHPStan/Analyser/data/bug-4741.php → tests/PHPStan/Analyser/nsrt/bug-4741.php b/tests/PHPStan/Analyser/data/bug-4741.php → tests/PHPStan/Analyser/nsrt/bug-4741.php
diff --git a/tests/PHPStan/Analyser/data/bug-4743.php → tests/PHPStan/Analyser/nsrt/bug-4743.php b/tests/PHPStan/Analyser/data/bug-4743.php → tests/PHPStan/Analyser/nsrt/bug-4743.php
diff --git a/tests/PHPStan/Analyser/data/bug-4754.php → tests/PHPStan/Analyser/nsrt/bug-4754.php b/tests/PHPStan/Analyser/data/bug-4754.php → tests/PHPStan/Analyser/nsrt/bug-4754.php
diff --git a/tests/PHPStan/Analyser/data/bug-4757.php → tests/PHPStan/Analyser/nsrt/bug-4757.php b/tests/PHPStan/Analyser/data/bug-4757.php → tests/PHPStan/Analyser/nsrt/bug-4757.php
diff --git a/tests/PHPStan/Analyser/data/bug-4761.php → tests/PHPStan/Analyser/nsrt/bug-4761.php b/tests/PHPStan/Analyser/data/bug-4761.php → tests/PHPStan/Analyser/nsrt/bug-4761.php
diff --git a/tests/PHPStan/Analyser/data/bug-4803.php → tests/PHPStan/Analyser/nsrt/bug-4803.php b/tests/PHPStan/Analyser/data/bug-4803.php → tests/PHPStan/Analyser/nsrt/bug-4803.php
diff --git a/tests/PHPStan/Analyser/data/bug-4814.php → tests/PHPStan/Analyser/nsrt/bug-4814.php b/tests/PHPStan/Analyser/data/bug-4814.php → tests/PHPStan/Analyser/nsrt/bug-4814.php