fixup! use bitwiseFlagAnalyser

TomasVotruba · ondrejmirtes · commit 99debb9d9c6c · 2022-05-03T17:56:35.000+02:00
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -8703,27 +8703,19 @@ public function dataPhp73Functions(): array
 				'json_decode($mixed)',
 			],
 			[
-<<<<<<< HEAD
-<<<<<<< HEAD
 				'mixed',
 				'json_decode($mixed, false, 512, JSON_THROW_ON_ERROR | JSON_NUMERIC_CHECK)',
 			],
 			[
-				'mixed',
-=======
 				'float|int|stdClass|string|true',
 				'json_decode($mixed, false, 512, JSON_THROW_ON_ERROR | JSON_NUMERIC_CHECK)',
 			],
 			[
 				'float|int|stdClass|string|true',
->>>>>>> update type in LegacyNodeScopeResolverTest
-=======
-				'mixed~false',
 				'json_decode($mixed, false, 512, JSON_THROW_ON_ERROR | JSON_NUMERIC_CHECK)',
 			],
 			[
 				'mixed~false',
->>>>>>> return mixed type
 				'json_decode($mixed, false, 512, $integer | JSON_THROW_ON_ERROR | JSON_NUMERIC_CHECK)',
 			],
 			[

Original file line number	Diff line number	Diff line change
`@@ -8703,27 +8703,19 @@ public function dataPhp73Functions(): array`
`8703`	`8703`	`'json_decode($mixed)',`
`8704`	`8704`	`],`
`8705`	`8705`	`[`
`8706`		`-<<<<<<< HEAD`
`8707`		`-<<<<<<< HEAD`
`8708`	`8706`	`'mixed',`
`8709`	`8707`	`'json_decode($mixed, false, 512, JSON_THROW_ON_ERROR \| JSON_NUMERIC_CHECK)',`
`8710`	`8708`	`],`
`8711`	`8709`	`[`
`8712`		`- 'mixed',`
`8713`		`-=======`
`8714`	`8710`	`'float\|int\|stdClass\|string\|true',`
`8715`	`8711`	`'json_decode($mixed, false, 512, JSON_THROW_ON_ERROR \| JSON_NUMERIC_CHECK)',`
`8716`	`8712`	`],`
`8717`	`8713`	`[`
`8718`	`8714`	`'float\|int\|stdClass\|string\|true',`
`8719`		`->>>>>>> update type in LegacyNodeScopeResolverTest`
`8720`		`-=======`
`8721`		`- 'mixed~false',`
`8722`	`8715`	`'json_decode($mixed, false, 512, JSON_THROW_ON_ERROR \| JSON_NUMERIC_CHECK)',`
`8723`	`8716`	`],`
`8724`	`8717`	`[`
`8725`	`8718`	`'mixed~false',`
`8726`		`->>>>>>> return mixed type`
`8727`	`8719`	`'json_decode($mixed, false, 512, $integer \| JSON_THROW_ON_ERROR \| JSON_NUMERIC_CHECK)',`
`8728`	`8720`	`],`
`8729`	`8721`	`[`