8000 CS fixes by nicolas-grekas · Pull Request #41918 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

CS fixes #41918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2021
Merged

CS fixes #41918

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*/

use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;

return [
new FrameworkBundle(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
10000
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Transport/Dsn.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Yaml/Exception/ParseException.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
0