minor #41918 CS fixes (nicolas-grekas)

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 https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/5785

Commits
-------

31e1a978f5 CS fixes
This commit is contained in:
Nicolas Grekas 2021-06-30 15:05:30 +02:00
commit 6e3fa5a43f
9 changed files with 10 additions and 13 deletions

View File

@ -11,6 +11,7 @@ return (new PhpCsFixer\Config())
'@Symfony' => true,
'@Symfony:risky' => true,
'protected_to_private' => false,
'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false],
])
->setRiskyAllowed(true)
->setFinder(

View File

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

View File

@ -10,7 +10,6 @@
*/
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
return [
new FrameworkBundle(),

View File

@ -49,7 +49,7 @@ class ArrayAdapterTest extends AdapterTestCase
// Fail (should be missing from $values)
$item = $cache->getItem('buz');
$cache->save($item->set(function() {}));
$cache->save($item->set(function () {}));
$values = $cache->getValues();

View File

@ -225,7 +225,7 @@ class ExprBuilderTest extends TestCase
*
* @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()

View File

@ -64,7 +64,7 @@ class ReflectionClassResourceTest extends TestCase
/**
* @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();

View File

@ -40,7 +40,7 @@ class MemcachedSessionHandlerTest extends TestCase
$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()

View File

@ -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;

View File

@ -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)
{