From 63bbfb3efc3b1dc5a13ddba7f4b37438bdbd9087 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Sun, 6 Aug 2017 19:37:55 +0200 Subject: [PATCH] improve coding standard, add DeprectionInterface --- easy-coding-standard.neon | 62 +++++++++++++++++++ src/Application/FileProcessor.php | 8 ++- src/Console/Command/ReconstructCommand.php | 10 +-- .../Deprecation/DeprecationInterface.php | 21 +++++++ src/Deprecation/SetNames.php | 16 +++++ .../GetterToPropertyNodeVisitor.php | 4 +- .../ReplaceOldConstantNodeVisitor.php | 2 +- 7 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 src/Contract/Deprecation/DeprecationInterface.php create mode 100644 src/Deprecation/SetNames.php diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon index 34fd198c531..c78cfa5ad25 100644 --- a/easy-coding-standard.neon +++ b/easy-coding-standard.neon @@ -4,3 +4,65 @@ includes: - vendor/symplify/easy-coding-standard/config/php71-checkers.neon checkers: + # Slevomat + - SlevomatCodingStandard\Sniffs\ControlStructures\DisallowEqualOperatorsSniff + - SlevomatCodingStandard\Sniffs\ControlStructures\YodaComparisonSniff + - SlevomatCodingStandard\Sniffs\Exceptions\DeadCatchSniff + - SlevomatCodingStandard\Sniffs\Exceptions\ReferenceThrowableOnlySniff + - SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff + - SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff + + # Files + PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff: + absoluteLineLimit: 120 + + # PSR-4 + - PhpCsFixer\Fixer\Basic\Psr4Fixer + + # Code Analysis + - PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff + PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\CyclomaticComplexitySniff: + absoluteComplexity: 10 + PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff: + absoluteNestingLevel: 5 + + # Naming Conventions + - PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff + + # PHP + - PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\NonExecutableCodeSniff + + # WhiteSpace + - PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\LanguageConstructSpacingSniff + PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SuperfluousWhitespaceSniff: + ignoreBlankLines: false + + # Namespaces + - PhpCsFixer\Fixer\Import\OrderedImportsFixer + + PhpCsFixer\Fixer\Operator\ConcatSpaceFixer: + spacing: one + - PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer + - PhpCsFixer\Fixer\LanguageConstruct\DirConstantFixer + - PhpCsFixer\Fixer\CastNotation\ModernizeTypesCastingFixer + - PhpCsFixer\Fixer\Semicolon\SemicolonAfterInstructionFixer + - PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer + - PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer + - PhpCsFixer\Fixer\ReturnNotation\NoUselessReturnFixer + - PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveUnsetsFixer + - PhpCsFixer\Fixer\Strict\StrictComparisonFixer + PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer: + annotations: + - author + - throws + - expectedException + + # PHPUnit + - PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer + + # new since PhpCsFixer 2.2-2.4 + - PhpCsFixer\Fixer\Phpdoc\PhpdocReturnSelfReferenceFixer + - PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer + - PhpCsFixer\Fixer\Basic\NonPrintableCharacterFixer + - PhpCsFixer\Fixer\Phpdoc\PhpdocTypesOrderFixer + - PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer \ No newline at end of file diff --git a/src/Application/FileProcessor.php b/src/Application/FileProcessor.php index cf614cc829d..bffc03fda1a 100644 --- a/src/Application/FileProcessor.php +++ b/src/Application/FileProcessor.php @@ -30,8 +30,12 @@ final class FileProcessor */ private $lexer; - public function __construct(Parser $parser, FormatPerservingPrinter $codeStyledPrinter, Lexer $lexer, NodeTraverser $nodeTraverser) - { + public function __construct( + Parser $parser, + FormatPerservingPrinter $codeStyledPrinter, + Lexer $lexer, + NodeTraverser $nodeTraverser + ) { $this->parser = $parser; $this->codeStyledPrinter = $codeStyledPrinter; $this->nodeTraverser = $nodeTraverser; diff --git a/src/Console/Command/ReconstructCommand.php b/src/Console/Command/ReconstructCommand.php index 832a7a4b66b..76991593bd5 100644 --- a/src/Console/Command/ReconstructCommand.php +++ b/src/Console/Command/ReconstructCommand.php @@ -17,6 +17,11 @@ final class ReconstructCommand extends Command */ private const NAME = 'reconstruct'; + /** + * @var string + */ + private const ARGUMENT_SOURCE_NAME = 'source'; + /** * @var FileProcessor */ @@ -29,11 +34,6 @@ final class ReconstructCommand extends Command parent::__construct(); } - /** - * @var string - */ - private const ARGUMENT_SOURCE_NAME = 'source'; - protected function configure(): void { $this->setName(self::NAME); diff --git a/src/Contract/Deprecation/DeprecationInterface.php b/src/Contract/Deprecation/DeprecationInterface.php new file mode 100644 index 00000000000..a2bbc3eaeb9 --- /dev/null +++ b/src/Contract/Deprecation/DeprecationInterface.php @@ -0,0 +1,21 @@ +