Skip to content

FEATURE: Allow PHP 7 type declaration #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielSiepmann wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

FEATURE: Allow PHP 7 type declaration #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664469e
FEATURE: Allow PHP 7 type declaration
Jul 28, 2016
ff938b1
BUGFIX: Allow @return for yield
Aug 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Sniffs/Commenting/FunctionCommentSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ protected function processReturn(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $co
// somewhere in the function that returns something.
if (isset($tokens[$stackPtr]['scope_closer']) === true) {
$endToken = $tokens[$stackPtr]['scope_closer'];
$returnToken = $phpcsFile->findNext(T_RETURN, $stackPtr, $endToken);
$returnToken = $phpcsFile->findNext([T_RETURN, T_YIELD], $stackPtr, $endToken);
if ($returnToken === false) {
$error = 'Function return type is not void, but function has no return statement';
$phpcsFile->addError($error, $return, 'InvalidNoReturn');
Expand Down Expand Up @@ -380,6 +380,14 @@ protected function processParams(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $co
$suggestedTypeHint = '';
if (strpos($suggestedName, 'array') !== false) {
$suggestedTypeHint = 'array';
} else if (strpos($suggestedName, 'string') !== false) {
$suggestedTypeHint = 'string';
} else if (strpos($suggestedName, 'int') !== false) {
$suggestedTypeHint = 'int';
} else if (strpos($suggestedName, 'bool') !== false) {
$suggestedTypeHint = 'bool';
} else if (strpos($suggestedName, 'float') !== false) {
$suggestedTypeHint = 'float';
} else if (strpos($suggestedName, 'callable') !== false) {
$suggestedTypeHint = 'callable';
// TODO: AllowedTypes are the long version but we only allow the short version.
Expand Down