Merge branch '9.5'

sebastianbergmann · sebastianbergmann · commit 881a5974cf9c · 2022-03-08T07:13:08.000+01: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.27.1" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.6.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.7.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="phpdox" version="^0.12" installed="0.12.0" location="./tools/phpdox" copy="true"/>
   <phar name="phploc" version="^4.0" installed="4.0.1" location="./tools/phploc" copy="true"/>
   <phar name="psalm" version="^4.0" installed="4.22.0" location="./tools/psalm" copy="true"/>
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -132,7 +132,10 @@
         'native_function_casing' => false,
         'native_function_invocation' => false,
         'native_function_type_declaration_casing' => true,
-        'new_with_braces' => false,
+        'new_with_braces' => [
+            'named_class' => false,
+            'anonymous_class' => false,
+        ],
         'no_alias_functions' => true,
         'no_alias_language_construct_call' => true,
         'no_alternative_syntax' => true,
diff --git a/src/Event/Emitter/DispatchingEmitter.php b/src/Event/Emitter/DispatchingEmitter.php
@@ -55,7 +55,7 @@ public function testRunnerStarted(): void
         $this->dispatcher->dispatch(
             new TestRunner\Started(
                 $this->telemetryInfo(),
-                new Runtime\Runtime()
+                new Runtime\Runtime
             )
         );
     }
diff --git a/src/TextUI/Configuration/Configuration.php b/src/TextUI/Configuration/Configuration.php
@@ -888,7 +888,7 @@ public function hasTestsCovering(): bool
     public function testsCovering(): array
     {
         if (!$this->hasTestsCovering()) {
-            throw new FilterNotConfiguredException();
+            throw new FilterNotConfiguredException;
         }
 
         return $this->testsCovering;
@@ -910,7 +910,7 @@ public function hasTestsUsing(): bool
     public function testsUsing(): array
     {
         if (!$this->hasTestsUsing()) {
-            throw new FilterNotConfiguredException();
+            throw new FilterNotConfiguredException;
         }
 
         return $this->testsUsing;
diff --git a/tests/_files/TestWithDifferentStatuses.php b/tests/_files/TestWithDifferentStatuses.php
@@ -21,7 +21,7 @@ public function testThatFails(): void
 
     public function testThatErrors(): void
     {
-        throw new Exception();
+        throw new Exception;
     }
 
     public function testThatPasses(): void
diff --git a/tests/end-to-end/no-log-cc-override/_files/NoLogNoCcTest.php b/tests/end-to-end/no-log-cc-override/_files/NoLogNoCcTest.php
@@ -16,6 +16,6 @@ final class NoLogNoCcTest extends TestCase
 {
     public function testSuccess(): void
     {
-        $this->assertTrue((new NoLogNoCc())->getTrue());
+        $this->assertTrue((new NoLogNoCc)->getTrue());
     }
 }
diff --git a/tests/end-to-end/regression/GitHub/3739/Issue3739Test.php b/tests/end-to-end/regression/GitHub/3739/Issue3739Test.php
@@ -29,11 +29,11 @@ final class Issue3739Test extends TestCase
 {
     public function testWithErrorSuppression(): void
     {
-        $this->assertFalse((new Issue3739())->unlinkFileThatDoesNotExistWithErrorSuppression());
+        $this->assertFalse((new Issue3739)->unlinkFileThatDoesNotExistWithErrorSuppression());
     }
 
     public function testWithoutErrorSuppression(): void
     {
-        $this->assertFalse((new Issue3739())->unlinkFileThatDoesNotExistWithoutErrorSuppression());
+        $this->assertFalse((new Issue3739)->unlinkFileThatDoesNotExistWithoutErrorSuppression());
     }
 }
diff --git a/tests/unit/Event/DirectDispatcherTest.php b/tests/unit/Event/DirectDispatcherTest.php
@@ -24,7 +24,7 @@ public function testRegisterRejectsUnknownSubscriber(): void
     {
         $subscriber = new NullSubscriber;
 
-        $dispatcher = new DirectDispatcher(new TypeMap());
+        $dispatcher = new DirectDispatcher(new TypeMap);
 
         $this->expectException(RuntimeException::class);
 
@@ -35,7 +35,7 @@ public function testDispatchRejectsUnknownEventType(): void
     {
         $event = new DummyEvent;
 
-        $dispatcher = new DirectDispatcher(new TypeMap());
+        $dispatcher = new DirectDispatcher(new TypeMap);
 
         $this->expectException(RuntimeException::class);
 
diff --git a/tests/unit/Event/DispatchingEmitterTest.php b/tests/unit/Event/DispatchingEmitterTest.php
@@ -1484,7 +1484,7 @@ public function testTestTestProxyCreatedDispatchesTestDoubleTestProxyCreatedEven
         $className            = self::class;
         $constructorArguments = [
             'foo',
-            new stdClass(),
+            new stdClass,
             [
                 'bar',
                 'baz',
@@ -1639,7 +1639,7 @@ public function notify(TestSuiteFinished $event): void
         $this->assertSame(1, $event->testSuite()->count());
         $this->assertSame('foo', $event->testSuite()->name());
 
-        $mappedResult = (new TestResultMapper())->map($result);
+        $mappedResult = (new TestResultMapper)->map($result);
 
         $this->assertEquals($mappedResult, $event->result());
     }
@@ -1778,8 +1778,8 @@ private function dispatcherWithRegisteredSubscribers(string $subscriberInterface
     private function telemetrySystem(): Telemetry\System
     {
         return new Telemetry\System(
-            new Telemetry\SystemStopWatch(),
-            new Telemetry\SystemMemoryMeter()
+            new Telemetry\SystemStopWatch,
+            new Telemetry\SystemMemoryMeter
         );
     }
 
diff --git a/tests/unit/Event/Events/TestDouble/TestProxyCreatedTest.php b/tests/unit/Event/Events/TestDouble/TestProxyCreatedTest.php
@@ -22,7 +22,7 @@ public function testConstructorSetsValues(): void
         $className            = self::class;
         $constructorArguments = [
             'foo',
-            new stdClass(),
+            new stdClass,
             [
                 'bar',
                 'baz',
diff --git a/tests/unit/Event/Events/TestRunner/PHPTest.php b/tests/unit/Event/Events/TestRunner/PHPTest.php
@@ -28,6 +28,6 @@ public function testDefaults(): void
         $this->assertSame(PHP_RELEASE_VERSION, $php->patch());
         $this->assertSame(PHP_EXTRA_VERSION, $php->extra());
         $this->assertSame(PHP_VERSION_ID, $php->id());
-        $this->assertEquals(new Extensions(), $php->extensions());
+        $this->assertEquals(new Extensions, $php->extensions());
     }
 }
diff --git a/tests/unit/Event/Events/TestSuite/FinishedTest.php b/tests/unit/Event/Events/TestSuite/FinishedTest.php
@@ -33,12 +33,12 @@ public function testConstructorSetsValues(): void
 
         $result = new Result(
             5,
-            new FailureCollection(),
-            new FailureCollection(),
-            new FailureCollection(),
-            new FailureCollection(),
-            new FailureCollection(),
-            new FailureCollection(),
+            new FailureCollection,
+            new FailureCollection,
+            new FailureCollection,
+            new FailureCollection,
+            new FailureCollection,
+            new FailureCollection,
             [],
             []
         );
diff --git a/tests/unit/Framework/Constraint/ArrayIsListTest.php b/tests/unit/Framework/Constraint/ArrayIsListTest.php
@@ -18,14 +18,14 @@ final class ArrayIsListTest extends ConstraintTestCase
 {
     public function testConstraintArrayIsListWhenEmpty(): void
     {
-        $constraint = new ArrayIsList();
+        $constraint = new ArrayIsList;
 
         $this->assertTrue($constraint->evaluate([], '', true));
     }
 
     public function testConstraintArrayIsNotList(): void
     {
-        $constraint = new ArrayIsList();
+        $constraint = new ArrayIsList;
 
         $this->assertFalse($constraint->evaluate([1 => 1], '', true));
         $this->assertEquals('is list', $constraint->toString());
@@ -51,7 +51,7 @@ public function testConstraintArrayIsNotList(): void
 
     public function testConstraintArrayIsNotListWithFilteredArray(): void
     {
-        $constraint = new ArrayIsList();
+        $constraint = new ArrayIsList;
 
         $this->assertFalse($constraint->evaluate([0 => 0, 1 => 1, 3 => 3], '', true));
         $this->assertEquals('is list', $constraint->toString());
@@ -77,7 +77,7 @@ public function testConstraintArrayIsNotListWithFilteredArray(): void
 
     public function testConstraintArrayIsNotListWithCustomMessage(): void
     {
-        $constraint = new ArrayIsList();
+        $constraint = new ArrayIsList;
 
         try {
             $constraint->evaluate([1 => 1], 'custom message');
@@ -100,7 +100,7 @@ public function testConstraintArrayIsNotListWithCustomMessage(): void
 
     public function testConstraintArrayIsNotListWhenNotArray(): void
     {
-        $constraint = new ArrayIsList();
+        $constraint = new ArrayIsList;
 
         try {
             $constraint->evaluate('not array');
diff --git a/tests/unit/Framework/Constraint/LogicalExpressionsTest.php b/tests/unit/Framework/Constraint/LogicalExpressionsTest.php
@@ -20,7 +20,7 @@ public function testLogicalNotOfDegenerateLogicalAnd(): void
     {
         $constraint = new LogicalNot(
             LogicalAnd::fromConstraints(
-                new IsNull(),
+                new IsNull,
             )
         );
 
@@ -69,7 +69,7 @@ public function testLogicalNotOfDegenerateLogicalOr(): void
     {
         $constraint = new LogicalNot(
             LogicalOr::fromConstraints(
-                new IsNull(),
+                new IsNull,
             )
         );
 
@@ -90,7 +90,7 @@ public function testLogicalNotOfLogicalOrWithThreeArguments(): void
     {
         $constraint = new LogicalNot(
             LogicalOr::fromConstraints(
-                new IsNull(),
+                new IsNull,
                 new IsType('int'),
                 new IsType('array')
             )
@@ -117,7 +117,7 @@ public function testLogicalNotOfDegenerateLogicalXor(): void
     {
         $constraint = new LogicalNot(
             LogicalXor::fromConstraints(
-                new IsNull(),
+                new IsNull,
             )
         );
 
diff --git a/tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php b/tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php
@@ -127,7 +127,7 @@ public function testWillReturnFailsWhenTryingToReturnSingleIncompatibleClass():
 
         $this->expectException(IncompatibleReturnValueException::class);
         $this->expectExceptionMessage('Method methodWithClassReturnTypeDeclaration may not return value of type Foo, its declared return type is "stdClass"');
-        $invocationMocker->willReturn(new Foo());
+        $invocationMocker->willReturn(new Foo);
     }
 
     public function testWillReturnAllowsMatchersForMultipleMethodsWithDifferentReturnTypes(): void
@@ -136,7 +136,7 @@ public function testWillReturnAllowsMatchersForMultipleMethodsWithDifferentRetur
         $mock = $this->getMockBuilder(ClassWithAllPossibleReturnTypes::class)
             ->getMock();
 
-        $invocationMocker = $mock->method(new \PHPUnit\Framework\Constraint\IsAnything());
+        $invocationMocker = $mock->method(new \PHPUnit\Framework\Constraint\IsAnything);
         $invocationMocker->willReturn(true, 1);
 
         $this->assertEquals(true, $mock->methodWithBoolReturnTypeDeclaration());
@@ -233,7 +233,7 @@ public function testWillReturnAlreadyInstantiatedStubs(): void
              ->willReturn(new ReturnStub('foo'));
 
         $mock->method('bar')
-             ->willReturn(new ReturnSelf());
+             ->willReturn(new ReturnSelf);
 
         $this->assertSame('foo', $mock->foo());
         $this->assertSame($mock, $mock->bar());
diff --git a/tests/unit/Framework/TestFailureTest.php b/tests/unit/Framework/TestFailureTest.php
@@ -37,7 +37,7 @@ public function testToStringForError(): void
 
     public function testToStringForNonSelfDescribing(): void
     {
-        $test      = new NotSelfDescribingTest();
+        $test      = new NotSelfDescribingTest;
         $exception = new Exception('message');
         $failure   = new TestFailure($test, $exception);
 
diff --git a/tests/unit/Util/Xml/ValidatorTest.php b/tests/unit/Util/Xml/ValidatorTest.php
@@ -22,7 +22,7 @@ final class ValidatorTest extends TestCase
 {
     public function testValidatesValidXmlFile(): void
     {
-        $result = (new Validator())->validate(
+        $result = (new Validator)->validate(
             (new Loader)->loadFile(
                 __DIR__ . '/../../../../phpunit.xml',
                 false,
@@ -38,7 +38,7 @@ public function testValidatesValidXmlFile(): void
 
     public function testDoesNotValidateInvalidXmlFile(): void
     {
-        $result = (new Validator())->validate(
+        $result = (new Validator)->validate(
             (new Loader)->loadFile(
                 __DIR__ . '/../../../end-to-end/migration/possibility-to-migrate-from-92-is-detected/phpunit.xml',
                 false,
diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testRunnerStarted(): void`
`55`	`55`	`$this->dispatcher->dispatch(`
`56`	`56`	`new TestRunner\Started(`
`57`	`57`	`$this->telemetryInfo(),`
`58`		`- new Runtime\Runtime()`
	`58`	`+ new Runtime\Runtime`
`59`	`59`	`)`
`60`	`60`	`);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,7 @@ public function hasTestsCovering(): bool`
`888`	`888`	`public function testsCovering(): array`
`889`	`889`	`{`
`890`	`890`	`if (!$this->hasTestsCovering()) {`
`891`		`- throw new FilterNotConfiguredException();`
	`891`	`+ throw new FilterNotConfiguredException;`
`892`	`892`	`}`
`893`	`893`
`894`	`894`	`return $this->testsCovering;`
`@@ -910,7 +910,7 @@ public function hasTestsUsing(): bool`
`910`	`910`	`public function testsUsing(): array`
`911`	`911`	`{`
`912`	`912`	`if (!$this->hasTestsUsing()) {`
`913`		`- throw new FilterNotConfiguredException();`
	`913`	`+ throw new FilterNotConfiguredException;`
`914`	`914`	`}`
`915`	`915`
`916`	`916`	`return $this->testsUsing;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function testThatFails(): void`
`21`	`21`
`22`	`22`	`public function testThatErrors(): void`
`23`	`23`	`{`
`24`		`- throw new Exception();`
	`24`	`+ throw new Exception;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function testThatPasses(): void`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ final class NoLogNoCcTest extends TestCase`
`16`	`16`	`{`
`17`	`17`	`public function testSuccess(): void`
`18`	`18`	`{`
`19`		`- $this->assertTrue((new NoLogNoCc())->getTrue());`
	`19`	`+ $this->assertTrue((new NoLogNoCc)->getTrue());`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ final class Issue3739Test extends TestCase`
`29`	`29`	`{`
`30`	`30`	`public function testWithErrorSuppression(): void`
`31`	`31`	`{`
`32`		`- $this->assertFalse((new Issue3739())->unlinkFileThatDoesNotExistWithErrorSuppression());`
	`32`	`+ $this->assertFalse((new Issue3739)->unlinkFileThatDoesNotExistWithErrorSuppression());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public function testWithoutErrorSuppression(): void`
`36`	`36`	`{`
`37`		`- $this->assertFalse((new Issue3739())->unlinkFileThatDoesNotExistWithoutErrorSuppression());`
	`37`	`+ $this->assertFalse((new Issue3739)->unlinkFileThatDoesNotExistWithoutErrorSuppression());`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function testRegisterRejectsUnknownSubscriber(): void`
`24`	`24`	`{`
`25`	`25`	`$subscriber = new NullSubscriber;`
`26`	`26`
`27`		`- $dispatcher = new DirectDispatcher(new TypeMap());`
	`27`	`+ $dispatcher = new DirectDispatcher(new TypeMap);`
`28`	`28`
`29`	`29`	`$this->expectException(RuntimeException::class);`
`30`	`30`
`@@ -35,7 +35,7 @@ public function testDispatchRejectsUnknownEventType(): void`
`35`	`35`	`{`
`36`	`36`	`$event = new DummyEvent;`
`37`	`37`
`38`		`- $dispatcher = new DirectDispatcher(new TypeMap());`
	`38`	`+ $dispatcher = new DirectDispatcher(new TypeMap);`
`39`	`39`
`40`	`40`	`$this->expectException(RuntimeException::class);`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -1484,7 +1484,7 @@ public function testTestTestProxyCreatedDispatchesTestDoubleTestProxyCreatedEven`
`1484`	`1484`	`$className = self::class;`
`1485`	`1485`	`$constructorArguments = [`
`1486`	`1486`	`'foo',`
`1487`		`- new stdClass(),`
	`1487`	`+ new stdClass,`
`1488`	`1488`	`[`
`1489`	`1489`	`'bar',`
`1490`	`1490`	`'baz',`
`@@ -1639,7 +1639,7 @@ public function notify(TestSuiteFinished $event): void`
`1639`	`1639`	`$this->assertSame(1, $event->testSuite()->count());`
`1640`	`1640`	`$this->assertSame('foo', $event->testSuite()->name());`
`1641`	`1641`
`1642`		`- $mappedResult = (new TestResultMapper())->map($result);`
	`1642`	`+ $mappedResult = (new TestResultMapper)->map($result);`
`1643`	`1643`
`1644`	`1644`	`$this->assertEquals($mappedResult, $event->result());`
`1645`	`1645`	`}`
`@@ -1778,8 +1778,8 @@ private function dispatcherWithRegisteredSubscribers(string $subscriberInterface`
`1778`	`1778`	`private function telemetrySystem(): Telemetry\System`
`1779`	`1779`	`{`
`1780`	`1780`	`return new Telemetry\System(`
`1781`		`- new Telemetry\SystemStopWatch(),`
`1782`		`- new Telemetry\SystemMemoryMeter()`
	`1781`	`+ new Telemetry\SystemStopWatch,`
	`1782`	`+ new Telemetry\SystemMemoryMeter`
`1783`	`1783`	`);`
`1784`	`1784`	`}`
`1785`	`1785`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function testConstructorSetsValues(): void`
`22`	`22`	`$className = self::class;`
`23`	`23`	`$constructorArguments = [`
`24`	`24`	`'foo',`
`25`		`- new stdClass(),`
	`25`	`+ new stdClass,`
`26`	`26`	`[`
`27`	`27`	`'bar',`
`28`	`28`	`'baz',`