[CodingStandard] fixer temp

deprecated-packages · Jun 15, 2017 · 93d4622 · 93d4622
1 parent e791885
commit 93d4622
Show file tree

Hide file tree

Showing 17 changed files with 97 additions and 37 deletions.
diff --git 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
+            - 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 [
             [
-                '<?php
-
-                class SomeClass
-                {
-                    /**
-                     * @var int[]
-                     */
-                    public $property = [];
-                }',
-                '<?php
-
-                class SomeClass
-                {
-                    /**
-                     * @var int[]
-                     */
-                    public $property;
-                }',
+                file_get_contents(__DIR__ . '/fixed/fixed.php.inc'),
+                file_get_contents(__DIR__ . '/wrong/wrong.php.inc')
+            ],
+            [
+                file_get_contents(__DIR__ . '/fixed/fixed2.php.inc'),
+                file_get_contents(__DIR__ . '/wrong/wrong2.php.inc')
             ]
         ];
     }

diff --git a/packages/CodingStandard/tests/Fixer/Property/fixed/fixed.php.inc b/packages/CodingStandard/tests/Fixer/Property/fixed/fixed.php.inc
@@ -0,0 +1,9 @@
+<?php
+
+class SomeClass
+{
+    /**
+     * @var int[]
+     */
+    public $property = [];
+}
diff --git a/packages/CodingStandard/tests/Fixer/Property/fixed/fixed2.php.inc b/packages/CodingStandard/tests/Fixer/Property/fixed/fixed2.php.inc
@@ -0,0 +1,9 @@
+<?php
+
+class SomeClass
+{
+    /**
+     * @var int[]
+     */
+    public static $property = [];
+}
diff --git a/packages/CodingStandard/tests/Fixer/Property/wrong/wrong.php.inc b/packages/CodingStandard/tests/Fixer/Property/wrong/wrong.php.inc
@@ -0,0 +1,9 @@
+<?php
+
+class SomeClass
+{
+    /**
+     * @var int[]
+     */
+    public $property;
+}
diff --git a/packages/CodingStandard/tests/Fixer/Property/wrong/wrong2.php.inc b/packages/CodingStandard/tests/Fixer/Property/wrong/wrong2.php.inc
@@ -0,0 +1,9 @@
+<?php
+
+class SomeClass
+{
+    /**
+     * @var int[]
+     */
+    public static $property;
+}
diff --git a/packages/EasyCodingStandard/packages/SniffRunner/src/TokenDispatcher/TokenDispatcher.php b/packages/EasyCodingStandard/packages/SniffRunner/src/TokenDispatcher/TokenDispatcher.php
@@ -16,7 +16,7 @@ final class TokenDispatcher
     /**
      * @var Sniff[][]
      */
-    private $tokenListeners;
+    private $tokenListeners = [];
 
     public function __construct(Skipper $skipper)
     {

diff --git a/packages/SymfonyEventDispatcher/tests/Adapter/Nette/NetteEvent/EventStateStorage.php b/packages/SymfonyEventDispatcher/tests/Adapter/Nette/NetteEvent/EventStateStorage.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace Symplify\SymfonyEventDispatcher\Tests\Adapter\Nette\NetteEvent;
+
+use Symfony\Component\EventDispatcher\Event;
+
+final class EventStateStorage
+{
+    /**
+     * @var Event[]
+     */
+    private $storage = [];
+
+    public function addEventState(string $event, Event $state): void
+    {
+        $this->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
@@ -0,0 +1,9 @@
+<?php
+
+class UndefinedArray
+{
+    /**
+     * @var int[]
+     */
+    public $array = [];
+}