Skip to content

Commit c155ca6

Browse files
SlamdunkSlamdunk
committed
Updated to PHP ^7.3, PHP-CS-Fixer ^2.16
1 parent ff457be commit c155ca6

15 files changed

+195
-180
lines changed

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.2",
14-
"friendsofphp/php-cs-fixer": "^2.15"
13+
"php": "^7.3",
14+
"friendsofphp/php-cs-fixer": "^2.16"
1515
},
1616
"require-dev": {
1717
"phpstan/phpstan": "^0.11",
1818
"phpstan/phpstan-phpunit": "^0.11",
1919
"phpunit/phpunit": "^7.5",
2020
"roave/security-advisories": "dev-master",
21-
"slam/php-debug-r": "^1.4",
22-
"slam/phpstan-extensions": "^3.0",
21+
"slam/php-debug-r": "^1.6",
22+
"slam/phpstan-extensions": "^3.6",
2323
"thecodingmachine/phpstan-strict-rules": "^0.11"
2424
},
2525
"autoload": {

‎lib/Config.php‎

Lines changed: 115 additions & 106 deletions
Large diffs are not rendered by default.

‎lib/FinalAbstractPublicFixer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpCsFixer\FixerDefinition\FixerDefinition;
99
use PhpCsFixer\Tokenizer\Token;
1010
use PhpCsFixer\Tokenizer\Tokens;
11+
use SplFileInfo;
1112

1213
final class FinalAbstractPublicFixer extends AbstractFixer
1314
{
@@ -43,7 +44,7 @@ public function isRisky()
4344
return true;
4445
}
4546

46-
protected function applyFix(\SplFileInfo $file, Tokens $tokens)
47+
protected function applyFix(SplFileInfo $file, Tokens $tokens)
4748
{
4849
$classes = \array_keys($tokens->findGivenKind(\T_CLASS));
4950

‎lib/FinalInternalClassFixer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpCsFixer\FixerDefinition\FixerDefinition;
99
use PhpCsFixer\Tokenizer\Token;
1010
use PhpCsFixer\Tokenizer\Tokens;
11+
use SplFileInfo;
1112

1213
final class FinalInternalClassFixer extends AbstractFixer
1314
{
@@ -33,7 +34,7 @@ public function isRisky()
3334
return true;
3435
}
3536

36-
protected function applyFix(\SplFileInfo $file, Tokens $tokens)
37+
protected function applyFix(SplFileInfo $file, Tokens $tokens)
3738
{
3839
$classes = \array_keys($tokens->findGivenKind(\T_CLASS));
3940

‎lib/FunctionReferenceSpaceFixer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use PhpCsFixer\Tokenizer\CT;
1010
use PhpCsFixer\Tokenizer\Token;
1111
use PhpCsFixer\Tokenizer\Tokens;
12+
use SplFileInfo;
1213

1314
final class FunctionReferenceSpaceFixer extends AbstractFixer
1415
{
@@ -27,7 +28,7 @@ public function isCandidate(Tokens $tokens)
2728
return $tokens->isTokenKindFound(\T_FUNCTION);
2829
}
2930

30-
protected function applyFix(\SplFileInfo $file, Tokens $tokens)
31+
protected function applyFix(SplFileInfo $file, Tokens $tokens)
3132
{
3233
for ($index = $tokens->count() - 1; $index > 0; --$index) {
3334
if (! $tokens[$index]->isGivenKind(\T_FUNCTION)) {

‎lib/InlineCommentSpacerFixer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpCsFixer\FixerDefinition\FixerDefinition;
99
use PhpCsFixer\Tokenizer\Token;
1010
use PhpCsFixer\Tokenizer\Tokens;
11+
use SplFileInfo;
1112

1213
final class InlineCommentSpacerFixer extends AbstractFixer
1314
{
@@ -31,7 +32,7 @@ public function isCandidate(Tokens $tokens)
3132
return $tokens->isTokenKindFound(\T_COMMENT);
3233
}
3334

34-
protected function applyFix(\SplFileInfo $file, Tokens $tokens)
35+
protected function applyFix(SplFileInfo $file, Tokens $tokens)
3536
{
3637
foreach ($tokens as $index => $token) {
3738
$content = $token->getContent();

‎lib/PhpFileOnlyProxyFixer.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use PhpCsFixer\FixerDefinition\FixerDefinition;
1313
use PhpCsFixer\Tokenizer\Tokens;
1414
use PhpCsFixer\WhitespacesFixerConfig;
15+
use SplFileInfo;
1516

1617
final class PhpFileOnlyProxyFixer implements ConfigurationDefinitionFixerInterface, DefinedFixerInterface, WhitespacesAwareFixerInterface
1718
{
@@ -22,7 +23,7 @@ public function __construct(FixerInterface $fixer)
2223
$this->fixer = $fixer;
2324
}
2425

25-
public function configure(array $configuration = null)
26+
public function configure(?array $configuration = null)
2627
{
2728
if (! $this->fixer instanceof ConfigurationDefinitionFixerInterface) {
2829
return;
@@ -84,7 +85,7 @@ public function isRisky()
8485
return $this->fixer->isRisky();
8586
}
8687

87-
public function fix(\SplFileInfo $file, Tokens $tokens)
88+
public function fix(SplFileInfo $file, Tokens $tokens)
8889
{
8990
return $this->fixer->fix($file, $tokens);
9091
}
@@ -99,7 +100,7 @@ public function getPriority()
99100
return $this->fixer->getPriority();
100101
}
101102

102-
public function supports(\SplFileInfo $file)
103+
public function supports(SplFileInfo $file)
103104
{
104105
return 'php' === \pathinfo($file->getFilename(), \PATHINFO_EXTENSION);
105106
}

‎lib/Utf8Fixer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpCsFixer\FixerDefinition\CodeSample;
88
use PhpCsFixer\FixerDefinition\FixerDefinition;
99
use PhpCsFixer\Tokenizer\Tokens;
10+
use SplFileInfo;
1011

1112
final class Utf8Fixer extends AbstractFixer
1213
{
@@ -32,7 +33,7 @@ public function isRisky()
3233
return true;
3334
}
3435

35-
protected function applyFix(\SplFileInfo $file, Tokens $tokens)
36+
protected function applyFix(SplFileInfo $file, Tokens $tokens)
3637
{
3738
$content = $tokens->generateCode();
3839
if (false === \mb_check_encoding($content, 'UTF-8')) {

‎tests/ConfigTest.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public function testConfig()
2222
{
2323
$config = new Config();
2424

25-
static::assertInstanceOf(ConfigInterface::class, $config);
26-
static::assertNotEmpty($config->getCustomFixers());
25+
self::assertInstanceOf(ConfigInterface::class, $config);
26+
self::assertNotEmpty($config->getCustomFixers());
2727
}
2828

2929
public function testAllDefaultRulesAreSpecified()
@@ -57,68 +57,68 @@ public function testAllDefaultRulesAreSpecified()
5757
\sort($availableRules);
5858

5959
$diff = \array_diff($availableRules, $currentRules);
60-
static::assertEmpty($diff, \sprintf("Mancano tra le specifiche i seguenti fixer:\n- %s", \implode(\PHP_EOL . '- ', $diff)));
60+
self::assertEmpty($diff, \sprintf("Mancano tra le specifiche i seguenti fixer:\n- %s", \implode(\PHP_EOL . '- ', $diff)));
6161

6262
$diff = \array_diff($currentRules, $availableRules);
63-
static::assertEmpty($diff, \sprintf("I seguenti fixer sono di troppo:\n- %s", \implode(\PHP_EOL . '- ', $diff)));
63+
self::assertEmpty($diff, \sprintf("I seguenti fixer sono di troppo:\n- %s", \implode(\PHP_EOL . '- ', $diff)));
6464

6565
$currentSets = \array_values(\array_filter(\array_keys($configRules), static function (string $fixerName): bool {
6666
return isset($fixerName[0]) && '@' === $fixerName[0];
6767
}));
6868
$defaultSets = $ruleSet->getSetDefinitionNames();
6969
$intersectSets = \array_values(\array_intersect($defaultSets, $currentSets));
70-
static::assertEquals($intersectSets, $currentSets, \sprintf('Rule sets must be ordered as the appear in %s', RuleSet::class));
70+
self::assertEquals($intersectSets, $currentSets, \sprintf('Rule sets must be ordered as the appear in %s', RuleSet::class));
7171

7272
$currentRules = \array_values(\array_filter(\array_keys($configRules), static function (string $fixerName): bool {
7373
return isset($fixerName[0]) && '@' !== $fixerName[0];
7474
}));
7575

7676
$orderedCurrentRules = $currentRules;
7777
\sort($orderedCurrentRules);
78-
static::assertEquals($orderedCurrentRules, $currentRules, 'Order the rules alphabetically please');
78+
self::assertEquals($orderedCurrentRules, $currentRules, 'Order the rules alphabetically please');
7979
}
8080

8181
public function testFutureMode()
8282
{
8383
\putenv('PHP_CS_FIXER_FUTURE_MODE');
8484

85-
static::assertFalse(\getenv('PHP_CS_FIXER_FUTURE_MODE'));
85+
self::assertFalse(\getenv('PHP_CS_FIXER_FUTURE_MODE'));
8686

8787
new Config();
8888

89-
static::assertNotEmpty(\getenv('PHP_CS_FIXER_FUTURE_MODE'));
89+
self::assertNotEmpty(\getenv('PHP_CS_FIXER_FUTURE_MODE'));
9090
}
9191

9292
public function testTypes()
9393
{
9494
$rules = (new Config(Config::APP_V1))->getRules();
95-
static::assertFalse($rules['declare_strict_types']);
96-
static::assertFalse($rules['native_constant_invocation']);
95+
self::assertFalse($rules['declare_strict_types']);
96+
self::assertFalse($rules['native_constant_invocation']);
9797

9898
$rules = (new Config(Config::APP_V2))->getRules();
99-
static::assertTrue($rules['declare_strict_types']);
100-
static::assertFalse($rules['native_constant_invocation']);
99+
self::assertTrue($rules['declare_strict_types']);
100+
self::assertFalse($rules['native_constant_invocation']);
101101

102102
$rules = (new Config(Config::LIB))->getRules();
103-
static::assertTrue($rules['native_function_invocation']);
104-
static::assertTrue($rules['native_constant_invocation']);
103+
self::assertTrue($rules['native_function_invocation']);
104+
self::assertTrue($rules['native_constant_invocation']);
105105

106-
static::assertSame((new Config())->getRules(), (new Config(Config::APP_V2))->getRules());
106+
self::assertSame((new Config())->getRules(), (new Config(Config::APP_V2))->getRules());
107107
}
108108

109109
public function testOverwrite()
110110
{
111111
$rules = (new Config(Config::APP_V2))->getRules();
112-
static::assertTrue($rules['declare_strict_types']);
113-
static::assertFalse($rules['native_constant_invocation']);
112+
self::assertTrue($rules['declare_strict_types']);
113+
self::assertFalse($rules['native_constant_invocation']);
114114

115115
$overriddenRules = [
116116
'declare_strict_types' => false,
117117
'Slam/native_constant_invocation' => true,
118118
];
119119

120120
$newRules = (new Config(Config::APP_V2, $overriddenRules))->getRules();
121-
static::assertFalse($newRules['declare_strict_types']);
122-
static::assertTrue($newRules['Slam/native_constant_invocation']);
121+
self::assertFalse($newRules['declare_strict_types']);
122+
self::assertTrue($newRules['Slam/native_constant_invocation']);
123123
}
124124
}

‎tests/FinalAbstractPublicFixerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ final class FinalAbstractPublicFixerTest extends AbstractFixerTestCase
1313
{
1414
public function testIsRisky()
1515
{
16-
static::assertInstanceOf(FixerDefinition::class, $this->fixer->getDefinition());
17-
static::assertTrue($this->fixer->isRisky());
16+
self::assertInstanceOf(FixerDefinition::class, $this->fixer->getDefinition());
17+
self::assertTrue($this->fixer->isRisky());
1818
}
1919

2020
/**

0 commit comments

Comments
 (0)