Merge pull request #416 from cakephp/5.x-fix-error

dereuromark · web-flow · commit 3c62979556e9 · 2025-06-07T19:04:07.000+02:00
fix error with change in slevomat/coding-standard 8.19.0
diff --git a/CakePHP/Sniffs/Classes/ReturnTypeHintSniff.php b/CakePHP/Sniffs/Classes/ReturnTypeHintSniff.php
@@ -228,7 +228,10 @@ protected function getClassNameWithNamespace(File $phpCsFile): ?string
             return null;
         }
 
-        $classPointer = $phpCsFile->findPrevious(TokenHelper::$typeKeywordTokenCodes, $lastToken);
+        $classPointer = $phpCsFile->findPrevious(
+            [T_CLASS, T_TRAIT, T_INTERFACE, T_ENUM],
+            $lastToken,
+        );
         if (!$classPointer) {
             return null;
         }

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,10 @@ protected function getClassNameWithNamespace(File $phpCsFile): ?string`
`228`	`228`	`return null;`
`229`	`229`	`}`
`230`	`230`
`231`		`- $classPointer = $phpCsFile->findPrevious(TokenHelper::$typeKeywordTokenCodes, $lastToken);`
	`231`	`+ $classPointer = $phpCsFile->findPrevious(`
	`232`	`+ [T_CLASS, T_TRAIT, T_INTERFACE, T_ENUM],`
	`233`	`+ $lastToken,`
	`234`	`+ );`
`232`	`235`	`if (!$classPointer) {`
`233`	`236`	`return null;`
`234`	`237`	`}`