minor #41918 CS fixes (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 6e3fa5a43f0d · 2021-06-30T15:05:30.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- CS fixes | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - With a rule hinted by `@julienfalque` in PHP-CS-Fixer/PHP-CS-Fixer#5785 Commits ------- 31e1a97 CS fixes
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -11,6 +11,7 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'protected_to_private' => false,
+        'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false],
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -19,9 +19,6 @@ class ManagerRegistryTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
-        if (!class_exists(\PHPUnit_Framework_TestCase::class)) {
-            self::markTestSkipped('proxy-manager-bridge is not yet compatible with namespaced phpunit versions.');
-        }
         $test = new PhpDumperTest();
         $test->testDumpContainerWithProxyServiceWillShareProxies();
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php
@@ -10,7 +10,6 @@
  */
 
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
 return [
     new FrameworkBundle(),
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
@@ -49,7 +49,7 @@ public function testGetValuesHitAndMiss()
 
         // Fail (should be missing from $values)
         $item = $cache->getItem('buz');
-        $cache->save($item->set(function() {}));
+        $cache->save($item->set(function () {}));
 
         $values = $cache->getValues();
 
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -225,7 +225,7 @@ protected function getTestBuilder(): ExprBuilder
      *
      * @return array The finalized config values
      */
-    protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, ?array $config = null): array
+    protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, array $config = null): array
     {
         return $nodeDefinition
             ->end()
diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
@@ -64,7 +64,7 @@ public function testIsFreshForDeletedResources()
     /**
      * @dataProvider provideHashedSignature
      */
-    public function testHashedSignature(bool $changeExpected, int $changedLine, ?string $changedCode, ?\Closure $setContext = null)
+    public function testHashedSignature(bool $changeExpected, int $changedLine, ?string $changedCode, \Closure $setContext = null)
     {
         if ($setContext) {
             $setContext();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
 
         $r = new \ReflectionClass(\Memcached::class);
         $methodsToMock = array_map(function ($m) { return $m->name; }, $r->getMethods(\ReflectionMethod::IS_PUBLIC));
-        $methodsToMock = array_diff($methodsToMock, ['getDelayed','getDelayedByKey']);
+        $methodsToMock = array_diff($methodsToMock, ['getDelayed', 'getDelayedByKey']);
 
         $this->memcached = $this->getMockBuilder(\Memcached::class)
             ->disableOriginalConstructor()
diff --git a/src/Symfony/Component/Mailer/Transport/Dsn.php b/src/Symfony/Component/Mailer/Transport/Dsn.php
@@ -25,7 +25,7 @@ final class Dsn
     private $port;
     private $options;
 
-    public function __construct(string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [])
+    public function __construct(string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [])
     {
         $this->scheme = $scheme;
         $this->host = $host;
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -24,10 +24,10 @@ class ParseException extends RuntimeException
     private $rawMessage;
 
     /**
-     * @param string          $message    The error message
-     * @param int             $parsedLine The line where the error occurred
-     * @param string|null     $snippet    The snippet of code near the problem
-     * @param string|null     $parsedFile The file name where the error occurred
+     * @param string      $message    The error message
+     * @param int         $parsedLine The line where the error occurred
+     * @param string|null $snippet    The snippet of code near the problem
+     * @param string|null $parsedFile The file name where the error occurred
      */
     public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ class ManagerRegistryTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`public static function setUpBeforeClass(): void`
`21`	`21`	`{`
`22`		`- if (!class_exists(\PHPUnit_Framework_TestCase::class)) {`
`23`		`- self::markTestSkipped('proxy-manager-bridge is not yet compatible with namespaced phpunit versions.');`
`24`		`- }`
`25`	`22`	`$test = new PhpDumperTest();`
`26`	`23`	`$test->testDumpContainerWithProxyServiceWillShareProxies();`
`27`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ protected function getTestBuilder(): ExprBuilder`
`225`	`225`	`*`
`226`	`226`	`* @return array The finalized config values`
`227`	`227`	`*/`
`228`		`- protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, ?array $config = null): array`
	`228`	`+ 8000 protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, array $config = null): array`
`229`	`229`	`{`
`230`	`230`	`return $nodeDefinition`
`231`	`231`	`->end()`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testIsFreshForDeletedResources()`
`64`	`64`	`/**`
`65`	`65`	`* @dataProvider provideHashedSignature`
`66`	`66`	`*/`
`67`		`- public function testHashedSignature(bool $changeExpected, int $changedLine, ?string $changedCode, ?\Closure $setContext = null)`
	`67`	`+ public function testHashedSignature(bool $changeExpected, int $changedLine, ?string $changedCode, \Closure $setContext = null)`
`68`	`68`	`{`
`69`	`69`	`if ($setContext) {`
`70`	`70`	`$setContext();`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class Dsn`
`25`	`25`	`private $port;`
`26`	`26`	`private $options;`
`27`	`27`
`28`		`- public function __construct(string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [])`
	`28`	`+ public function __construct(string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [])`
`29`	`29`	`{`
`30`	`30`	`$this->scheme = $scheme;`
`31`	`31`	`$this->host = $host;`