fix return types

Author: junaid-travelopia

Travelopia-WordPress/Sniffs/Functions/FunctionReturnTypeSniff.php

@@ -9,6 +9,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Sniff to check if functions have a return type.
@@ -45,10 +46,26 @@ public function process( File $phpcsFile, $stackPtr ): void
 			return;
 		}
 
-		// Get return type.
-		$next_return_type = $phpcsFile->findNext( [ T_COLON ], $stackPtr );
+		// Find the closing parenthesis of the function parameters.
+		$open_parenthesis = $phpcsFile->findNext( [ T_OPEN_PARENTHESIS ], $stackPtr );
 
-		if ( ! is_int( $next_return_type ) || $tokens[ $next_return_type ]['line'] !== $tokens[ $stackPtr ]['line'] ) {
+		if ( false === $open_parenthesis || ! isset( $tokens[ $open_parenthesis ]['parenthesis_closer'] ) ) {
+			return;
+		}
+
+		$close_parenthesis = $tokens[ $open_parenthesis ]['parenthesis_closer'];
+
+		// Find the opening brace of the function body (or semicolon for abstract/interface methods).
+		$scope_opener = $phpcsFile->findNext( array_merge( Tokens::$scopeOpeners, [ T_SEMICOLON ] ), $close_parenthesis );
+
+		if ( false === $scope_opener ) {
+			return;
+		}
+
+		// Check if there's a colon between the closing parenthesis and the scope opener.
+		$return_type_colon = $phpcsFile->findNext( [ T_COLON ], $close_parenthesis, $scope_opener );
+
+		if ( false === $return_type_colon ) {
 			$phpcsFile->addWarningOnLine(
 				'Functions must have a return type.',
 				$tokens[ $stackPtr ]['line'],

php-cs-fixer/Fixers/CommentPunctuationFixer.php

@@ -120,7 +120,7 @@ private function fixDocBlockComment( Tokens $tokens, int $index ): void
 		// Check if this DocBlock contains WordPress template headers.
 		if ( preg_match( '/\* (Template Name|Template Post Type|Plugin Name|Theme Name|Author|Version|Description|Text Domain|Domain Path|Requires at least|Requires PHP|License|License URI|Tags):[^\n]+\.\s*$/im', $content ) ) {
 			// Remove trailing period from WordPress headers.
-			$newContent = preg_replace( '/(\* (?:Template Name|Template Post Type|Plugin Name|Theme Name|Author|Version|Description|Text Domain|Domain Path|Requires at least|Requires PHP|License|License URI|Tags):[^\n]+)\.\s*$/im', '$1', $content );
+			$newContent       = preg_replace( '/(\* (?:Template Name|Template Post Type|Plugin Name|Theme Name|Author|Version|Description|Text Domain|Domain Path|Requires at least|Requires PHP|License|License URI|Tags):[^\n]+)\.\s*$/im', '$1', $content );
 			$tokens[ $index ] = new Token( [ T_DOC_COMMENT, $newContent ] );
 		}
 	}

php-cs-fixer/TravelopiaFixersConfig.php

@@ -95,6 +95,9 @@ public static function getRules(): array
 			// Nullable type declaration.
 			'nullable_type_declaration_for_default_null_value' => true,
 
+			// Add void return type to functions that don't return anything.
+			'void_return' => true,
+
 			// Array syntax.
 			'array_syntax' => [
 				'syntax' => 'short',