Merge pull request #1837 from WordPress/feature/1792-controlstructure…

…spacing-closure-use-return-type ControlStructureSpacing: fix undefined index error
WordPress · Dec 6, 2019 · 370ae76 · 370ae76
2 parents eea3371 + 352a8b3
commit 370ae76
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -346,7 +346,8 @@ public function process_token( $stackPtr ) {
 				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
 					&& ! ( // Do NOT flag : immediately following ) for return types declarations.
 						\T_COLON === $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-						&& in_array( $this->tokens[ $this->tokens[ $parenthesisCloser ]['parenthesis_owner'] ]['code'], array( \T_FUNCTION, \T_CLOSURE ), true )
+						&& ( isset( $this->tokens[ $parenthesisCloser ]['parenthesis_owner'] ) === false
+							|| in_array( $this->tokens[ $this->tokens[ $parenthesisCloser ]['parenthesis_owner'] ]['code'], array( \T_FUNCTION, \T_CLOSURE ), true ) )
 					)
 					&& ( isset( $scopeOpener ) && \T_COLON !== $this->tokens[ $scopeOpener ]['code'] )
 				) {

diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc
@@ -290,3 +290,18 @@ $returntype = function ( string $input ): string {}; // Ok.
 $returntype = function ( string $input ) : string {}; // Ok.
 $returntype = function ( string $input, array $inputs ): string {}; // Ok.
 $returntype = function ( string $input, array $inputs ) : string {}; // Ok.
+
+// Issue 1792.
+$matching_options = array_filter(
+	$imported_options,
+	function ( $option ) use ( $option_id ): bool {
+		return $option['id'] === $option_id;
+	}
+);
+
+$matching_options = array_filter(
+	$imported_options,
+	function ( $option ) use ( $option_id ) : bool {
+		return $option['id'] === $option_id;
+	}
+);
diff --git a/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed b/WordPress/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed
@@ -279,3 +279,18 @@ $returntype = function ( string $input ): string {}; // Ok.
 $returntype = function ( string $input ) : string {}; // Ok.
 $returntype = function ( string $input, array $inputs ): string {}; // Ok.
 $returntype = function ( string $input, array $inputs ) : string {}; // Ok.
+
+// Issue 1792.
+$matching_options = array_filter(
+	$imported_options,
+	function ( $option ) use ( $option_id ): bool {
+		return $option['id'] === $option_id;
+	}
+);
+
+$matching_options = array_filter(
+	$imported_options,
+	function ( $option ) use ( $option_id ) : bool {
+		return $option['id'] === $option_id;
+	}
+);