From 426dc8b318f90ce0d7ec02571859d819a41dc57a Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 23 Mar 2017 16:48:28 +0100 Subject: [PATCH] BUGFIX: Define property where it's used * As we use it in parent class, define it there. --- .../Sniffs/LegacyClassnames/AbstractClassnameChecker.php | 9 +++++++++ .../Sniffs/LegacyClassnames/DocCommentSniff.php | 6 ------ .../Sniffs/LegacyClassnames/InlineCommentSniff.php | 6 ------ .../InstantiationWithMakeInstanceSniff.php | 6 ------ .../Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php | 6 ------ .../MissingVendorForPluginsAndModulesSniff.php | 6 ------ 6 files changed, 9 insertions(+), 30 deletions(-) diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php index 2e9896b..a13fe15 100644 --- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php +++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/AbstractClassnameChecker.php @@ -48,6 +48,15 @@ abstract class AbstractClassnameChecker implements PhpCsSniff */ protected $legacyMapping; + /** + * Used by some sniffs to keep original token for replacement. + * + * E.g. when Token itself is a whole inline comment, and we just want to replace the classname within. + * + * @var string + */ + protected $originalTokenContent = ''; + public function __construct() { $this->legacyMapping = Mapping::getInstance(); diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php index 7edd478..2a85c89 100644 --- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php +++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/DocCommentSniff.php @@ -35,12 +35,6 @@ class Typo3Update_Sniffs_LegacyClassnames_DocCommentSniff extends AbstractClassn */ public $allowedTags = ['@param', '@return', '@var']; - /** - * Original token content for reuse accross methods. - * @var string - */ - protected $originalTokenContent = ''; - /** * Returns the token types that this sniff is interested in. * diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php index fcf9229..dc9c17d 100644 --- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php +++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InlineCommentSniff.php @@ -27,12 +27,6 @@ use Typo3Update\Sniffs\LegacyClassnames\AbstractClassnameChecker; */ class Typo3Update_Sniffs_LegacyClassnames_InlineCommentSniff extends AbstractClassnameChecker { - /** - * Original token content for reuse accross methods. - * @var string - */ - protected $originalTokenContent = ''; - /** * Returns the token types that this sniff is interested in. * diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php index 169716e..7e06b6b 100644 --- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php +++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/InstantiationWithMakeInstanceSniff.php @@ -30,12 +30,6 @@ class Typo3Update_Sniffs_LegacyClassnames_InstantiationWithMakeInstanceSniff ext { use \Typo3Update\Sniffs\ExtendedPhpCsSupportTrait; - /** - * Original token content for reuse accross methods. - * @var string - */ - protected $originalTokenContent = ''; - /** * Returns the token types that this sniff is interested in. * diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php index b169ac4..b4a2f30 100644 --- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php +++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/IsACallSniff.php @@ -29,12 +29,6 @@ class Typo3Update_Sniffs_LegacyClassnames_IsACallSniff extends AbstractClassname { use \Typo3Update\Sniffs\ExtendedPhpCsSupportTrait; - /** - * Original token content for reuse accross methods. - * @var string - */ - protected $originalTokenContent = ''; - /** * Returns the token types that this sniff is interested in. * diff --git a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/MissingVendorForPluginsAndModulesSniff.php b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/MissingVendorForPluginsAndModulesSniff.php index 4c76a90..3f2825f 100644 --- a/src/Standards/Typo3Update/Sniffs/LegacyClassnames/MissingVendorForPluginsAndModulesSniff.php +++ b/src/Standards/Typo3Update/Sniffs/LegacyClassnames/MissingVendorForPluginsAndModulesSniff.php @@ -31,12 +31,6 @@ class Typo3Update_Sniffs_LegacyClassnames_MissingVendorForPluginsAndModulesSniff use \Typo3Update\Sniffs\ExtendedPhpCsSupportTrait; use \Typo3Update\Sniffs\OptionsAccessTrait; - /** - * Original token content for reuse accross methods. - * @var string - */ - protected $originalTokenContent = ''; - /** * Returns the token types that this sniff is interested in. *