Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 2974ce76395a · 2024-01-10T11:44:32.000+01:00
* 7.0:
  fix merge
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/HtmlErrorRendererTest.php
@@ -55,7 +55,6 @@ public static function getRenderData(): iterable
         ];
     }
 
-<<<<<<< HEAD
     /**
      * @dataProvider provideFileLinkFormats
      */
@@ -97,7 +96,8 @@ public static function provideFileLinkFormats(): iterable
             false,
             'href="phpstorm://open?file='.__DIR__,
         ];
-=======
+    }
+
     public function testRendersStackWithoutBinaryStrings()
     {
         // make sure method arguments are available in stack traces (see https://www.php.net/manual/en/ini.core.php)
@@ -135,6 +135,5 @@ private function getRuntimeException(string $unusedArgument): \RuntimeException
     private function buildRuntimeException(string $message): \RuntimeException
     {
         return new \RuntimeException($message);
->>>>>>> 6.3
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ public static function getRenderData(): iterable`
`55`	`55`	`];`
`56`	`56`	`}`
`57`	`57`
`58`		`-<<<<<<< HEAD`
`59`	`58`	`/**`
`60`	`59`	`* @dataProvider provideFileLinkFormats`
`61`	`60`	`*/`
`@@ -97,7 +96,8 @@ public static function provideFileLinkFormats(): iterable`
`97`	`96`	`false,`
`98`	`97`	`'href="phpstorm://open?file='.__DIR__,`
`99`	`98`	`];`
`100`		`-=======`
	`99`	`+ }`
	`100`	`+`
`101`	`101`	`public function testRendersStackWithoutBinaryStrings()`
`102`	`102`	`{`
`103`	`103`	`// make sure method arguments are available in stack traces (see https://www.php.net/manual/en/ini.core.php)`
`@@ -135,6 +135,5 @@ private function getRuntimeException(string $unusedArgument): \RuntimeException`
`135`	`135`	`private function buildRuntimeException(string $message): \RuntimeException`
`136`	`136`	`{`
`137`	`137`	`return new \RuntimeException($message);`
`138`		`->>>>>>> 6.3`
`139`	`138`	`}`
`140`	`139`	`}`