Dariusz Ruminski 7 лет назад
Родитель
Сommit
7ae323de73

+ 103 - 103
src/AbstractDoctrineAnnotationFixer.php

@@ -89,109 +89,109 @@ abstract class AbstractDoctrineAnnotationFixer extends AbstractFixer implements
                 return true;
                 return true;
             }))
             }))
             ->setDefault(array(
             ->setDefault(array(
-                 // PHPDocumentor 1
-                 'abstract',
-                 'access',
-                 'code',
-                 'deprec',
-                 'encode',
-                 'exception',
-                 'final',
-                 'ingroup',
-                 'inheritdoc',
-                 'inheritDoc',
-                 'magic',
-                 'name',
-                 'toc',
-                 'tutorial',
-                 'private',
-                 'static',
-                 'staticvar',
-                 'staticVar',
-                 'throw',
-
-                 // PHPDocumentor 2
-                 'api',
-                 'author',
-                 'category',
-                 'copyright',
-                 'deprecated',
-                 'example',
-                 'filesource',
-                 'global',
-                 'ignore',
-                 'internal',
-                 'license',
-                 'link',
-                 'method',
-                 'package',
-                 'param',
-                 'property',
-                 'property-read',
-                 'property-write',
-                 'return',
-                 'see',
-                 'since',
-                 'source',
-                 'subpackage',
-                 'throws',
-                 'todo',
-                 'TODO',
-                 'usedBy',
-                 'uses',
-                 'var',
-                 'version',
-
-                 // PHPUnit
-                 'after',
-                 'afterClass',
-                 'backupGlobals',
-                 'backupStaticAttributes',
-                 'before',
-                 'beforeClass',
-                 'codeCoverageIgnore',
-                 'codeCoverageIgnoreStart',
-                 'codeCoverageIgnoreEnd',
-                 'covers',
-                 'coversDefaultClass',
-                 'coversNothing',
-                 'dataProvider',
-                 'depends',
-                 'expectedException',
-                 'expectedExceptionCode',
-                 'expectedExceptionMessage',
-                 'expectedExceptionMessageRegExp',
-                 'group',
-                 'large',
-                 'medium',
-                 'preserveGlobalState',
-                 'requires',
-                 'runTestsInSeparateProcesses',
-                 'runInSeparateProcess',
-                 'small',
-                 'test',
-                 'testdox',
-                 'ticket',
-                 'uses',
-
-                 // PHPCheckStyle
-                 'SuppressWarnings',
-
-                 // PHPStorm
-                 'noinspection',
-
-                 // PEAR
-                 'package_version',
-
-                 // PlantUML
-                 'enduml',
-                 'startuml',
-
-                 // other
-                 'fix',
-                 'FIXME',
-                 'fixme',
-                 'override',
+                // PHPDocumentor 1
+                'abstract',
+                'access',
+                'code',
+                'deprec',
+                'encode',
+                'exception',
+                'final',
+                'ingroup',
+                'inheritdoc',
+                'inheritDoc',
+                'magic',
+                'name',
+                'toc',
+                'tutorial',
+                'private',
+                'static',
+                'staticvar',
+                'staticVar',
+                'throw',
+
+                // PHPDocumentor 2
+                'api',
+                'author',
+                'category',
+                'copyright',
+                'deprecated',
+                'example',
+                'filesource',
+                'global',
+                'ignore',
+                'internal',
+                'license',
+                'link',
+                'method',
+                'package',
+                'param',
+                'property',
+                'property-read',
+                'property-write',
+                'return',
+                'see',
+                'since',
+                'source',
+                'subpackage',
+                'throws',
+                'todo',
+                'TODO',
+                'usedBy',
+                'uses',
+                'var',
+                'version',
+
+                // PHPUnit
+                'after',
+                'afterClass',
+                'backupGlobals',
+                'backupStaticAttributes',
+                'before',
+                'beforeClass',
+                'codeCoverageIgnore',
+                'codeCoverageIgnoreStart',
+                'codeCoverageIgnoreEnd',
+                'covers',
+                'coversDefaultClass',
+                'coversNothing',
+                'dataProvider',
+                'depends',
+                'expectedException',
+                'expectedExceptionCode',
+                'expectedExceptionMessage',
+                'expectedExceptionMessageRegExp',
+                'group',
+                'large',
+                'medium',
+                'preserveGlobalState',
+                'requires',
+                'runTestsInSeparateProcesses',
+                'runInSeparateProcess',
+                'small',
+                'test',
+                'testdox',
+                'ticket',
+                'uses',
+
+                // PHPCheckStyle
+                'SuppressWarnings',
+
+                // PHPStorm
+                'noinspection',
+
+                // PEAR
+                'package_version',
+
+                // PlantUML
+                'enduml',
+                'startuml',
+
+                // other
+                'fix',
+                'FIXME',
+                'fixme',
+                'override',
             ))
             ))
             ->getOption()
             ->getOption()
         ;
         ;

+ 1 - 1
src/Fixer/Alias/NoMixedEchoPrintFixer.php

@@ -98,7 +98,7 @@ final class NoMixedEchoPrintFixer extends AbstractFixer implements Configuration
         $callBack = $this->callBack;
         $callBack = $this->callBack;
         foreach ($tokens as $index => $token) {
         foreach ($tokens as $index => $token) {
             if ($token->isGivenKind($this->candidateTokenType)) {
             if ($token->isGivenKind($this->candidateTokenType)) {
-                $this->$callBack($tokens, $index);
+                $this->{$callBack}($tokens, $index);
             }
             }
         }
         }
     }
     }

+ 1 - 1
src/Fixer/ArrayNotation/ArraySyntaxFixer.php

@@ -93,7 +93,7 @@ final class ArraySyntaxFixer extends AbstractFixer implements ConfigurationDefin
         $callback = $this->fixCallback;
         $callback = $this->fixCallback;
         for ($index = $tokens->count() - 1; 0 <= $index; --$index) {
         for ($index = $tokens->count() - 1; 0 <= $index; --$index) {
             if ($tokens[$index]->isGivenKind($this->candidateTokenKind)) {
             if ($tokens[$index]->isGivenKind($this->candidateTokenKind)) {
-                $this->$callback($tokens, $index);
+                $this->{$callback}($tokens, $index);
             }
             }
         }
         }
     }
     }

+ 5 - 5
src/Fixer/CastNotation/ModernizeTypesCastingFixer.php

@@ -62,11 +62,11 @@ final class ModernizeTypesCastingFixer extends AbstractFunctionReferenceFixer
     {
     {
         // replacement patterns
         // replacement patterns
         static $replacement = array(
         static $replacement = array(
-             'intval' => array(T_INT_CAST, '(int)'),
-             'floatval' => array(T_DOUBLE_CAST, '(float)'),
-             'doubleval' => array(T_DOUBLE_CAST, '(float)'),
-             'strval' => array(T_STRING_CAST, '(string)'),
-             'boolval' => array(T_BOOL_CAST, '(bool)'),
+            'intval' => array(T_INT_CAST, '(int)'),
+            'floatval' => array(T_DOUBLE_CAST, '(float)'),
+            'doubleval' => array(T_DOUBLE_CAST, '(float)'),
+            'strval' => array(T_STRING_CAST, '(string)'),
+            'boolval' => array(T_BOOL_CAST, '(bool)'),
         );
         );
 
 
         $argumentsAnalyzer = new ArgumentsAnalyzer();
         $argumentsAnalyzer = new ArgumentsAnalyzer();

+ 1 - 1
src/Fixer/ClassNotation/NoPhp4ConstructorFixer.php

@@ -32,7 +32,7 @@ final class NoPhp4ConstructorFixer extends AbstractFixer
         return new FixerDefinition(
         return new FixerDefinition(
             'Convert PHP4-style constructors to `__construct`.',
             'Convert PHP4-style constructors to `__construct`.',
             array(
             array(
-               new CodeSample('<?php
+                new CodeSample('<?php
 class Foo
 class Foo
 {
 {
     public function Foo($bar)
     public function Foo($bar)

+ 1 - 1
src/Fixer/LanguageConstruct/DeclareEqualNormalizeFixer.php

@@ -77,7 +77,7 @@ final class DeclareEqualNormalizeFixer extends AbstractFixer implements Configur
 
 
             while (!$tokens[++$index]->equals('='));
             while (!$tokens[++$index]->equals('='));
 
 
-            $this->$callback($tokens, $index);
+            $this->{$callback}($tokens, $index);
         }
         }
     }
     }
 
 

+ 1 - 1
src/Fixer/Operator/ConcatSpaceFixer.php

@@ -82,7 +82,7 @@ final class ConcatSpaceFixer extends AbstractFixer implements ConfigurationDefin
         $callBack = $this->fixCallback;
         $callBack = $this->fixCallback;
         for ($index = $tokens->count() - 1; $index >= 0; --$index) {
         for ($index = $tokens->count() - 1; $index >= 0; --$index) {
             if ($tokens[$index]->equals('.')) {
             if ($tokens[$index]->equals('.')) {
-                $this->$callBack($tokens, $index);
+                $this->{$callBack}($tokens, $index);
             }
             }
         }
         }
     }
     }

+ 1 - 1
src/Fixer/PhpUnit/PhpUnitConstructFixer.php

@@ -104,7 +104,7 @@ $this->assertNotSame(null, $d);
             $assertionFixer = self::$assertionFixers[$assertionMethod];
             $assertionFixer = self::$assertionFixers[$assertionMethod];
 
 
             for ($index = 0, $limit = $tokens->count(); $index < $limit; ++$index) {
             for ($index = 0, $limit = $tokens->count(); $index < $limit; ++$index) {
-                $index = $this->$assertionFixer($tokens, $index, $assertionMethod);
+                $index = $this->{$assertionFixer}($tokens, $index, $assertionMethod);
 
 
                 if (null === $index) {
                 if (null === $index) {
                     break;
                     break;

+ 2 - 2
src/Fixer/Whitespace/NoExtraConsecutiveBlankLinesFixer.php

@@ -320,7 +320,7 @@ class Foo
                 continue;
                 continue;
             }
             }
 
 
-            $this->$callback($index);
+            $this->{$callback}($index);
 
 
             return;
             return;
         }
         }
@@ -330,7 +330,7 @@ class Foo
                 continue;
                 continue;
             }
             }
 
 
-            $this->$callback($index);
+            $this->{$callback}($index);
 
 
             return;
             return;
         }
         }

+ 1 - 1
src/Test/AccessibleObject.php

@@ -44,7 +44,7 @@ final class AccessibleObject
     public function __isset($name)
     public function __isset($name)
     {
     {
         try {
         try {
-            $value = $this->$name;
+            $value = $this->{$name};
         } catch (\LogicException $e) {
         } catch (\LogicException $e) {
             return false;
             return false;
         }
         }

Некоторые файлы не были показаны из-за большого количества измененных файлов