Merge branch '8.5' into 9.6

sebastianbergmann · sebastianbergmann · commit d6a232a3a23f · 2023-08-14T15:25:47.000+02:00
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.28.0" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.22.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.23.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="psalm" version="^5.0" installed="5.14.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18.1" installed="0.18.3" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.5.8" location="./tools/composer" copy="true"/>
diff --git a/tests/_files/CoverageTwoDefaultClassAnnotations.php b/tests/_files/CoverageTwoDefaultClassAnnotations.php
@@ -1,4 +1,5 @@
 <?php declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
diff --git a/tests/end-to-end/phar/src/autoload.php b/tests/end-to-end/phar/src/autoload.php
@@ -1,4 +1,5 @@
 <?php declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
diff --git a/tests/end-to-end/regression/2724/SeparateClassRunMethodInNewProcessTest.php b/tests/end-to-end/regression/2724/SeparateClassRunMethodInNewProcessTest.php
@@ -1,4 +1,5 @@
 <?php declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
diff --git a/tests/end-to-end/regression/797/bootstrap797.php b/tests/end-to-end/regression/797/bootstrap797.php
@@ -1,4 +1,5 @@
 <?php declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
diff --git a/tests/end-to-end/regression/873/Issue873Test.php b/tests/end-to-end/regression/873/Issue873Test.php
@@ -1,4 +1,5 @@
 <?php declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php declare(strict_types=1);`
	`2`	`+`
`2`	`3`	`/*`
`3`	`4`	`* This file is part of PHPUnit.`
`4`	`5`	`*`