Skip to content

Fix parse return type declarations #212

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

Merged
merged 2 commits into from
Jul 4, 2018
Merged

Fix parse return type declarations #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c04e0ae
fixes typo.
nojimage Jul 4, 2018
25e7c77
fix parse return type declarations. #211
nojimage Jul 4, 2018
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
2 changes: 1 addition & 1 deletion CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
// Is this a return type declarations?
if ($tokens[$nextPtr]['code'] === T_OPEN_CURLY_BRACKET) {
$prevPtrReturnType = $phpcsFile->findPrevious(array(T_WHITESPACE, T_INLINE_THEN), ($stackPtr - 1), null, true);
if ($tokens[$prevPtrReturnType]['code'] === T_COLON) {
if (in_array($tokens[$prevPtrReturnType]['code'], array(T_COLON, T_INLINE_ELSE), true)) {
return;
}
}
Expand Down
12 changes: 11 additions & 1 deletion CakePHP/tests/files/return_type_declaration_pass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ public function returnTypeVoid() : void {
*
* @return string|null
*/
public unction returnTypeNull() : ?string {
public function returnTypeNull() : ?string {
}

/**
* A function with param
*
* @param int $firstParam a first param
* @param string $secondParam a second param
* @return int
*/
public function withParam(int $firstParam, string $secondParam) : int {
}

}