Merge pull request #2291 from WordPress/feature/abstractarrayassignme…

…ntrestrictions-remove-callback-option

WordPress/AbstractArrayAssignmentRestrictionsSniff.php

@@ -96,10 +96,9 @@ public function register() {
 	 *
 	 * Example: groups => array(
 	 *  'groupname' => array(
-	 *      'type'     => 'error' | 'warning',
-	 *      'message'  => 'Descriptive error message. The error message will be passed the $key and $val of the current array assignment.',
-	 *      'keys'     => array( 'key1', 'another_key' ),
-	 *      'callback' => array( 'class', 'method' ), // Optional.
+	 *      'type'    => 'error' | 'warning',
+	 *      'message' => 'Descriptive error message. The error message will be passed the $key and $val of the current array assignment.',
+	 *      'keys'    => array( 'key1', 'another_key' ),
 	 *  )
 	 * )
 	 *
@@ -220,14 +219,12 @@ public function process_token( $stackPtr ) {
 				continue;
 			}
 
-			$callback = ( isset( $group['callback'] ) && is_callable( $group['callback'] ) ) ? $group['callback'] : array( $this, 'callback' );
-
 			foreach ( $inst as $key => $assignment ) {
 				if ( ! \in_array( $key, $group['keys'], true ) ) {
 					continue;
 				}
 
-				$output = \call_user_func( $callback, $key, $assignment['value'], $assignment['line'], $group );
+				$output = \call_user_func( array( $this, 'callback' ), $key, $assignment['value'], $assignment['line'], $group );
 
 				if ( ! isset( $output ) || false === $output ) {
 					continue;