Merge branch '8.5' into 9.5

Author: sebastianbergmann

.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"/>

.php-cs-fixer.dist.php

@@ -130,7 +130,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,

tests/_files/NotReorderableTest.php

@@ -19,7 +19,7 @@ public function count(): int
 
     public function run(TestResult $result = null): TestResult
     {
-        return new TestResult();
+        return new TestResult;
     }
 
     public function provides(): array

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

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());
     }
 }

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());
     }
 }

tests/unit/Framework/Constraint/LogicalExpressionsTest.php

@@ -21,7 +21,7 @@ public function testLogicalNotOfDegenerateLogicalAnd(): void
     {
         $constraint = new LogicalNot(
             LogicalAnd::fromConstraints(
-                new IsNull(),
+                new IsNull,
             )
         );
 
@@ -70,7 +70,7 @@ public function testLogicalNotOfDegenerateLogicalOr(): void
     {
         $constraint = new LogicalNot(
             LogicalOr::fromConstraints(
-                new IsNull(),
+                new IsNull,
             )
         );
 
@@ -91,7 +91,7 @@ public function testLogicalNotOfLogicalOrWithThreeArguments(): void
     {
         $constraint = new LogicalNot(
             LogicalOr::fromConstraints(
-                new IsNull(),
+                new IsNull,
                 new IsType('int'),
                 new IsType('array')
             )
@@ -118,7 +118,7 @@ public function testLogicalNotOfDegenerateLogicalXor(): void
     {
         $constraint = new LogicalNot(
             LogicalXor::fromConstraints(
-                new IsNull(),
+                new IsNull,
             )
         );
 

tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php

@@ -141,7 +141,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
@@ -150,7 +150,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());
@@ -247,7 +247,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());

tests/unit/Framework/TestCaseTest.php

@@ -1084,8 +1084,8 @@ public function testSizeSmall(): void
 
     public function testCanUseDependsToDependOnSuccessfulClass(): void
     {
-        $result = new TestResult();
-        $suite  = new TestSuite();
+        $result = new TestResult;
+        $suite  = new TestSuite;
         $suite->addTestSuite(DependencySuccessTest::class);
         $suite->addTestSuite(DependencyFailureTest::class);
         $suite->addTestSuite(DependencyOnClassTest::class);
@@ -1117,7 +1117,7 @@ public function testGetNameReturnsMethodName(): void
 
     public function testGetNameReturnsEmptyStringAsDefault(): void
     {
-        $testCase = new TestWithDifferentNames();
+        $testCase = new TestWithDifferentNames;
 
         $this->assertSame('', $testCase->getName());
     }
@@ -1146,7 +1146,7 @@ public function providerInvalidName(): array
 
     public function testHasFailedReturnsFalseWhenTestHasNotRunYet(): void
     {
-        $test = new TestWithDifferentStatuses();
+        $test = new TestWithDifferentStatuses;
 
         $this->assertSame(BaseTestRunner::STATUS_UNKNOWN, $test->getStatus());
         $this->assertFalse($test->hasFailed());

tests/unit/Framework/TestFailureTest.php

@@ -38,7 +38,7 @@ public function testToStringForError(): void
 
     public function testToStringForNonSelfDescribing(): void
     {
-        $test      = new NotSelfDescribingTest();
+        $test      = new NotSelfDescribingTest;
         $exception = new Exception('message');
         $failure   = new TestFailure($test, $exception);