Merge branch '8.5' into 9.5

sebastianbergmann · sebastianbergmann · commit 42839036a339 · 2022-02-10T15:55:22.000+01:00
diff --git a/tests/unit/Framework/TestCaseTest.php b/tests/unit/Framework/TestCaseTest.php
@@ -875,9 +875,6 @@ public function testCurrentWorkingDirectoryIsRestored(): void
         $this->assertSame($expectedCwd, getcwd());
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testTypeErrorCanBeExpected(): void
     {
         $o = new ClassWithScalarTypeDeclarations;

Original file line number	Diff line number	Diff line change
`@@ -875,9 +875,6 @@ public function testCurrentWorkingDirectoryIsRestored(): void`
`875`	`875`	`$this->assertSame($expectedCwd, getcwd());`
`876`	`876`	`}`
`877`	`877`
`878`		`- /**`
`879`		`- * @requires PHP 7`
`880`		`- */`
`881`	`878`	`public function testTypeErrorCanBeExpected(): void`
`882`	`879`	`{`
`883`	`880`	`$o = new ClassWithScalarTypeDeclarations;`