From 93d46228d363eb10842639b009985001d3262702 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Thu, 11 May 2017 14:35:08 +0200 Subject: [PATCH] [CodingStandard] fixer temp --- easy-coding-standard.neon | 8 ++--- .../TokenWrapper/src/ClassWrapper.php | 2 +- .../TokenWrapper/src/DocBlockWrapper.php | 4 +-- .../TokenWrapper/src/MethodWrapper.php | 6 ++-- .../TokenWrapper/src/ParameterWrapper.php | 2 +- .../TokenWrapper/src/PropertyWrapper.php | 4 +-- .../ArrayPropertyDefaultValueFixer.php | 1 + .../src/Helper/Whitespace/ClassMetrics.php | 2 +- .../ControlStructures/NewClassSniff.php | 2 +- .../ArrayPropertyDefaultValueFixerTest.php | 26 +++++----------- .../tests/Fixer/Property/fixed/fixed.php.inc | 9 ++++++ .../tests/Fixer/Property/fixed/fixed2.php.inc | 9 ++++++ .../tests/Fixer/Property/wrong/wrong.php.inc | 9 ++++++ .../tests/Fixer/Property/wrong/wrong2.php.inc | 9 ++++++ .../src/TokenDispatcher/TokenDispatcher.php | 2 +- .../Nette/NetteEvent/EventStateStorage.php | 30 +++++++++++++++++++ src/UndefinedArray.php | 9 ++++++ 17 files changed, 97 insertions(+), 37 deletions(-) create mode 100644 packages/CodingStandard/tests/Fixer/Property/fixed/fixed.php.inc create mode 100644 packages/CodingStandard/tests/Fixer/Property/fixed/fixed2.php.inc create mode 100644 packages/CodingStandard/tests/Fixer/Property/wrong/wrong.php.inc create mode 100644 packages/CodingStandard/tests/Fixer/Property/wrong/wrong2.php.inc create mode 100644 packages/SymfonyEventDispatcher/tests/Adapter/Nette/NetteEvent/EventStateStorage.php create mode 100644 src/UndefinedArray.php diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon index c68194005df..fa7ea3722c9 100644 --- a/easy-coding-standard.neon +++ b/easy-coding-standard.neon @@ -1,9 +1,5 @@ checkers: - # Classes - - PHP_CodeSniffer\Standards\Generic\Sniffs\Classes\DuplicateClassNameSniff - - PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff - - PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff - - PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\LowercaseClassKeywordsSniff + - Symplify\CodingStandard\Fixer\Property\ArrayPropertyDefaultValueFixer # Code Analysis - PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff @@ -271,4 +267,4 @@ parameters: Symplify\CodingStandard\Sniffs\Classes\EqualInterfaceImplementationSniff: - packages/EasyCodingStandard/packages/SniffRunner/src/Application/SniffFileProcessor.php - - packages/EasyCodingStandard/packages/FixerRunner/src/Application/FixerFileProcessor.php \ No newline at end of file + - packages/EasyCodingStandard/packages/FixerRunner/src/Application/FixerFileProcessor.php diff --git a/packages/CodingStandard/packages/TokenWrapper/src/ClassWrapper.php b/packages/CodingStandard/packages/TokenWrapper/src/ClassWrapper.php index 32b83506831..393ac3e462e 100644 --- a/packages/CodingStandard/packages/TokenWrapper/src/ClassWrapper.php +++ b/packages/CodingStandard/packages/TokenWrapper/src/ClassWrapper.php @@ -26,7 +26,7 @@ final class ClassWrapper /** * @var mixed[] */ - private $tokens; + private $tokens = []; /** * @var MethodWrapper[] diff --git a/packages/CodingStandard/packages/TokenWrapper/src/DocBlockWrapper.php b/packages/CodingStandard/packages/TokenWrapper/src/DocBlockWrapper.php index 82b403199c4..970a13e2491 100644 --- a/packages/CodingStandard/packages/TokenWrapper/src/DocBlockWrapper.php +++ b/packages/CodingStandard/packages/TokenWrapper/src/DocBlockWrapper.php @@ -34,9 +34,9 @@ final class DocBlockWrapper private $indentationType = 'spaces'; /** - * @var string[] + * @var mixed[] */ - private $tokens; + private $tokens = []; /** * @var Fixer diff --git a/packages/CodingStandard/packages/TokenWrapper/src/MethodWrapper.php b/packages/CodingStandard/packages/TokenWrapper/src/MethodWrapper.php index c9523cf280c..f070aff974a 100644 --- a/packages/CodingStandard/packages/TokenWrapper/src/MethodWrapper.php +++ b/packages/CodingStandard/packages/TokenWrapper/src/MethodWrapper.php @@ -27,12 +27,12 @@ final class MethodWrapper /** * @var ParameterWrapper[] */ - private $parameters; + private $parameters = []; /** * @var mixed[] */ - private $methodToken; + private $methodToken = []; /** * @var int @@ -47,7 +47,7 @@ final class MethodWrapper /** * @var mixed[] */ - private $tokens; + private $tokens = []; private function __construct(File $file, int $position) { diff --git a/packages/CodingStandard/packages/TokenWrapper/src/ParameterWrapper.php b/packages/CodingStandard/packages/TokenWrapper/src/ParameterWrapper.php index 229a995afee..5b2ed24b743 100644 --- a/packages/CodingStandard/packages/TokenWrapper/src/ParameterWrapper.php +++ b/packages/CodingStandard/packages/TokenWrapper/src/ParameterWrapper.php @@ -19,7 +19,7 @@ final class ParameterWrapper /** * @var mixed[] */ - private $tokens; + private $tokens = []; private function __construct(File $file, int $position) { diff --git a/packages/CodingStandard/packages/TokenWrapper/src/PropertyWrapper.php b/packages/CodingStandard/packages/TokenWrapper/src/PropertyWrapper.php index 549d0a14e36..2cb2b50b114 100644 --- a/packages/CodingStandard/packages/TokenWrapper/src/PropertyWrapper.php +++ b/packages/CodingStandard/packages/TokenWrapper/src/PropertyWrapper.php @@ -20,12 +20,12 @@ final class PropertyWrapper /** * @var mixed[] */ - private $propertyToken; + private $propertyToken = []; /** * @var mixed[] */ - private $tokens; + private $tokens = []; /** * @var ?int diff --git a/packages/CodingStandard/src/Fixer/Property/ArrayPropertyDefaultValueFixer.php b/packages/CodingStandard/src/Fixer/Property/ArrayPropertyDefaultValueFixer.php index 64603b99a3a..e4b0ff2e2ec 100644 --- a/packages/CodingStandard/src/Fixer/Property/ArrayPropertyDefaultValueFixer.php +++ b/packages/CodingStandard/src/Fixer/Property/ArrayPropertyDefaultValueFixer.php @@ -90,6 +90,7 @@ private function isArrayPropertyDocComment(Token $token): bool private function addDefaultValueForArrayProperty(Tokens $tokens, int $semicolonPosition): void { + // todo: prepare nicer api $tokens->insertAt($semicolonPosition, new Token([CT::T_ARRAY_SQUARE_BRACE_CLOSE, ']'])); $tokens->insertAt($semicolonPosition, new Token([CT::T_ARRAY_SQUARE_BRACE_OPEN, '['])); $tokens->insertAt($semicolonPosition, new Token([T_WHITESPACE, ' '])); diff --git a/packages/CodingStandard/src/Helper/Whitespace/ClassMetrics.php b/packages/CodingStandard/src/Helper/Whitespace/ClassMetrics.php index e253dfb1da5..d1b6f8d21e8 100644 --- a/packages/CodingStandard/src/Helper/Whitespace/ClassMetrics.php +++ b/packages/CodingStandard/src/Helper/Whitespace/ClassMetrics.php @@ -19,7 +19,7 @@ final class ClassMetrics /** * @var mixed[] */ - private $tokens; + private $tokens = []; public function __construct(File $file, int $classPosition) { diff --git a/packages/CodingStandard/src/Sniffs/ControlStructures/NewClassSniff.php b/packages/CodingStandard/src/Sniffs/ControlStructures/NewClassSniff.php index e840b1d11d1..01aa4ad393c 100644 --- a/packages/CodingStandard/src/Sniffs/ControlStructures/NewClassSniff.php +++ b/packages/CodingStandard/src/Sniffs/ControlStructures/NewClassSniff.php @@ -31,7 +31,7 @@ final class NewClassSniff implements Sniff /** * @var mixed[] */ - private $tokens; + private $tokens = []; /** * @return int[] diff --git a/packages/CodingStandard/tests/Fixer/Property/ArrayPropertyDefaultValueFixerTest.php b/packages/CodingStandard/tests/Fixer/Property/ArrayPropertyDefaultValueFixerTest.php index 23d2c633873..6d56fc8805e 100644 --- a/packages/CodingStandard/tests/Fixer/Property/ArrayPropertyDefaultValueFixerTest.php +++ b/packages/CodingStandard/tests/Fixer/Property/ArrayPropertyDefaultValueFixerTest.php @@ -16,7 +16,7 @@ final class ArrayPropertyDefaultValueFixerTest extends AbstractFixerTestCase /** * @dataProvider provideFixCases() */ - public function testFix(string $expected, string $input) + public function testFix(string $expected, string $input): void { $this->doTest($expected, $input); } @@ -28,24 +28,12 @@ public function provideFixCases(): array { return [ [ - 'storage[$event] = $state; + } + + /** + * @return bool|Event + */ + public function getEventState(string $event) + { + if (isset($this->storage[$event])) { + return $this->storage[$event]; + } + + return false; + } +} diff --git a/src/UndefinedArray.php b/src/UndefinedArray.php new file mode 100644 index 00000000000..8986ca5749b --- /dev/null +++ b/src/UndefinedArray.php @@ -0,0 +1,9 @@ +