Merge pull request #8 from DanielSiepmann/feature/5-typehints

Feature/5 typehints
This commit is contained in:
Daniel Hürtgen 2017-03-07 17:27:34 +01:00 committed by GitHub
commit c20662cb4a
2 changed files with 70 additions and 6 deletions

View file

@ -35,10 +35,10 @@ class Typo3Update_Sniffs_LegacyClassnames_DocCommentSniff implements PHP_CodeSni
protected $allowedTags = ['@param', '@return', '@var']; protected $allowedTags = ['@param', '@return', '@var'];
/** /**
* Original token for reuse accross methods. * Original token content for reuse accross methods.
* @var array * @var string
*/ */
protected $originalToken = []; protected $originalTokenContent = '';
/** /**
* Returns the token types that this sniff is interested in. * Returns the token types that this sniff is interested in.
@ -73,20 +73,19 @@ class Typo3Update_Sniffs_LegacyClassnames_DocCommentSniff implements PHP_CodeSni
} }
$classname = explode(' ', $tokens[$classnamePosition]['content'])[0]; $classname = explode(' ', $tokens[$classnamePosition]['content'])[0];
$this->originalToken = $tokens[$classnamePosition]['content']; $this->originalTokenContent = $tokens[$classnamePosition]['content'];
$this->addFixableError($phpcsFile, $classnamePosition, $classname); $this->addFixableError($phpcsFile, $classnamePosition, $classname);
} }
/** /**
* As token contains more then just class name, we have to build new content ourself. * As token contains more then just class name, we have to build new content ourself.
* *
*
* @param string $classname * @param string $classname
* @return string * @return string
*/ */
public function getTokenForReplacement($classname) public function getTokenForReplacement($classname)
{ {
$token = explode(' ', $this->originalToken); $token = explode(' ', $this->originalTokenContent);
$token[0] = $classname; $token[0] = $classname;
return implode(' ', $token); return implode(' ', $token);

View file

@ -0,0 +1,65 @@
<?php
/*
* Copyright (C) 2017 Daniel Siepmann <coding@daniel-siepmann.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
use PHP_CodeSniffer_Tokens as Tokens;
/**
* Migrate Typehints in function / method definitions.
*/
class Typo3Update_Sniffs_LegacyClassnames_TypehintSniff implements PHP_CodeSniffer_Sniff
{
use \Typo3Update\Sniffs\LegacyClassnames\ClassnameCheckerTrait;
/**
* Returns the token types that this sniff is interested in.
*
* @return array<int>
*/
public function register()
{
return [T_FUNCTION];
}
/**
* Processes the tokens that this sniff is interested in.
*
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
* @param int $stackPtr The position in the stack where
* the token was found.
*
* @return void
*/
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
{
$params = $phpcsFile->getMethodParameters($stackPtr);
foreach ($params as $parameter) {
if ($parameter['type_hint'] === '') {
continue;
}
$position = $phpcsFile->findPrevious(T_STRING, $parameter['token'], $stackPtr, false, null, true);
if ($position === false) {
continue;
}
$this->addFixableError($phpcsFile, $position, $parameter['type_hint']);
}
}
}