gravityview / GravityView

includes/load-plugin-and-theme-hooks.php

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
 $plugin_hooks_files = glob( $include_path . 'class-gravityview-plugin-hooks-*.php' );
 
 // Load all plugin files automatically
-foreach ( (array) $plugin_hooks_files as $plugin_hooks_file ) {
+foreach ( (array)$plugin_hooks_files as $plugin_hooks_file ) {
 	include $plugin_hooks_file;
 }
 
 $theme_hooks_files = glob( $include_path . 'class-gravityview-theme-hooks-*.php' );
 
 // Load all theme files automatically
-foreach ( (array) $theme_hooks_files as $theme_hooks_file ) {
+foreach ( (array)$theme_hooks_files as $theme_hooks_file ) {
 	include $theme_hooks_file;
 }

includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
 
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
 
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	function filter_gravityview_back_link( $link ) {
 		global $wpml_url_filters;
 
-		if( $wpml_url_filters ) {
+		if ( $wpml_url_filters ) {
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
 		}
 
@@ -101,7 +101,7 @@ 
 	private function remove_url_hooks() {
 		global $wpml_url_filters;
 
-		if( ! $wpml_url_filters ) {
+		if ( ! $wpml_url_filters ) {
 			return;
 		}
 
@@ -129,7 +129,7 @@ 
 	private function add_url_hooks() {
 		global $wpml_url_filters;
 
-		if( ! $wpml_url_filters ) {
+		if ( ! $wpml_url_filters ) {
 			return;
 		}
 
@@ -226,7 +226,7 @@ 
 					break;
 			}
 
-			$languages[ $lang_code ]['url'] = $entry_link;
+			$languages[ $lang_code ][ 'url' ] = $entry_link;
 		}
 
 		$this->add_url_hooks();

future/includes/class-gv-settings-addon.php

Doc Comments +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 	 *
 	 * @param array $items Styles to exclude from no-conflict
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function register_no_conflict( $items ) {
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -421,7 +421,7 @@
     </header>
     <div class="gform-settings-panel__content" style="padding: 0 1rem 1.25rem">
 
-HTML;
+html;
 		} else {
 			echo '<div class="gv-uninstall-form-wrapper" style="font-size: 110%; padding: 15px 0;">';
 		}

Spacing +47 added lines, -47 removed lines

@@ -118,7 +118,7 @@ 
 		$setting_tabs = parent::get_app_settings_tabs();
 
 		foreach ( $setting_tabs as &$tab ) {
-			if ( 'uninstall' !== $tab['name'] ) {
+			if ( 'uninstall' !== $tab[ 'name' ] ) {
 				continue;
 			}
 
@@ -129,7 +129,7 @@ 
 			}
 
 			// Add trash can icon to resemble the look and feel of the GF Settings page
-			$tab['icon'] = 'dashicons-trash';
+			$tab[ 'icon' ] = 'dashicons-trash';
 		}
 
 		return array_filter( $setting_tabs );
@@ -144,8 +144,8 @@ 
 	 */
 	public function register_no_conflict( $items ) {
 
-		$items[] = 'gform_settings';
-		$items[] = 'gv-admin-edd-license';
+		$items[ ] = 'gform_settings';
+		$items[ ] = 'gv-admin-edd-license';
 
 		return $items;
 	}
@@ -196,7 +196,7 @@ 
 
 		$href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) );
 
-		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
+		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
 
 		$html .= $uninstall_button;
 
@@ -215,10 +215,10 @@ 
 	 */
 	public function settings_save( $field, $echo = true ) {
 
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = 'button button-primary primary button-hero';
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = 'button button-primary primary button-hero';
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
 
 		$html = $this->as_html( $field, false );
 
@@ -240,8 +240,8 @@ 
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
-		$setting_tabs[0]['icon']  = 'dashicons-admin-settings';
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
+		$setting_tabs[ 0 ][ 'icon' ]  = 'dashicons-admin-settings';
 
 		return $setting_tabs;
 	}
@@ -489,7 +489,7 @@ 
 					$i = 0;
 					while ( $i < 11 ) {
 						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
-						$i ++;
+						$i++;
 					}
 					?>
 				</ul>
@@ -693,14 +693,14 @@ 
 	 */
 	public function as_html( $field, $echo = true ) {
 
-		$field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit', 'reset', 'button' ) ) ) ? $field['type'] : 'submit';
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
 
 		$attributes    = $this->get_field_attributes( $field );
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
-		$value         = $this->get( $field['name'], $default_value );
+		$value         = $this->get( $field[ 'name' ], $default_value );
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary primary gfbutton';
-		$name                = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton';
+		$name                = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -709,7 +709,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 				implode( ' ', $attributes ) .
@@ -743,7 +743,7 @@ 
 	 */
 	public function is_save_postback() {
 
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 				'handle'  => 'gform_tooltip_init',
 				'enqueue' => array(
 						array(
@@ -876,7 +876,7 @@ 
 
 		$styles = parent::styles();
 
-		$styles[] = array(
+		$styles[ ] = array(
 				'handle'  => 'gravityview_settings',
 				'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 				'version' => Plugin::$version,
@@ -967,7 +967,7 @@ 
 						'name'          => 'support-email',
 						'type'          => 'text',
 						'validate'      => 'email',
-						'default_value' => $default_settings['support-email'],
+						'default_value' => $default_settings[ 'support-email' ],
 						'label'         => __( 'Support Email', 'gravityview' ),
 						'description'   => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 						'class'         => 'code regular-text',
@@ -979,7 +979,7 @@ 
 						'name'          => 'support_port',
 						'type'          => 'radio',
 						'label'         => __( 'Show Support Port?', 'gravityview' ),
-						'default_value' => $default_settings['support_port'],
+						'default_value' => $default_settings[ 'support_port' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -998,7 +998,7 @@ 
 						'name'          => 'no-conflict-mode',
 						'type'          => 'radio',
 						'label'         => __( 'No-Conflict Mode', 'gravityview' ),
-						'default_value' => $default_settings['no-conflict-mode'],
+						'default_value' => $default_settings[ 'no-conflict-mode' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -1020,7 +1020,7 @@ 
 								'name'          => 'rest_api',
 								'type'          => 'radio',
 								'label'         => __( 'REST API', 'gravityview' ),
-								'default_value' => $default_settings['rest_api'],
+								'default_value' => $default_settings[ 'rest_api' ],
 								'horizontal'    => 1,
 								'choices'       => array(
 										array(
@@ -1039,7 +1039,7 @@ 
 					'name' => 'powered_by',
 					'type' => 'checkbox',
 					'label' => __( 'Display "Powered By" Link', 'gravityview' ),
-					'default_value' => $default_settings['powered_by'],
+					'default_value' => $default_settings[ 'powered_by' ],
 					'choices' => array(
 						array(
 							'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ),
@@ -1064,7 +1064,7 @@ 
 						'name'          => 'beta',
 						'type'          => 'checkbox',
 						'label'         => __( 'Become a Beta Tester', 'gravityview' ),
-						'default_value' => $default_settings['beta'],
+						'default_value' => $default_settings[ 'beta' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -1098,17 +1098,17 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
 
 			if ( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 
-			if ( empty( $field['disabled'] ) ) {
-				unset( $field['disabled'] );
+			if ( empty( $field[ 'disabled' ] ) ) {
+				unset( $field[ 'disabled' ] );
 			}
 		}
 
@@ -1120,23 +1120,23 @@ 
 					'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
 					'type' => 'edd_license',
 					'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
-					'default_value' => $default_settings['license_key'],
+					'default_value' => $default_settings[ 'license_key' ],
 					'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 					'name' => 'license_key_response',
-					'default_value' => $default_settings['license_key_response'],
+					'default_value' => $default_settings[ 'license_key_response' ],
 					'type' => 'hidden',
 			),
 			array(
 					'name' => 'license_key_status',
-					'default_value' => $default_settings['license_key_status'],
+					'default_value' => $default_settings[ 'license_key_status' ],
 					'type' => 'hidden',
 			),
 		);
 
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-			$license_fields[0] = array_merge( $license_fields[0], array(
+			$license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array(
 				'disabled' => true,
 				'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
 			) );
@@ -1147,7 +1147,7 @@ 
 
 		if ( \gravityview()->plugin->is_GF_25() ) {
 
-			$sections[] = array(
+			$sections[ ] = array(
 					'title'       => __( 'GravityView License', 'gravityview' ),
 					'class'       => 'gform-settings-panel--full gv-settings-panel--license',
 					'description' => $version_info,
@@ -1165,7 +1165,7 @@ 
 			) );
 		}
 
-		$sections[] = array(
+		$sections[ ] = array(
 			'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
 			'class' => 'gform-settings-panel--full gv-settings-panel--core',
 			'fields'      => $fields,
@@ -1189,8 +1189,8 @@ 
 
 			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
@@ -1256,7 +1256,7 @@ 
 	public function settings_edd_license( $field, $echo = true ) {
 
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-			$field['input_type'] = 'password';
+			$field[ 'input_type' ] = 'password';
 		}
 
 		$text = $this->settings_text( $field, false );
@@ -1308,7 +1308,7 @@ 
 
 		?>
 
-		<tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
 			<td colspan="2">
 				<?php $this->single_setting( $field ); ?>
 			</td>
@@ -1334,8 +1334,8 @@ 
 	 */
 	public function single_setting_row( $field ) {
 
-		$field['gv_description'] = Utils::get( $field, 'description' );
-		$field['description']    = Utils::get( $field, 'subtitle' );
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
 		parent::single_setting_row( $field );
 	}
 
@@ -1396,8 +1396,8 @@ 
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
 
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
 
 			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 

vendor/phpcompatibility/php-compatibility/PHPCompatibility/AbstractFunctionCallParameterSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

Indentation +153 added lines, -153 removed lines

@@ -24,157 +24,157 @@
  */
 abstract class AbstractFunctionCallParameterSniff extends Sniff
 {
-    /**
-     * Is the sniff looking for a function call or a method call ?
-     *
-     * Note: the child class may need to do additional checks to make sure that
-     * the method called is of the right class/object.
-     * Checking that is outside of the scope of this abstract sniff.
-     *
-     * @var bool False (default) if the sniff is looking for function calls.
-     *           True if the sniff is looking for method calls.
-     */
-    protected $isMethod = false;
-
-    /**
-     * Functions the sniff is looking for. Should be defined in the child class.
-     *
-     * @var array The only requirement for this array is that the top level
-     *            array keys are the names of the functions you're looking for.
-     *            Other than that, the array can have arbitrary content
-     *            depending on your needs.
-     */
-    protected $targetFunctions = array();
-
-    /**
-     * List of tokens which when they preceed the $stackPtr indicate that this
-     * is not a function call.
-     *
-     * @var array
-     */
-    private $ignoreTokens = array(
-        \T_DOUBLE_COLON    => true,
-        \T_OBJECT_OPERATOR => true,
-        \T_FUNCTION        => true,
-        \T_NEW             => true,
-        \T_CONST           => true,
-        \T_USE             => true,
-    );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        // Handle case-insensitivity of function names.
-        $this->targetFunctions = $this->arrayKeysToLowercase($this->targetFunctions);
-
-        return array(\T_STRING);
-    }
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in
-     *                                         the stack passed in $tokens.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->bowOutEarly() === true) {
-            return;
-        }
-
-        $tokens     = $phpcsFile->getTokens();
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
-
-        if (isset($this->targetFunctions[$functionLc]) === false) {
-            return;
-        }
-
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-
-        if ($this->isMethod === true) {
-            if ($tokens[$prevNonEmpty]['code'] !== \T_DOUBLE_COLON
-                && $tokens[$prevNonEmpty]['code'] !== \T_OBJECT_OPERATOR
-            ) {
-                // Not a call to a PHP method.
-                return;
-            }
-        } else {
-            if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
-                // Not a call to a PHP function.
-                return;
-            }
-
-            if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR
-                && $tokens[$prevNonEmpty - 1]['code'] === \T_STRING
-            ) {
-                // Namespaced function.
-                return;
-            }
-        }
-
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
-
-        if (empty($parameters)) {
-            return $this->processNoParameters($phpcsFile, $stackPtr, $function);
-        } else {
-            return $this->processParameters($phpcsFile, $stackPtr, $function, $parameters);
-        }
-    }
-
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * If the check done in a child class is not specific to one PHP version,
-     * this function should return `false`.
-     *
-     * @return bool
-     */
-    abstract protected function bowOutEarly();
-
-
-    /**
-     * Process the parameters of a matched function.
-     *
-     * This method has to be made concrete in child classes.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile    The file being scanned.
-     * @param int                   $stackPtr     The position of the current token in the stack.
-     * @param string                $functionName The token content (function name) which was matched.
-     * @param array                 $parameters   Array with information about the parameters.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    abstract public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters);
-
-
-    /**
-     * Process the function if no parameters were found.
-     *
-     * Defaults to doing nothing. Can be overloaded in child classes to handle functions
-     * were parameters are expected, but none found.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile    The file being scanned.
-     * @param int                   $stackPtr     The position of the current token in the stack.
-     * @param string                $functionName The token content (function name) which was matched.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
-    {
-        return;
-    }
+	/**
+	 * Is the sniff looking for a function call or a method call ?
+	 *
+	 * Note: the child class may need to do additional checks to make sure that
+	 * the method called is of the right class/object.
+	 * Checking that is outside of the scope of this abstract sniff.
+	 *
+	 * @var bool False (default) if the sniff is looking for function calls.
+	 *           True if the sniff is looking for method calls.
+	 */
+	protected $isMethod = false;
+
+	/**
+	 * Functions the sniff is looking for. Should be defined in the child class.
+	 *
+	 * @var array The only requirement for this array is that the top level
+	 *            array keys are the names of the functions you're looking for.
+	 *            Other than that, the array can have arbitrary content
+	 *            depending on your needs.
+	 */
+	protected $targetFunctions = array();
+
+	/**
+	 * List of tokens which when they preceed the $stackPtr indicate that this
+	 * is not a function call.
+	 *
+	 * @var array
+	 */
+	private $ignoreTokens = array(
+		\T_DOUBLE_COLON    => true,
+		\T_OBJECT_OPERATOR => true,
+		\T_FUNCTION        => true,
+		\T_NEW             => true,
+		\T_CONST           => true,
+		\T_USE             => true,
+	);
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		// Handle case-insensitivity of function names.
+		$this->targetFunctions = $this->arrayKeysToLowercase($this->targetFunctions);
+
+		return array(\T_STRING);
+	}
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in
+	 *                                         the stack passed in $tokens.
+	 *
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->bowOutEarly() === true) {
+			return;
+		}
+
+		$tokens     = $phpcsFile->getTokens();
+		$function   = $tokens[$stackPtr]['content'];
+		$functionLc = strtolower($function);
+
+		if (isset($this->targetFunctions[$functionLc]) === false) {
+			return;
+		}
+
+		$prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+
+		if ($this->isMethod === true) {
+			if ($tokens[$prevNonEmpty]['code'] !== \T_DOUBLE_COLON
+				&& $tokens[$prevNonEmpty]['code'] !== \T_OBJECT_OPERATOR
+			) {
+				// Not a call to a PHP method.
+				return;
+			}
+		} else {
+			if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
+				// Not a call to a PHP function.
+				return;
+			}
+
+			if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR
+				&& $tokens[$prevNonEmpty - 1]['code'] === \T_STRING
+			) {
+				// Namespaced function.
+				return;
+			}
+		}
+
+		$parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
+
+		if (empty($parameters)) {
+			return $this->processNoParameters($phpcsFile, $stackPtr, $function);
+		} else {
+			return $this->processParameters($phpcsFile, $stackPtr, $function, $parameters);
+		}
+	}
+
+
+	/**
+	 * Do a version check to determine if this sniff needs to run at all.
+	 *
+	 * If the check done in a child class is not specific to one PHP version,
+	 * this function should return `false`.
+	 *
+	 * @return bool
+	 */
+	abstract protected function bowOutEarly();
+
+
+	/**
+	 * Process the parameters of a matched function.
+	 *
+	 * This method has to be made concrete in child classes.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile    The file being scanned.
+	 * @param int                   $stackPtr     The position of the current token in the stack.
+	 * @param string                $functionName The token content (function name) which was matched.
+	 * @param array                 $parameters   Array with information about the parameters.
+	 *
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	abstract public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters);
+
+
+	/**
+	 * Process the function if no parameters were found.
+	 *
+	 * Defaults to doing nothing. Can be overloaded in child classes to handle functions
+	 * were parameters are expected, but none found.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile    The file being scanned.
+	 * @param int                   $stackPtr     The position of the current token in the stack.
+	 * @param string                $functionName The token content (function name) which was matched.
+	 *
+	 * @return int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
+	{
+		return;
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -70,9 +70,9 @@ 
     public function register()
     {
         // Handle case-insensitivity of function names.
-        $this->targetFunctions = $this->arrayKeysToLowercase($this->targetFunctions);
+        $this->targetFunctions = $this->arrayKeysToLowercase( $this->targetFunctions );
 
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
 
@@ -86,49 +86,49 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->bowOutEarly() === true) {
+        if ( $this->bowOutEarly() === true ) {
             return;
         }
 
         $tokens     = $phpcsFile->getTokens();
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
+        $function   = $tokens[ $stackPtr ][ 'content' ];
+        $functionLc = strtolower( $function );
 
-        if (isset($this->targetFunctions[$functionLc]) === false) {
+        if ( isset( $this->targetFunctions[ $functionLc ] ) === false ) {
             return;
         }
 
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $prevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
-        if ($this->isMethod === true) {
-            if ($tokens[$prevNonEmpty]['code'] !== \T_DOUBLE_COLON
-                && $tokens[$prevNonEmpty]['code'] !== \T_OBJECT_OPERATOR
+        if ( $this->isMethod === true ) {
+            if ( $tokens[ $prevNonEmpty ][ 'code' ] !== \T_DOUBLE_COLON
+                && $tokens[ $prevNonEmpty ][ 'code' ] !== \T_OBJECT_OPERATOR
             ) {
                 // Not a call to a PHP method.
                 return;
             }
         } else {
-            if (isset($this->ignoreTokens[$tokens[$prevNonEmpty]['code']]) === true) {
+            if ( isset( $this->ignoreTokens[ $tokens[ $prevNonEmpty ][ 'code' ] ] ) === true ) {
                 // Not a call to a PHP function.
                 return;
             }
 
-            if ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR
-                && $tokens[$prevNonEmpty - 1]['code'] === \T_STRING
+            if ( $tokens[ $prevNonEmpty ][ 'code' ] === \T_NS_SEPARATOR
+                && $tokens[ $prevNonEmpty - 1 ][ 'code' ] === \T_STRING
             ) {
                 // Namespaced function.
                 return;
             }
         }
 
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
+        $parameters = $this->getFunctionCallParameters( $phpcsFile, $stackPtr );
 
-        if (empty($parameters)) {
-            return $this->processNoParameters($phpcsFile, $stackPtr, $function);
+        if ( empty( $parameters ) ) {
+            return $this->processNoParameters( $phpcsFile, $stackPtr, $function );
         } else {
-            return $this->processParameters($phpcsFile, $stackPtr, $function, $parameters);
+            return $this->processParameters( $phpcsFile, $stackPtr, $function, $parameters );
         }
     }
 
@@ -157,7 +157,7 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    abstract public function processParameters(File $phpcsFile, $stackPtr, $functionName, $parameters);
+    abstract public function processParameters( File $phpcsFile, $stackPtr, $functionName, $parameters );
 
 
     /**
@@ -173,7 +173,7 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
+    public function processNoParameters( File $phpcsFile, $stackPtr, $functionName )
     {
         return;
     }

Braces +4 added lines, -8 removed lines

@@ -22,8 +22,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-abstract class AbstractFunctionCallParameterSniff extends Sniff
-{
+abstract class AbstractFunctionCallParameterSniff extends Sniff {
     /**
      * Is the sniff looking for a function call or a method call ?
      *
@@ -67,8 +66,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         // Handle case-insensitivity of function names.
         $this->targetFunctions = $this->arrayKeysToLowercase($this->targetFunctions);
 
@@ -86,8 +84,7 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->bowOutEarly() === true) {
             return;
         }
@@ -173,8 +170,7 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName)
-    {
+    public function processNoParameters(File $phpcsFile, $stackPtr, $functionName) {
         return;
     }
 }

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -1016,7 +1016,7 @@
      * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
      * @param int                   $stackPtr  The position of the return type token.
      *
-     * @return string|false The name of the return type token.
+     * @return null|string The name of the return type token.
      */
     public function getReturnTypeHintName(File $phpcsFile, $stackPtr)
     {

Indentation +2036 added lines, -2036 removed lines

@@ -27,959 +27,959 @@ 
 abstract class Sniff implements PHPCS_Sniff
 {
 
-    const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
-
-    /**
-     * List of superglobals as an array of strings.
-     *
-     * Used by the ParameterShadowSuperGlobals and ForbiddenClosureUseVariableNames sniffs.
-     *
-     * @var array
-     */
-    protected $superglobals = array(
-        '$GLOBALS'  => true,
-        '$_SERVER'  => true,
-        '$_GET'     => true,
-        '$_POST'    => true,
-        '$_FILES'   => true,
-        '$_COOKIE'  => true,
-        '$_SESSION' => true,
-        '$_REQUEST' => true,
-        '$_ENV'     => true,
-    );
-
-    /**
-     * List of functions using hash algorithm as parameter (always the first parameter).
-     *
-     * Used by the new/removed hash algorithm sniffs.
-     * Key is the function name, value is the 1-based parameter position in the function call.
-     *
-     * @var array
-     */
-    protected $hashAlgoFunctions = array(
-        'hash_file'      => 1,
-        'hash_hmac_file' => 1,
-        'hash_hmac'      => 1,
-        'hash_init'      => 1,
-        'hash_pbkdf2'    => 1,
-        'hash'           => 1,
-    );
-
-
-    /**
-     * List of functions which take an ini directive as parameter (always the first parameter).
-     *
-     * Used by the new/removed ini directives sniffs.
-     * Key is the function name, value is the 1-based parameter position in the function call.
-     *
-     * @var array
-     */
-    protected $iniFunctions = array(
-        'ini_get' => 1,
-        'ini_set' => 1,
-    );
-
-
-    /**
-     * Get the testVersion configuration variable.
-     *
-     * The testVersion configuration variable may be in any of the following formats:
-     * 1) Omitted/empty, in which case no version is specified. This effectively
-     *    disables all the checks for new PHP features provided by this standard.
-     * 2) A single PHP version number, e.g. "5.4" in which case the standard checks that
-     *    the code will run on that version of PHP (no deprecated features or newer
-     *    features being used).
-     * 3) A range, e.g. "5.0-5.5", in which case the standard checks the code will run
-     *    on all PHP versions in that range, and that it doesn't use any features that
-     *    were deprecated by the final version in the list, or which were not available
-     *    for the first version in the list.
-     *    We accept ranges where one of the components is missing, e.g. "-5.6" means
-     *    all versions up to PHP 5.6, and "7.0-" means all versions above PHP 7.0.
-     * PHP version numbers should always be in Major.Minor format.  Both "5", "5.3.2"
-     * would be treated as invalid, and ignored.
-     *
-     * @return array $arrTestVersions will hold an array containing min/max version
-     *               of PHP that we are checking against (see above).  If only a
-     *               single version number is specified, then this is used as
-     *               both the min and max.
-     *
-     * @throws \PHP_CodeSniffer_Exception If testVersion is invalid.
-     */
-    private function getTestVersion()
-    {
-        static $arrTestVersions = array();
-
-        $default     = array(null, null);
-        $testVersion = trim(PHPCSHelper::getConfigData('testVersion'));
-
-        if (empty($testVersion) === false && isset($arrTestVersions[$testVersion]) === false) {
-
-            $arrTestVersions[$testVersion] = $default;
-
-            if (preg_match('`^\d+\.\d+$`', $testVersion)) {
-                $arrTestVersions[$testVersion] = array($testVersion, $testVersion);
-                return $arrTestVersions[$testVersion];
-            }
-
-            if (preg_match('`^(\d+\.\d+)?\s*-\s*(\d+\.\d+)?$`', $testVersion, $matches)) {
-                if (empty($matches[1]) === false || empty($matches[2]) === false) {
-                    // If no lower-limit is set, we set the min version to 4.0.
-                    // Whilst development focuses on PHP 5 and above, we also accept
-                    // sniffs for PHP 4, so we include that as the minimum.
-                    // (It makes no sense to support PHP 3 as this was effectively a
-                    // different language).
-                    $min = empty($matches[1]) ? '4.0' : $matches[1];
-
-                    // If no upper-limit is set, we set the max version to 99.9.
-                    $max = empty($matches[2]) ? '99.9' : $matches[2];
-
-                    if (version_compare($min, $max, '>')) {
-                        trigger_error(
-                            "Invalid range in testVersion setting: '" . $testVersion . "'",
-                            \E_USER_WARNING
-                        );
-                        return $default;
-                    } else {
-                        $arrTestVersions[$testVersion] = array($min, $max);
-                        return $arrTestVersions[$testVersion];
-                    }
-                }
-            }
-
-            trigger_error(
-                "Invalid testVersion setting: '" . $testVersion . "'",
-                \E_USER_WARNING
-            );
-            return $default;
-        }
-
-        if (isset($arrTestVersions[$testVersion])) {
-            return $arrTestVersions[$testVersion];
-        }
-
-        return $default;
-    }
-
-
-    /**
-     * Check whether a specific PHP version is equal to or higher than the maximum
-     * supported PHP version as provided by the user in `testVersion`.
-     *
-     * Should be used when sniffing for *old* PHP features (deprecated/removed).
-     *
-     * @param string $phpVersion A PHP version number in 'major.minor' format.
-     *
-     * @return bool True if testVersion has not been provided or if the PHP version
-     *              is equal to or higher than the highest supported PHP version
-     *              in testVersion. False otherwise.
-     */
-    public function supportsAbove($phpVersion)
-    {
-        $testVersion = $this->getTestVersion();
-        $testVersion = $testVersion[1];
-
-        if (\is_null($testVersion)
-            || version_compare($testVersion, $phpVersion) >= 0
-        ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * Check whether a specific PHP version is equal to or lower than the minimum
-     * supported PHP version as provided by the user in `testVersion`.
-     *
-     * Should be used when sniffing for *new* PHP features.
-     *
-     * @param string $phpVersion A PHP version number in 'major.minor' format.
-     *
-     * @return bool True if the PHP version is equal to or lower than the lowest
-     *              supported PHP version in testVersion.
-     *              False otherwise or if no testVersion is provided.
-     */
-    public function supportsBelow($phpVersion)
-    {
-        $testVersion = $this->getTestVersion();
-        $testVersion = $testVersion[0];
-
-        if (\is_null($testVersion) === false
-            && version_compare($testVersion, $phpVersion) <= 0
-        ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * Add a PHPCS message to the output stack as either a warning or an error.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file the message applies to.
-     * @param string                $message   The message.
-     * @param int                   $stackPtr  The position of the token
-     *                                         the message relates to.
-     * @param bool                  $isError   Whether to report the message as an
-     *                                         'error' or 'warning'.
-     *                                         Defaults to true (error).
-     * @param string                $code      The error code for the message.
-     *                                         Defaults to 'Found'.
-     * @param array                 $data      Optional input for the data replacements.
-     *
-     * @return void
-     */
-    public function addMessage(File $phpcsFile, $message, $stackPtr, $isError, $code = 'Found', $data = array())
-    {
-        if ($isError === true) {
-            $phpcsFile->addError($message, $stackPtr, $code, $data);
-        } else {
-            $phpcsFile->addWarning($message, $stackPtr, $code, $data);
-        }
-    }
-
-
-    /**
-     * Convert an arbitrary string to an alphanumeric string with underscores.
-     *
-     * Pre-empt issues with arbitrary strings being used as error codes in XML and PHP.
-     *
-     * @param string $baseString Arbitrary string.
-     *
-     * @return string
-     */
-    public function stringToErrorCode($baseString)
-    {
-        return preg_replace('`[^a-z0-9_]`i', '_', strtolower($baseString));
-    }
-
-
-    /**
-     * Strip quotes surrounding an arbitrary string.
-     *
-     * Intended for use with the contents of a T_CONSTANT_ENCAPSED_STRING / T_DOUBLE_QUOTED_STRING.
-     *
-     * @param string $string The raw string.
-     *
-     * @return string String without quotes around it.
-     */
-    public function stripQuotes($string)
-    {
-        return preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $string);
-    }
-
-
-    /**
-     * Strip variables from an arbitrary double quoted string.
-     *
-     * Intended for use with the contents of a T_DOUBLE_QUOTED_STRING.
-     *
-     * @param string $string The raw string.
-     *
-     * @return string String without variables in it.
-     */
-    public function stripVariables($string)
-    {
-        if (strpos($string, '$') === false) {
-            return $string;
-        }
-
-        return preg_replace(self::REGEX_COMPLEX_VARS, '', $string);
-    }
-
-
-    /**
-     * Make all top level array keys in an array lowercase.
-     *
-     * @param array $array Initial array.
-     *
-     * @return array Same array, but with all lowercase top level keys.
-     */
-    public function arrayKeysToLowercase($array)
-    {
-        return array_change_key_case($array, \CASE_LOWER);
-    }
-
-
-    /**
-     * Checks if a function call has parameters.
-     *
-     * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
-     * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-     *
-     * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer, it
-     * will detect whether the array has values or is empty.
-     *
-     * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/120
-     * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/152
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the function call token.
-     *
-     * @return bool
-     */
-    public function doesFunctionCallHaveParameters(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // Is this one of the tokens this function handles ?
-        if (\in_array($tokens[$stackPtr]['code'], array(\T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY, \T_VARIABLE), true) === false) {
-            return false;
-        }
-
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-
-        // Deal with short array syntax.
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            if (isset($tokens[$stackPtr]['bracket_closer']) === false) {
-                return false;
-            }
-
-            if ($nextNonEmpty === $tokens[$stackPtr]['bracket_closer']) {
-                // No parameters.
-                return false;
-            } else {
-                return true;
-            }
-        }
-
-        // Deal with function calls & long arrays.
-        // Next non-empty token should be the open parenthesis.
-        if ($nextNonEmpty === false && $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
-            return false;
-        }
-
-        if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
-            return false;
-        }
-
-        $closeParenthesis = $tokens[$nextNonEmpty]['parenthesis_closer'];
-        $nextNextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $nextNonEmpty + 1, $closeParenthesis + 1, true);
-
-        if ($nextNextNonEmpty === $closeParenthesis) {
-            // No parameters.
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Count the number of parameters a function call has been passed.
-     *
-     * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
-     * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-     *
-     * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
-     * it will return the number of values in the array.
-     *
-     * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/111
-     * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/114
-     * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/151
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the function call token.
-     *
-     * @return int
-     */
-    public function getFunctionCallParameterCount(File $phpcsFile, $stackPtr)
-    {
-        if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
-            return 0;
-        }
-
-        return \count($this->getFunctionCallParameters($phpcsFile, $stackPtr));
-    }
-
-
-    /**
-     * Get information on all parameters passed to a function call.
-     *
-     * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
-     * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-     *
-     * Will return an multi-dimentional array with the start token pointer, end token
-     * pointer and raw parameter value for all parameters. Index will be 1-based.
-     * If no parameters are found, will return an empty array.
-     *
-     * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
-     * it will tokenize the values / key/value pairs contained in the array call.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the function call token.
-     *
-     * @return array
-     */
-    public function getFunctionCallParameters(File $phpcsFile, $stackPtr)
-    {
-        if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
-            return array();
-        }
-
-        // Ok, we know we have a T_STRING, T_VARIABLE, T_ARRAY or T_OPEN_SHORT_ARRAY with parameters
-        // and valid open & close brackets/parenthesis.
-        $tokens = $phpcsFile->getTokens();
-
-        // Mark the beginning and end tokens.
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            $opener = $stackPtr;
-            $closer = $tokens[$stackPtr]['bracket_closer'];
-
-            $nestedParenthesisCount = 0;
-
-        } else {
-            $opener = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-            $closer = $tokens[$opener]['parenthesis_closer'];
-
-            $nestedParenthesisCount = 1;
-        }
-
-        // Which nesting level is the one we are interested in ?
-        if (isset($tokens[$opener]['nested_parenthesis'])) {
-            $nestedParenthesisCount += \count($tokens[$opener]['nested_parenthesis']);
-        }
-
-        $parameters = array();
-        $nextComma  = $opener;
-        $paramStart = $opener + 1;
-        $cnt        = 1;
-        while (($nextComma = $phpcsFile->findNext(array(\T_COMMA, $tokens[$closer]['code'], \T_OPEN_SHORT_ARRAY, \T_CLOSURE), $nextComma + 1, $closer + 1)) !== false) {
-            // Ignore anything within short array definition brackets.
-            if ($tokens[$nextComma]['type'] === 'T_OPEN_SHORT_ARRAY'
-                && (isset($tokens[$nextComma]['bracket_opener'])
-                    && $tokens[$nextComma]['bracket_opener'] === $nextComma)
-                && isset($tokens[$nextComma]['bracket_closer'])
-            ) {
-                // Skip forward to the end of the short array definition.
-                $nextComma = $tokens[$nextComma]['bracket_closer'];
-                continue;
-            }
-
-            // Skip past closures passed as function parameters.
-            if ($tokens[$nextComma]['type'] === 'T_CLOSURE'
-                && (isset($tokens[$nextComma]['scope_condition'])
-                    && $tokens[$nextComma]['scope_condition'] === $nextComma)
-                && isset($tokens[$nextComma]['scope_closer'])
-            ) {
-                // Skip forward to the end of the closure declaration.
-                $nextComma = $tokens[$nextComma]['scope_closer'];
-                continue;
-            }
-
-            // Ignore comma's at a lower nesting level.
-            if ($tokens[$nextComma]['type'] === 'T_COMMA'
-                && isset($tokens[$nextComma]['nested_parenthesis'])
-                && \count($tokens[$nextComma]['nested_parenthesis']) !== $nestedParenthesisCount
-            ) {
-                continue;
-            }
-
-            // Ignore closing parenthesis/bracket if not 'ours'.
-            if ($tokens[$nextComma]['type'] === $tokens[$closer]['type'] && $nextComma !== $closer) {
-                continue;
-            }
-
-            // Ok, we've reached the end of the parameter.
-            $parameters[$cnt]['start'] = $paramStart;
-            $parameters[$cnt]['end']   = $nextComma - 1;
-            $parameters[$cnt]['raw']   = trim($phpcsFile->getTokensAsString($paramStart, ($nextComma - $paramStart)));
-
-            // Check if there are more tokens before the closing parenthesis.
-            // Prevents code like the following from setting a third parameter:
-            // functionCall( $param1, $param2, );
-            $hasNextParam = $phpcsFile->findNext(Tokens::$emptyTokens, $nextComma + 1, $closer, true, null, true);
-            if ($hasNextParam === false) {
-                break;
-            }
-
-            // Prepare for the next parameter.
-            $paramStart = $nextComma + 1;
-            $cnt++;
-        }
-
-        return $parameters;
-    }
-
-
-    /**
-     * Get information on a specific parameter passed to a function call.
-     *
-     * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
-     * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
-     *
-     * Will return a array with the start token pointer, end token pointer and the raw value
-     * of the parameter at a specific offset.
-     * If the specified parameter is not found, will return false.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                   $stackPtr    The position of the function call token.
-     * @param int                   $paramOffset The 1-based index position of the parameter to retrieve.
-     *
-     * @return array|false
-     */
-    public function getFunctionCallParameter(File $phpcsFile, $stackPtr, $paramOffset)
-    {
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
-
-        if (isset($parameters[$paramOffset]) === false) {
-            return false;
-        } else {
-            return $parameters[$paramOffset];
-        }
-    }
-
-
-    /**
-     * Verify whether a token is within a scoped condition.
-     *
-     * If the optional $validScopes parameter has been passed, the function
-     * will check that the token has at least one condition which is of a
-     * type defined in $validScopes.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                   $stackPtr    The position of the token.
-     * @param array|int             $validScopes Optional. Array of valid scopes
-     *                                           or int value of a valid scope.
-     *                                           Pass the T_.. constant(s) for the
-     *                                           desired scope to this parameter.
-     *
-     * @return bool Without the optional $scopeTypes: True if within a scope, false otherwise.
-     *              If the $scopeTypes are set: True if *one* of the conditions is a
-     *              valid scope, false otherwise.
-     */
-    public function tokenHasScope(File $phpcsFile, $stackPtr, $validScopes = null)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // No conditions = no scope.
-        if (empty($tokens[$stackPtr]['conditions'])) {
-            return false;
-        }
-
-        // Ok, there are conditions, do we have to check for specific ones ?
-        if (isset($validScopes) === false) {
-            return true;
-        }
-
-        return $phpcsFile->hasCondition($stackPtr, $validScopes);
-    }
-
-
-    /**
-     * Verify whether a token is within a class scope.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the token.
-     * @param bool                  $strict    Whether to strictly check for the T_CLASS
-     *                                         scope or also accept interfaces and traits
-     *                                         as scope.
-     *
-     * @return bool True if within class scope, false otherwise.
-     */
-    public function inClassScope(File $phpcsFile, $stackPtr, $strict = true)
-    {
-        $validScopes = array(\T_CLASS);
-        if (\defined('T_ANON_CLASS') === true) {
-            $validScopes[] = \T_ANON_CLASS;
-        }
-
-        if ($strict === false) {
-            $validScopes[] = \T_INTERFACE;
-            $validScopes[] = \T_TRAIT;
-        }
-
-        return $phpcsFile->hasCondition($stackPtr, $validScopes);
-    }
-
-
-    /**
-     * Returns the fully qualified class name for a new class instantiation.
-     *
-     * Returns an empty string if the class name could not be reliably inferred.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of a T_NEW token.
-     *
-     * @return string
-     */
-    public function getFQClassNameFromNewToken(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return '';
-        }
-
-        if ($tokens[$stackPtr]['code'] !== \T_NEW) {
-            return '';
-        }
-
-        $start = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-        if ($start === false) {
-            return '';
-        }
-
-        // Bow out if the next token is a variable as we don't know where it was defined.
-        if ($tokens[$start]['code'] === \T_VARIABLE) {
-            return '';
-        }
-
-        // Bow out if the next token is the class keyword.
-        if ($tokens[$start]['type'] === 'T_ANON_CLASS' || $tokens[$start]['code'] === \T_CLASS) {
-            return '';
-        }
-
-        $find = array(
-            \T_NS_SEPARATOR,
-            \T_STRING,
-            \T_NAMESPACE,
-            \T_WHITESPACE,
-        );
-
-        $end       = $phpcsFile->findNext($find, ($start + 1), null, true, null, true);
-        $className = $phpcsFile->getTokensAsString($start, ($end - $start));
-        $className = trim($className);
-
-        return $this->getFQName($phpcsFile, $stackPtr, $className);
-    }
-
-
-    /**
-     * Returns the fully qualified name of the class that the specified class extends.
-     *
-     * Returns an empty string if the class does not extend another class or if
-     * the class name could not be reliably inferred.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of a T_CLASS token.
-     *
-     * @return string
-     */
-    public function getFQExtendedClassName(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return '';
-        }
-
-        if ($tokens[$stackPtr]['code'] !== \T_CLASS
-            && $tokens[$stackPtr]['type'] !== 'T_ANON_CLASS'
-            && $tokens[$stackPtr]['type'] !== 'T_INTERFACE'
-        ) {
-            return '';
-        }
-
-        $extends = PHPCSHelper::findExtendedClassName($phpcsFile, $stackPtr);
-        if (empty($extends) || \is_string($extends) === false) {
-            return '';
-        }
-
-        return $this->getFQName($phpcsFile, $stackPtr, $extends);
-    }
-
-
-    /**
-     * Returns the class name for the static usage of a class.
-     * This can be a call to a method, the use of a property or constant.
-     *
-     * Returns an empty string if the class name could not be reliably inferred.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of a T_NEW token.
-     *
-     * @return string
-     */
-    public function getFQClassNameFromDoubleColonToken(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return '';
-        }
-
-        if ($tokens[$stackPtr]['code'] !== \T_DOUBLE_COLON) {
-            return '';
-        }
-
-        // Nothing to do if previous token is a variable as we don't know where it was defined.
-        if ($tokens[$stackPtr - 1]['code'] === \T_VARIABLE) {
-            return '';
-        }
-
-        // Nothing to do if 'parent' or 'static' as we don't know how far the class tree extends.
-        if (\in_array($tokens[$stackPtr - 1]['code'], array(\T_PARENT, \T_STATIC), true)) {
-            return '';
-        }
-
-        // Get the classname from the class declaration if self is used.
-        if ($tokens[$stackPtr - 1]['code'] === \T_SELF) {
-            $classDeclarationPtr = $phpcsFile->findPrevious(\T_CLASS, $stackPtr - 1);
-            if ($classDeclarationPtr === false) {
-                return '';
-            }
-            $className = $phpcsFile->getDeclarationName($classDeclarationPtr);
-            return $this->getFQName($phpcsFile, $classDeclarationPtr, $className);
-        }
-
-        $find = array(
-            \T_NS_SEPARATOR,
-            \T_STRING,
-            \T_NAMESPACE,
-            \T_WHITESPACE,
-        );
-
-        $start = $phpcsFile->findPrevious($find, $stackPtr - 1, null, true, null, true);
-        if ($start === false || isset($tokens[($start + 1)]) === false) {
-            return '';
-        }
-
-        $start     = ($start + 1);
-        $className = $phpcsFile->getTokensAsString($start, ($stackPtr - $start));
-        $className = trim($className);
-
-        return $this->getFQName($phpcsFile, $stackPtr, $className);
-    }
-
-
-    /**
-     * Get the Fully Qualified name for a class/function/constant etc.
-     *
-     * Checks if a class/function/constant name is already fully qualified and
-     * if not, enrich it with the relevant namespace information.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the token.
-     * @param string                $name      The class / function / constant name.
-     *
-     * @return string
-     */
-    public function getFQName(File $phpcsFile, $stackPtr, $name)
-    {
-        if (strpos($name, '\\') === 0) {
-            // Already fully qualified.
-            return $name;
-        }
-
-        // Remove the namespace keyword if used.
-        if (strpos($name, 'namespace\\') === 0) {
-            $name = substr($name, 10);
-        }
-
-        $namespace = $this->determineNamespace($phpcsFile, $stackPtr);
-
-        if ($namespace === '') {
-            return '\\' . $name;
-        } else {
-            return '\\' . $namespace . '\\' . $name;
-        }
-    }
-
-
-    /**
-     * Is the class/function/constant name namespaced or global ?
-     *
-     * @param string $FQName Fully Qualified name of a class, function etc.
-     *                       I.e. should always start with a `\`.
-     *
-     * @return bool True if namespaced, false if global.
-     */
-    public function isNamespaced($FQName)
-    {
-        if (strpos($FQName, '\\') !== 0) {
-            throw new PHPCS_Exception('$FQName must be a fully qualified name');
-        }
-
-        return (strpos(substr($FQName, 1), '\\') !== false);
-    }
-
-
-    /**
-     * Determine the namespace name an arbitrary token lives in.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
-     * @param int                   $stackPtr  The token position for which to determine the namespace.
-     *
-     * @return string Namespace name or empty string if it couldn't be determined or no namespace applies.
-     */
-    public function determineNamespace(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return '';
-        }
-
-        // Check for scoped namespace {}.
-        if (empty($tokens[$stackPtr]['conditions']) === false) {
-            $namespacePtr = $phpcsFile->getCondition($stackPtr, \T_NAMESPACE);
-            if ($namespacePtr !== false) {
-                $namespace = $this->getDeclaredNamespaceName($phpcsFile, $namespacePtr);
-                if ($namespace !== false) {
-                    return $namespace;
-                }
-
-                // We are in a scoped namespace, but couldn't determine the name. Searching for a global namespace is futile.
-                return '';
-            }
-        }
-
-        /*
+	const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
+
+	/**
+	 * List of superglobals as an array of strings.
+	 *
+	 * Used by the ParameterShadowSuperGlobals and ForbiddenClosureUseVariableNames sniffs.
+	 *
+	 * @var array
+	 */
+	protected $superglobals = array(
+		'$GLOBALS'  => true,
+		'$_SERVER'  => true,
+		'$_GET'     => true,
+		'$_POST'    => true,
+		'$_FILES'   => true,
+		'$_COOKIE'  => true,
+		'$_SESSION' => true,
+		'$_REQUEST' => true,
+		'$_ENV'     => true,
+	);
+
+	/**
+	 * List of functions using hash algorithm as parameter (always the first parameter).
+	 *
+	 * Used by the new/removed hash algorithm sniffs.
+	 * Key is the function name, value is the 1-based parameter position in the function call.
+	 *
+	 * @var array
+	 */
+	protected $hashAlgoFunctions = array(
+		'hash_file'      => 1,
+		'hash_hmac_file' => 1,
+		'hash_hmac'      => 1,
+		'hash_init'      => 1,
+		'hash_pbkdf2'    => 1,
+		'hash'           => 1,
+	);
+
+
+	/**
+	 * List of functions which take an ini directive as parameter (always the first parameter).
+	 *
+	 * Used by the new/removed ini directives sniffs.
+	 * Key is the function name, value is the 1-based parameter position in the function call.
+	 *
+	 * @var array
+	 */
+	protected $iniFunctions = array(
+		'ini_get' => 1,
+		'ini_set' => 1,
+	);
+
+
+	/**
+	 * Get the testVersion configuration variable.
+	 *
+	 * The testVersion configuration variable may be in any of the following formats:
+	 * 1) Omitted/empty, in which case no version is specified. This effectively
+	 *    disables all the checks for new PHP features provided by this standard.
+	 * 2) A single PHP version number, e.g. "5.4" in which case the standard checks that
+	 *    the code will run on that version of PHP (no deprecated features or newer
+	 *    features being used).
+	 * 3) A range, e.g. "5.0-5.5", in which case the standard checks the code will run
+	 *    on all PHP versions in that range, and that it doesn't use any features that
+	 *    were deprecated by the final version in the list, or which were not available
+	 *    for the first version in the list.
+	 *    We accept ranges where one of the components is missing, e.g. "-5.6" means
+	 *    all versions up to PHP 5.6, and "7.0-" means all versions above PHP 7.0.
+	 * PHP version numbers should always be in Major.Minor format.  Both "5", "5.3.2"
+	 * would be treated as invalid, and ignored.
+	 *
+	 * @return array $arrTestVersions will hold an array containing min/max version
+	 *               of PHP that we are checking against (see above).  If only a
+	 *               single version number is specified, then this is used as
+	 *               both the min and max.
+	 *
+	 * @throws \PHP_CodeSniffer_Exception If testVersion is invalid.
+	 */
+	private function getTestVersion()
+	{
+		static $arrTestVersions = array();
+
+		$default     = array(null, null);
+		$testVersion = trim(PHPCSHelper::getConfigData('testVersion'));
+
+		if (empty($testVersion) === false && isset($arrTestVersions[$testVersion]) === false) {
+
+			$arrTestVersions[$testVersion] = $default;
+
+			if (preg_match('`^\d+\.\d+$`', $testVersion)) {
+				$arrTestVersions[$testVersion] = array($testVersion, $testVersion);
+				return $arrTestVersions[$testVersion];
+			}
+
+			if (preg_match('`^(\d+\.\d+)?\s*-\s*(\d+\.\d+)?$`', $testVersion, $matches)) {
+				if (empty($matches[1]) === false || empty($matches[2]) === false) {
+					// If no lower-limit is set, we set the min version to 4.0.
+					// Whilst development focuses on PHP 5 and above, we also accept
+					// sniffs for PHP 4, so we include that as the minimum.
+					// (It makes no sense to support PHP 3 as this was effectively a
+					// different language).
+					$min = empty($matches[1]) ? '4.0' : $matches[1];
+
+					// If no upper-limit is set, we set the max version to 99.9.
+					$max = empty($matches[2]) ? '99.9' : $matches[2];
+
+					if (version_compare($min, $max, '>')) {
+						trigger_error(
+							"Invalid range in testVersion setting: '" . $testVersion . "'",
+							\E_USER_WARNING
+						);
+						return $default;
+					} else {
+						$arrTestVersions[$testVersion] = array($min, $max);
+						return $arrTestVersions[$testVersion];
+					}
+				}
+			}
+
+			trigger_error(
+				"Invalid testVersion setting: '" . $testVersion . "'",
+				\E_USER_WARNING
+			);
+			return $default;
+		}
+
+		if (isset($arrTestVersions[$testVersion])) {
+			return $arrTestVersions[$testVersion];
+		}
+
+		return $default;
+	}
+
+
+	/**
+	 * Check whether a specific PHP version is equal to or higher than the maximum
+	 * supported PHP version as provided by the user in `testVersion`.
+	 *
+	 * Should be used when sniffing for *old* PHP features (deprecated/removed).
+	 *
+	 * @param string $phpVersion A PHP version number in 'major.minor' format.
+	 *
+	 * @return bool True if testVersion has not been provided or if the PHP version
+	 *              is equal to or higher than the highest supported PHP version
+	 *              in testVersion. False otherwise.
+	 */
+	public function supportsAbove($phpVersion)
+	{
+		$testVersion = $this->getTestVersion();
+		$testVersion = $testVersion[1];
+
+		if (\is_null($testVersion)
+			|| version_compare($testVersion, $phpVersion) >= 0
+		) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+
+	/**
+	 * Check whether a specific PHP version is equal to or lower than the minimum
+	 * supported PHP version as provided by the user in `testVersion`.
+	 *
+	 * Should be used when sniffing for *new* PHP features.
+	 *
+	 * @param string $phpVersion A PHP version number in 'major.minor' format.
+	 *
+	 * @return bool True if the PHP version is equal to or lower than the lowest
+	 *              supported PHP version in testVersion.
+	 *              False otherwise or if no testVersion is provided.
+	 */
+	public function supportsBelow($phpVersion)
+	{
+		$testVersion = $this->getTestVersion();
+		$testVersion = $testVersion[0];
+
+		if (\is_null($testVersion) === false
+			&& version_compare($testVersion, $phpVersion) <= 0
+		) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+
+	/**
+	 * Add a PHPCS message to the output stack as either a warning or an error.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file the message applies to.
+	 * @param string                $message   The message.
+	 * @param int                   $stackPtr  The position of the token
+	 *                                         the message relates to.
+	 * @param bool                  $isError   Whether to report the message as an
+	 *                                         'error' or 'warning'.
+	 *                                         Defaults to true (error).
+	 * @param string                $code      The error code for the message.
+	 *                                         Defaults to 'Found'.
+	 * @param array                 $data      Optional input for the data replacements.
+	 *
+	 * @return void
+	 */
+	public function addMessage(File $phpcsFile, $message, $stackPtr, $isError, $code = 'Found', $data = array())
+	{
+		if ($isError === true) {
+			$phpcsFile->addError($message, $stackPtr, $code, $data);
+		} else {
+			$phpcsFile->addWarning($message, $stackPtr, $code, $data);
+		}
+	}
+
+
+	/**
+	 * Convert an arbitrary string to an alphanumeric string with underscores.
+	 *
+	 * Pre-empt issues with arbitrary strings being used as error codes in XML and PHP.
+	 *
+	 * @param string $baseString Arbitrary string.
+	 *
+	 * @return string
+	 */
+	public function stringToErrorCode($baseString)
+	{
+		return preg_replace('`[^a-z0-9_]`i', '_', strtolower($baseString));
+	}
+
+
+	/**
+	 * Strip quotes surrounding an arbitrary string.
+	 *
+	 * Intended for use with the contents of a T_CONSTANT_ENCAPSED_STRING / T_DOUBLE_QUOTED_STRING.
+	 *
+	 * @param string $string The raw string.
+	 *
+	 * @return string String without quotes around it.
+	 */
+	public function stripQuotes($string)
+	{
+		return preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $string);
+	}
+
+
+	/**
+	 * Strip variables from an arbitrary double quoted string.
+	 *
+	 * Intended for use with the contents of a T_DOUBLE_QUOTED_STRING.
+	 *
+	 * @param string $string The raw string.
+	 *
+	 * @return string String without variables in it.
+	 */
+	public function stripVariables($string)
+	{
+		if (strpos($string, '$') === false) {
+			return $string;
+		}
+
+		return preg_replace(self::REGEX_COMPLEX_VARS, '', $string);
+	}
+
+
+	/**
+	 * Make all top level array keys in an array lowercase.
+	 *
+	 * @param array $array Initial array.
+	 *
+	 * @return array Same array, but with all lowercase top level keys.
+	 */
+	public function arrayKeysToLowercase($array)
+	{
+		return array_change_key_case($array, \CASE_LOWER);
+	}
+
+
+	/**
+	 * Checks if a function call has parameters.
+	 *
+	 * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
+	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
+	 *
+	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer, it
+	 * will detect whether the array has values or is empty.
+	 *
+	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/120
+	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/152
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the function call token.
+	 *
+	 * @return bool
+	 */
+	public function doesFunctionCallHaveParameters(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		// Is this one of the tokens this function handles ?
+		if (\in_array($tokens[$stackPtr]['code'], array(\T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY, \T_VARIABLE), true) === false) {
+			return false;
+		}
+
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+
+		// Deal with short array syntax.
+		if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
+			if (isset($tokens[$stackPtr]['bracket_closer']) === false) {
+				return false;
+			}
+
+			if ($nextNonEmpty === $tokens[$stackPtr]['bracket_closer']) {
+				// No parameters.
+				return false;
+			} else {
+				return true;
+			}
+		}
+
+		// Deal with function calls & long arrays.
+		// Next non-empty token should be the open parenthesis.
+		if ($nextNonEmpty === false && $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
+			return false;
+		}
+
+		if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
+			return false;
+		}
+
+		$closeParenthesis = $tokens[$nextNonEmpty]['parenthesis_closer'];
+		$nextNextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $nextNonEmpty + 1, $closeParenthesis + 1, true);
+
+		if ($nextNextNonEmpty === $closeParenthesis) {
+			// No parameters.
+			return false;
+		}
+
+		return true;
+	}
+
+
+	/**
+	 * Count the number of parameters a function call has been passed.
+	 *
+	 * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
+	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
+	 *
+	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
+	 * it will return the number of values in the array.
+	 *
+	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/111
+	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/114
+	 * @link https://github.com/PHPCompatibility/PHPCompatibility/issues/151
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the function call token.
+	 *
+	 * @return int
+	 */
+	public function getFunctionCallParameterCount(File $phpcsFile, $stackPtr)
+	{
+		if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
+			return 0;
+		}
+
+		return \count($this->getFunctionCallParameters($phpcsFile, $stackPtr));
+	}
+
+
+	/**
+	 * Get information on all parameters passed to a function call.
+	 *
+	 * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
+	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
+	 *
+	 * Will return an multi-dimentional array with the start token pointer, end token
+	 * pointer and raw parameter value for all parameters. Index will be 1-based.
+	 * If no parameters are found, will return an empty array.
+	 *
+	 * Extra feature: If passed an T_ARRAY or T_OPEN_SHORT_ARRAY stack pointer,
+	 * it will tokenize the values / key/value pairs contained in the array call.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the function call token.
+	 *
+	 * @return array
+	 */
+	public function getFunctionCallParameters(File $phpcsFile, $stackPtr)
+	{
+		if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
+			return array();
+		}
+
+		// Ok, we know we have a T_STRING, T_VARIABLE, T_ARRAY or T_OPEN_SHORT_ARRAY with parameters
+		// and valid open & close brackets/parenthesis.
+		$tokens = $phpcsFile->getTokens();
+
+		// Mark the beginning and end tokens.
+		if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
+			$opener = $stackPtr;
+			$closer = $tokens[$stackPtr]['bracket_closer'];
+
+			$nestedParenthesisCount = 0;
+
+		} else {
+			$opener = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+			$closer = $tokens[$opener]['parenthesis_closer'];
+
+			$nestedParenthesisCount = 1;
+		}
+
+		// Which nesting level is the one we are interested in ?
+		if (isset($tokens[$opener]['nested_parenthesis'])) {
+			$nestedParenthesisCount += \count($tokens[$opener]['nested_parenthesis']);
+		}
+
+		$parameters = array();
+		$nextComma  = $opener;
+		$paramStart = $opener + 1;
+		$cnt        = 1;
+		while (($nextComma = $phpcsFile->findNext(array(\T_COMMA, $tokens[$closer]['code'], \T_OPEN_SHORT_ARRAY, \T_CLOSURE), $nextComma + 1, $closer + 1)) !== false) {
+			// Ignore anything within short array definition brackets.
+			if ($tokens[$nextComma]['type'] === 'T_OPEN_SHORT_ARRAY'
+				&& (isset($tokens[$nextComma]['bracket_opener'])
+					&& $tokens[$nextComma]['bracket_opener'] === $nextComma)
+				&& isset($tokens[$nextComma]['bracket_closer'])
+			) {
+				// Skip forward to the end of the short array definition.
+				$nextComma = $tokens[$nextComma]['bracket_closer'];
+				continue;
+			}
+
+			// Skip past closures passed as function parameters.
+			if ($tokens[$nextComma]['type'] === 'T_CLOSURE'
+				&& (isset($tokens[$nextComma]['scope_condition'])
+					&& $tokens[$nextComma]['scope_condition'] === $nextComma)
+				&& isset($tokens[$nextComma]['scope_closer'])
+			) {
+				// Skip forward to the end of the closure declaration.
+				$nextComma = $tokens[$nextComma]['scope_closer'];
+				continue;
+			}
+
+			// Ignore comma's at a lower nesting level.
+			if ($tokens[$nextComma]['type'] === 'T_COMMA'
+				&& isset($tokens[$nextComma]['nested_parenthesis'])
+				&& \count($tokens[$nextComma]['nested_parenthesis']) !== $nestedParenthesisCount
+			) {
+				continue;
+			}
+
+			// Ignore closing parenthesis/bracket if not 'ours'.
+			if ($tokens[$nextComma]['type'] === $tokens[$closer]['type'] && $nextComma !== $closer) {
+				continue;
+			}
+
+			// Ok, we've reached the end of the parameter.
+			$parameters[$cnt]['start'] = $paramStart;
+			$parameters[$cnt]['end']   = $nextComma - 1;
+			$parameters[$cnt]['raw']   = trim($phpcsFile->getTokensAsString($paramStart, ($nextComma - $paramStart)));
+
+			// Check if there are more tokens before the closing parenthesis.
+			// Prevents code like the following from setting a third parameter:
+			// functionCall( $param1, $param2, );
+			$hasNextParam = $phpcsFile->findNext(Tokens::$emptyTokens, $nextComma + 1, $closer, true, null, true);
+			if ($hasNextParam === false) {
+				break;
+			}
+
+			// Prepare for the next parameter.
+			$paramStart = $nextComma + 1;
+			$cnt++;
+		}
+
+		return $parameters;
+	}
+
+
+	/**
+	 * Get information on a specific parameter passed to a function call.
+	 *
+	 * Expects to be passed the T_STRING or T_VARIABLE stack pointer for the function call.
+	 * If passed a T_STRING which is *not* a function call, the behaviour is unreliable.
+	 *
+	 * Will return a array with the start token pointer, end token pointer and the raw value
+	 * of the parameter at a specific offset.
+	 * If the specified parameter is not found, will return false.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	 * @param int                   $stackPtr    The position of the function call token.
+	 * @param int                   $paramOffset The 1-based index position of the parameter to retrieve.
+	 *
+	 * @return array|false
+	 */
+	public function getFunctionCallParameter(File $phpcsFile, $stackPtr, $paramOffset)
+	{
+		$parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
+
+		if (isset($parameters[$paramOffset]) === false) {
+			return false;
+		} else {
+			return $parameters[$paramOffset];
+		}
+	}
+
+
+	/**
+	 * Verify whether a token is within a scoped condition.
+	 *
+	 * If the optional $validScopes parameter has been passed, the function
+	 * will check that the token has at least one condition which is of a
+	 * type defined in $validScopes.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	 * @param int                   $stackPtr    The position of the token.
+	 * @param array|int             $validScopes Optional. Array of valid scopes
+	 *                                           or int value of a valid scope.
+	 *                                           Pass the T_.. constant(s) for the
+	 *                                           desired scope to this parameter.
+	 *
+	 * @return bool Without the optional $scopeTypes: True if within a scope, false otherwise.
+	 *              If the $scopeTypes are set: True if *one* of the conditions is a
+	 *              valid scope, false otherwise.
+	 */
+	public function tokenHasScope(File $phpcsFile, $stackPtr, $validScopes = null)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		// No conditions = no scope.
+		if (empty($tokens[$stackPtr]['conditions'])) {
+			return false;
+		}
+
+		// Ok, there are conditions, do we have to check for specific ones ?
+		if (isset($validScopes) === false) {
+			return true;
+		}
+
+		return $phpcsFile->hasCondition($stackPtr, $validScopes);
+	}
+
+
+	/**
+	 * Verify whether a token is within a class scope.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the token.
+	 * @param bool                  $strict    Whether to strictly check for the T_CLASS
+	 *                                         scope or also accept interfaces and traits
+	 *                                         as scope.
+	 *
+	 * @return bool True if within class scope, false otherwise.
+	 */
+	public function inClassScope(File $phpcsFile, $stackPtr, $strict = true)
+	{
+		$validScopes = array(\T_CLASS);
+		if (\defined('T_ANON_CLASS') === true) {
+			$validScopes[] = \T_ANON_CLASS;
+		}
+
+		if ($strict === false) {
+			$validScopes[] = \T_INTERFACE;
+			$validScopes[] = \T_TRAIT;
+		}
+
+		return $phpcsFile->hasCondition($stackPtr, $validScopes);
+	}
+
+
+	/**
+	 * Returns the fully qualified class name for a new class instantiation.
+	 *
+	 * Returns an empty string if the class name could not be reliably inferred.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of a T_NEW token.
+	 *
+	 * @return string
+	 */
+	public function getFQClassNameFromNewToken(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return '';
+		}
+
+		if ($tokens[$stackPtr]['code'] !== \T_NEW) {
+			return '';
+		}
+
+		$start = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+		if ($start === false) {
+			return '';
+		}
+
+		// Bow out if the next token is a variable as we don't know where it was defined.
+		if ($tokens[$start]['code'] === \T_VARIABLE) {
+			return '';
+		}
+
+		// Bow out if the next token is the class keyword.
+		if ($tokens[$start]['type'] === 'T_ANON_CLASS' || $tokens[$start]['code'] === \T_CLASS) {
+			return '';
+		}
+
+		$find = array(
+			\T_NS_SEPARATOR,
+			\T_STRING,
+			\T_NAMESPACE,
+			\T_WHITESPACE,
+		);
+
+		$end       = $phpcsFile->findNext($find, ($start + 1), null, true, null, true);
+		$className = $phpcsFile->getTokensAsString($start, ($end - $start));
+		$className = trim($className);
+
+		return $this->getFQName($phpcsFile, $stackPtr, $className);
+	}
+
+
+	/**
+	 * Returns the fully qualified name of the class that the specified class extends.
+	 *
+	 * Returns an empty string if the class does not extend another class or if
+	 * the class name could not be reliably inferred.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of a T_CLASS token.
+	 *
+	 * @return string
+	 */
+	public function getFQExtendedClassName(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return '';
+		}
+
+		if ($tokens[$stackPtr]['code'] !== \T_CLASS
+			&& $tokens[$stackPtr]['type'] !== 'T_ANON_CLASS'
+			&& $tokens[$stackPtr]['type'] !== 'T_INTERFACE'
+		) {
+			return '';
+		}
+
+		$extends = PHPCSHelper::findExtendedClassName($phpcsFile, $stackPtr);
+		if (empty($extends) || \is_string($extends) === false) {
+			return '';
+		}
+
+		return $this->getFQName($phpcsFile, $stackPtr, $extends);
+	}
+
+
+	/**
+	 * Returns the class name for the static usage of a class.
+	 * This can be a call to a method, the use of a property or constant.
+	 *
+	 * Returns an empty string if the class name could not be reliably inferred.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of a T_NEW token.
+	 *
+	 * @return string
+	 */
+	public function getFQClassNameFromDoubleColonToken(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return '';
+		}
+
+		if ($tokens[$stackPtr]['code'] !== \T_DOUBLE_COLON) {
+			return '';
+		}
+
+		// Nothing to do if previous token is a variable as we don't know where it was defined.
+		if ($tokens[$stackPtr - 1]['code'] === \T_VARIABLE) {
+			return '';
+		}
+
+		// Nothing to do if 'parent' or 'static' as we don't know how far the class tree extends.
+		if (\in_array($tokens[$stackPtr - 1]['code'], array(\T_PARENT, \T_STATIC), true)) {
+			return '';
+		}
+
+		// Get the classname from the class declaration if self is used.
+		if ($tokens[$stackPtr - 1]['code'] === \T_SELF) {
+			$classDeclarationPtr = $phpcsFile->findPrevious(\T_CLASS, $stackPtr - 1);
+			if ($classDeclarationPtr === false) {
+				return '';
+			}
+			$className = $phpcsFile->getDeclarationName($classDeclarationPtr);
+			return $this->getFQName($phpcsFile, $classDeclarationPtr, $className);
+		}
+
+		$find = array(
+			\T_NS_SEPARATOR,
+			\T_STRING,
+			\T_NAMESPACE,
+			\T_WHITESPACE,
+		);
+
+		$start = $phpcsFile->findPrevious($find, $stackPtr - 1, null, true, null, true);
+		if ($start === false || isset($tokens[($start + 1)]) === false) {
+			return '';
+		}
+
+		$start     = ($start + 1);
+		$className = $phpcsFile->getTokensAsString($start, ($stackPtr - $start));
+		$className = trim($className);
+
+		return $this->getFQName($phpcsFile, $stackPtr, $className);
+	}
+
+
+	/**
+	 * Get the Fully Qualified name for a class/function/constant etc.
+	 *
+	 * Checks if a class/function/constant name is already fully qualified and
+	 * if not, enrich it with the relevant namespace information.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the token.
+	 * @param string                $name      The class / function / constant name.
+	 *
+	 * @return string
+	 */
+	public function getFQName(File $phpcsFile, $stackPtr, $name)
+	{
+		if (strpos($name, '\\') === 0) {
+			// Already fully qualified.
+			return $name;
+		}
+
+		// Remove the namespace keyword if used.
+		if (strpos($name, 'namespace\\') === 0) {
+			$name = substr($name, 10);
+		}
+
+		$namespace = $this->determineNamespace($phpcsFile, $stackPtr);
+
+		if ($namespace === '') {
+			return '\\' . $name;
+		} else {
+			return '\\' . $namespace . '\\' . $name;
+		}
+	}
+
+
+	/**
+	 * Is the class/function/constant name namespaced or global ?
+	 *
+	 * @param string $FQName Fully Qualified name of a class, function etc.
+	 *                       I.e. should always start with a `\`.
+	 *
+	 * @return bool True if namespaced, false if global.
+	 */
+	public function isNamespaced($FQName)
+	{
+		if (strpos($FQName, '\\') !== 0) {
+			throw new PHPCS_Exception('$FQName must be a fully qualified name');
+		}
+
+		return (strpos(substr($FQName, 1), '\\') !== false);
+	}
+
+
+	/**
+	 * Determine the namespace name an arbitrary token lives in.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
+	 * @param int                   $stackPtr  The token position for which to determine the namespace.
+	 *
+	 * @return string Namespace name or empty string if it couldn't be determined or no namespace applies.
+	 */
+	public function determineNamespace(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return '';
+		}
+
+		// Check for scoped namespace {}.
+		if (empty($tokens[$stackPtr]['conditions']) === false) {
+			$namespacePtr = $phpcsFile->getCondition($stackPtr, \T_NAMESPACE);
+			if ($namespacePtr !== false) {
+				$namespace = $this->getDeclaredNamespaceName($phpcsFile, $namespacePtr);
+				if ($namespace !== false) {
+					return $namespace;
+				}
+
+				// We are in a scoped namespace, but couldn't determine the name. Searching for a global namespace is futile.
+				return '';
+			}
+		}
+
+		/*
          * Not in a scoped namespace, so let's see if we can find a non-scoped namespace instead.
          * Keeping in mind that:
          * - there can be multiple non-scoped namespaces in a file (bad practice, but it happens).
          * - the namespace keyword can also be used as part of a function/method call and such.
          * - that a non-named namespace resolves to the global namespace.
          */
-        $previousNSToken = $stackPtr;
-        $namespace       = false;
-        do {
-            $previousNSToken = $phpcsFile->findPrevious(\T_NAMESPACE, ($previousNSToken - 1));
-
-            // Stop if we encounter a scoped namespace declaration as we already know we're not in one.
-            if (empty($tokens[$previousNSToken]['scope_condition']) === false && $tokens[$previousNSToken]['scope_condition'] === $previousNSToken) {
-                break;
-            }
-
-            $namespace = $this->getDeclaredNamespaceName($phpcsFile, $previousNSToken);
-
-        } while ($namespace === false && $previousNSToken !== false);
-
-        // If we still haven't got a namespace, return an empty string.
-        if ($namespace === false) {
-            return '';
-        } else {
-            return $namespace;
-        }
-    }
-
-    /**
-     * Get the complete namespace name for a namespace declaration.
-     *
-     * For hierarchical namespaces, the name will be composed of several tokens,
-     * i.e. MyProject\Sub\Level which will be returned together as one string.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
-     * @param int|bool              $stackPtr  The position of a T_NAMESPACE token.
-     *
-     * @return string|false Namespace name or false if not a namespace declaration.
-     *                      Namespace name can be an empty string for global namespace declaration.
-     */
-    public function getDeclaredNamespaceName(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if ($stackPtr === false || isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        if ($tokens[$stackPtr]['code'] !== \T_NAMESPACE) {
-            return false;
-        }
-
-        if ($tokens[($stackPtr + 1)]['code'] === \T_NS_SEPARATOR) {
-            // Not a namespace declaration, but use of, i.e. namespace\someFunction();
-            return false;
-        }
-
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
-        if ($tokens[$nextToken]['code'] === \T_OPEN_CURLY_BRACKET) {
-            // Declaration for global namespace when using multiple namespaces in a file.
-            // I.e.: namespace {}
-            return '';
-        }
-
-        // Ok, this should be a namespace declaration, so get all the parts together.
-        $validTokens = array(
-            \T_STRING       => true,
-            \T_NS_SEPARATOR => true,
-            \T_WHITESPACE   => true,
-        );
-
-        $namespaceName = '';
-        while (isset($validTokens[$tokens[$nextToken]['code']]) === true) {
-            $namespaceName .= trim($tokens[$nextToken]['content']);
-            $nextToken++;
-        }
-
-        return $namespaceName;
-    }
-
-
-    /**
-     * Get the stack pointer for a return type token for a given function.
-     *
-     * Compatible layer for older PHPCS versions which don't recognize
-     * return type hints correctly.
-     *
-     * Expects to be passed T_RETURN_TYPE, T_FUNCTION or T_CLOSURE token.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the token.
-     *
-     * @return int|false Stack pointer to the return type token or false if
-     *                   no return type was found or the passed token was
-     *                   not of the correct type.
-     */
-    public function getReturnTypeHintToken(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE) {
-            return $stackPtr;
-        }
-
-        if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
-            return false;
-        }
-
-        if (isset($tokens[$stackPtr]['parenthesis_closer']) === false) {
-            return false;
-        }
-
-        // Allow for interface and abstract method declarations.
-        $endOfFunctionDeclaration = null;
-        if (isset($tokens[$stackPtr]['scope_opener'])) {
-            $endOfFunctionDeclaration = $tokens[$stackPtr]['scope_opener'];
-        } else {
-            $nextSemiColon = $phpcsFile->findNext(\T_SEMICOLON, ($tokens[$stackPtr]['parenthesis_closer'] + 1), null, false, null, true);
-            if ($nextSemiColon !== false) {
-                $endOfFunctionDeclaration = $nextSemiColon;
-            }
-        }
-
-        if (isset($endOfFunctionDeclaration) === false) {
-            return false;
-        }
-
-        $hasColon = $phpcsFile->findNext(
-            array(\T_COLON, \T_INLINE_ELSE),
-            ($tokens[$stackPtr]['parenthesis_closer'] + 1),
-            $endOfFunctionDeclaration
-        );
-        if ($hasColon === false) {
-            return false;
-        }
-
-        /*
+		$previousNSToken = $stackPtr;
+		$namespace       = false;
+		do {
+			$previousNSToken = $phpcsFile->findPrevious(\T_NAMESPACE, ($previousNSToken - 1));
+
+			// Stop if we encounter a scoped namespace declaration as we already know we're not in one.
+			if (empty($tokens[$previousNSToken]['scope_condition']) === false && $tokens[$previousNSToken]['scope_condition'] === $previousNSToken) {
+				break;
+			}
+
+			$namespace = $this->getDeclaredNamespaceName($phpcsFile, $previousNSToken);
+
+		} while ($namespace === false && $previousNSToken !== false);
+
+		// If we still haven't got a namespace, return an empty string.
+		if ($namespace === false) {
+			return '';
+		} else {
+			return $namespace;
+		}
+	}
+
+	/**
+	 * Get the complete namespace name for a namespace declaration.
+	 *
+	 * For hierarchical namespaces, the name will be composed of several tokens,
+	 * i.e. MyProject\Sub\Level which will be returned together as one string.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
+	 * @param int|bool              $stackPtr  The position of a T_NAMESPACE token.
+	 *
+	 * @return string|false Namespace name or false if not a namespace declaration.
+	 *                      Namespace name can be an empty string for global namespace declaration.
+	 */
+	public function getDeclaredNamespaceName(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if ($stackPtr === false || isset($tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		if ($tokens[$stackPtr]['code'] !== \T_NAMESPACE) {
+			return false;
+		}
+
+		if ($tokens[($stackPtr + 1)]['code'] === \T_NS_SEPARATOR) {
+			// Not a namespace declaration, but use of, i.e. namespace\someFunction();
+			return false;
+		}
+
+		$nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
+		if ($tokens[$nextToken]['code'] === \T_OPEN_CURLY_BRACKET) {
+			// Declaration for global namespace when using multiple namespaces in a file.
+			// I.e.: namespace {}
+			return '';
+		}
+
+		// Ok, this should be a namespace declaration, so get all the parts together.
+		$validTokens = array(
+			\T_STRING       => true,
+			\T_NS_SEPARATOR => true,
+			\T_WHITESPACE   => true,
+		);
+
+		$namespaceName = '';
+		while (isset($validTokens[$tokens[$nextToken]['code']]) === true) {
+			$namespaceName .= trim($tokens[$nextToken]['content']);
+			$nextToken++;
+		}
+
+		return $namespaceName;
+	}
+
+
+	/**
+	 * Get the stack pointer for a return type token for a given function.
+	 *
+	 * Compatible layer for older PHPCS versions which don't recognize
+	 * return type hints correctly.
+	 *
+	 * Expects to be passed T_RETURN_TYPE, T_FUNCTION or T_CLOSURE token.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the token.
+	 *
+	 * @return int|false Stack pointer to the return type token or false if
+	 *                   no return type was found or the passed token was
+	 *                   not of the correct type.
+	 */
+	public function getReturnTypeHintToken(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE) {
+			return $stackPtr;
+		}
+
+		if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
+			return false;
+		}
+
+		if (isset($tokens[$stackPtr]['parenthesis_closer']) === false) {
+			return false;
+		}
+
+		// Allow for interface and abstract method declarations.
+		$endOfFunctionDeclaration = null;
+		if (isset($tokens[$stackPtr]['scope_opener'])) {
+			$endOfFunctionDeclaration = $tokens[$stackPtr]['scope_opener'];
+		} else {
+			$nextSemiColon = $phpcsFile->findNext(\T_SEMICOLON, ($tokens[$stackPtr]['parenthesis_closer'] + 1), null, false, null, true);
+			if ($nextSemiColon !== false) {
+				$endOfFunctionDeclaration = $nextSemiColon;
+			}
+		}
+
+		if (isset($endOfFunctionDeclaration) === false) {
+			return false;
+		}
+
+		$hasColon = $phpcsFile->findNext(
+			array(\T_COLON, \T_INLINE_ELSE),
+			($tokens[$stackPtr]['parenthesis_closer'] + 1),
+			$endOfFunctionDeclaration
+		);
+		if ($hasColon === false) {
+			return false;
+		}
+
+		/*
          * - `self`, `parent` and `callable` are not being recognized as return types in PHPCS < 2.6.0.
          * - Return types are not recognized at all in PHPCS < 2.4.0.
          * - The T_RETURN_TYPE token is defined, but no longer in use since PHPCS 3.3.0+.
@@ -988,1107 +988,1107 @@ 
          *   to prevent confusing sniffs looking for array declarations.
          *   As of PHPCS 3.3.0 `array` as a type declaration will be tokenized as `T_STRING`.
          */
-        $unrecognizedTypes = array(
-            \T_CALLABLE,
-            \T_SELF,
-            \T_PARENT,
-            \T_ARRAY, // PHPCS < 2.4.0.
-            \T_STRING,
-        );
-
-        return $phpcsFile->findPrevious($unrecognizedTypes, ($endOfFunctionDeclaration - 1), $hasColon);
-    }
-
-
-    /**
-     * Get the complete return type declaration for a given function.
-     *
-     * Cross-version compatible way to retrieve the complete return type declaration.
-     *
-     * For a classname-based return type, PHPCS, as well as the Sniff::getReturnTypeHintToken()
-     * method will mark the classname as the return type token.
-     * This method will find preceeding namespaces and namespace separators and will return a
-     * string containing the qualified return type declaration.
-     *
-     * Expects to be passed a T_RETURN_TYPE token or the return value from a call to
-     * the Sniff::getReturnTypeHintToken() method.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the return type token.
-     *
-     * @return string|false The name of the return type token.
-     */
-    public function getReturnTypeHintName(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // In older PHPCS versions, the nullable indicator will turn a return type colon into a T_INLINE_ELSE.
-        $colon = $phpcsFile->findPrevious(array(\T_COLON, \T_INLINE_ELSE, \T_FUNCTION, \T_CLOSE_PARENTHESIS), ($stackPtr - 1));
-        if ($colon === false
-            || ($tokens[$colon]['code'] !== \T_COLON && $tokens[$colon]['code'] !== \T_INLINE_ELSE)
-        ) {
-            // Shouldn't happen, just in case.
-            return;
-        }
-
-        $returnTypeHint = '';
-        for ($i = ($colon + 1); $i <= $stackPtr; $i++) {
-            // As of PHPCS 3.3.0+, all tokens are tokenized as "normal", so T_CALLABLE, T_SELF etc are
-            // all possible, just exclude anything that's regarded as empty and the nullable indicator.
-            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
-                continue;
-            }
-
-            if ($tokens[$i]['type'] === 'T_NULLABLE') {
-                continue;
-            }
-
-            if (\defined('T_NULLABLE') === false && $tokens[$i]['code'] === \T_INLINE_THEN) {
-                // Old PHPCS.
-                continue;
-            }
-
-            $returnTypeHint .= $tokens[$i]['content'];
-        }
-
-        return $returnTypeHint;
-    }
-
-
-    /**
-     * Check whether a T_VARIABLE token is a class property declaration.
-     *
-     * Compatibility layer for PHPCS cross-version compatibility
-     * as PHPCS 2.4.0 - 2.7.1 does not have good enough support for
-     * anonymous classes. Along the same lines, the`getMemberProperties()`
-     * method does not support the `var` prefix.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
-     * @param int                   $stackPtr  The position in the stack of the
-     *                                         T_VARIABLE token to verify.
-     *
-     * @return bool
-     */
-    public function isClassProperty(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_VARIABLE) {
-            return false;
-        }
-
-        // Note: interfaces can not declare properties.
-        $validScopes = array(
-            'T_CLASS'      => true,
-            'T_ANON_CLASS' => true,
-            'T_TRAIT'      => true,
-        );
-
-        $scopePtr = $this->validDirectScope($phpcsFile, $stackPtr, $validScopes);
-        if ($scopePtr !== false) {
-            // Make sure it's not a method parameter.
-            if (empty($tokens[$stackPtr]['nested_parenthesis']) === true) {
-                return true;
-            } else {
-                $parenthesis = array_keys($tokens[$stackPtr]['nested_parenthesis']);
-                $deepestOpen = array_pop($parenthesis);
-                if ($deepestOpen < $scopePtr
-                    || isset($tokens[$deepestOpen]['parenthesis_owner']) === false
-                    || $tokens[$tokens[$deepestOpen]['parenthesis_owner']]['code'] !== \T_FUNCTION
-                ) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Check whether a T_CONST token is a class constant declaration.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
-     * @param int                   $stackPtr  The position in the stack of the
-     *                                         T_CONST token to verify.
-     *
-     * @return bool
-     */
-    public function isClassConstant(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_CONST) {
-            return false;
-        }
-
-        // Note: traits can not declare constants.
-        $validScopes = array(
-            'T_CLASS'      => true,
-            'T_ANON_CLASS' => true,
-            'T_INTERFACE'  => true,
-        );
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $validScopes) !== false) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Check whether the direct wrapping scope of a token is within a limited set of
-     * acceptable tokens.
-     *
-     * Used to check, for instance, if a T_CONST is a class constant.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile   Instance of phpcsFile.
-     * @param int                   $stackPtr    The position in the stack of the
-     *                                           token to verify.
-     * @param array                 $validScopes Array of token types.
-     *                                           Keys should be the token types in string
-     *                                           format to allow for newer token types.
-     *                                           Value is irrelevant.
-     *
-     * @return int|bool StackPtr to the scope if valid, false otherwise.
-     */
-    protected function validDirectScope(File $phpcsFile, $stackPtr, $validScopes)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (empty($tokens[$stackPtr]['conditions']) === true) {
-            return false;
-        }
-
-        /*
+		$unrecognizedTypes = array(
+			\T_CALLABLE,
+			\T_SELF,
+			\T_PARENT,
+			\T_ARRAY, // PHPCS < 2.4.0.
+			\T_STRING,
+		);
+
+		return $phpcsFile->findPrevious($unrecognizedTypes, ($endOfFunctionDeclaration - 1), $hasColon);
+	}
+
+
+	/**
+	 * Get the complete return type declaration for a given function.
+	 *
+	 * Cross-version compatible way to retrieve the complete return type declaration.
+	 *
+	 * For a classname-based return type, PHPCS, as well as the Sniff::getReturnTypeHintToken()
+	 * method will mark the classname as the return type token.
+	 * This method will find preceeding namespaces and namespace separators and will return a
+	 * string containing the qualified return type declaration.
+	 *
+	 * Expects to be passed a T_RETURN_TYPE token or the return value from a call to
+	 * the Sniff::getReturnTypeHintToken() method.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the return type token.
+	 *
+	 * @return string|false The name of the return type token.
+	 */
+	public function getReturnTypeHintName(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// In older PHPCS versions, the nullable indicator will turn a return type colon into a T_INLINE_ELSE.
+		$colon = $phpcsFile->findPrevious(array(\T_COLON, \T_INLINE_ELSE, \T_FUNCTION, \T_CLOSE_PARENTHESIS), ($stackPtr - 1));
+		if ($colon === false
+			|| ($tokens[$colon]['code'] !== \T_COLON && $tokens[$colon]['code'] !== \T_INLINE_ELSE)
+		) {
+			// Shouldn't happen, just in case.
+			return;
+		}
+
+		$returnTypeHint = '';
+		for ($i = ($colon + 1); $i <= $stackPtr; $i++) {
+			// As of PHPCS 3.3.0+, all tokens are tokenized as "normal", so T_CALLABLE, T_SELF etc are
+			// all possible, just exclude anything that's regarded as empty and the nullable indicator.
+			if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
+				continue;
+			}
+
+			if ($tokens[$i]['type'] === 'T_NULLABLE') {
+				continue;
+			}
+
+			if (\defined('T_NULLABLE') === false && $tokens[$i]['code'] === \T_INLINE_THEN) {
+				// Old PHPCS.
+				continue;
+			}
+
+			$returnTypeHint .= $tokens[$i]['content'];
+		}
+
+		return $returnTypeHint;
+	}
+
+
+	/**
+	 * Check whether a T_VARIABLE token is a class property declaration.
+	 *
+	 * Compatibility layer for PHPCS cross-version compatibility
+	 * as PHPCS 2.4.0 - 2.7.1 does not have good enough support for
+	 * anonymous classes. Along the same lines, the`getMemberProperties()`
+	 * method does not support the `var` prefix.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
+	 * @param int                   $stackPtr  The position in the stack of the
+	 *                                         T_VARIABLE token to verify.
+	 *
+	 * @return bool
+	 */
+	public function isClassProperty(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_VARIABLE) {
+			return false;
+		}
+
+		// Note: interfaces can not declare properties.
+		$validScopes = array(
+			'T_CLASS'      => true,
+			'T_ANON_CLASS' => true,
+			'T_TRAIT'      => true,
+		);
+
+		$scopePtr = $this->validDirectScope($phpcsFile, $stackPtr, $validScopes);
+		if ($scopePtr !== false) {
+			// Make sure it's not a method parameter.
+			if (empty($tokens[$stackPtr]['nested_parenthesis']) === true) {
+				return true;
+			} else {
+				$parenthesis = array_keys($tokens[$stackPtr]['nested_parenthesis']);
+				$deepestOpen = array_pop($parenthesis);
+				if ($deepestOpen < $scopePtr
+					|| isset($tokens[$deepestOpen]['parenthesis_owner']) === false
+					|| $tokens[$tokens[$deepestOpen]['parenthesis_owner']]['code'] !== \T_FUNCTION
+				) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Check whether a T_CONST token is a class constant declaration.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
+	 * @param int                   $stackPtr  The position in the stack of the
+	 *                                         T_CONST token to verify.
+	 *
+	 * @return bool
+	 */
+	public function isClassConstant(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_CONST) {
+			return false;
+		}
+
+		// Note: traits can not declare constants.
+		$validScopes = array(
+			'T_CLASS'      => true,
+			'T_ANON_CLASS' => true,
+			'T_INTERFACE'  => true,
+		);
+		if ($this->validDirectScope($phpcsFile, $stackPtr, $validScopes) !== false) {
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Check whether the direct wrapping scope of a token is within a limited set of
+	 * acceptable tokens.
+	 *
+	 * Used to check, for instance, if a T_CONST is a class constant.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile   Instance of phpcsFile.
+	 * @param int                   $stackPtr    The position in the stack of the
+	 *                                           token to verify.
+	 * @param array                 $validScopes Array of token types.
+	 *                                           Keys should be the token types in string
+	 *                                           format to allow for newer token types.
+	 *                                           Value is irrelevant.
+	 *
+	 * @return int|bool StackPtr to the scope if valid, false otherwise.
+	 */
+	protected function validDirectScope(File $phpcsFile, $stackPtr, $validScopes)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (empty($tokens[$stackPtr]['conditions']) === true) {
+			return false;
+		}
+
+		/*
          * Check only the direct wrapping scope of the token.
          */
-        $conditions = array_keys($tokens[$stackPtr]['conditions']);
-        $ptr        = array_pop($conditions);
-
-        if (isset($tokens[$ptr]) === false) {
-            return false;
-        }
-
-        if (isset($validScopes[$tokens[$ptr]['type']]) === true) {
-            return $ptr;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Get an array of just the type hints from a function declaration.
-     *
-     * Expects to be passed T_FUNCTION or T_CLOSURE token.
-     *
-     * Strips potential nullable indicator and potential global namespace
-     * indicator from the type hints before returning them.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the token.
-     *
-     * @return array Array with type hints or an empty array if
-     *               - the function does not have any parameters
-     *               - no type hints were found
-     *               - or the passed token was not of the correct type.
-     */
-    public function getTypeHintsFromFunctionDeclaration(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
-            return array();
-        }
-
-        $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($parameters) || \is_array($parameters) === false) {
-            return array();
-        }
-
-        $typeHints = array();
-
-        foreach ($parameters as $param) {
-            if ($param['type_hint'] === '') {
-                continue;
-            }
-
-            // Strip off potential nullable indication.
-            $typeHint = ltrim($param['type_hint'], '?');
-
-            // Strip off potential (global) namespace indication.
-            $typeHint = ltrim($typeHint, '\\');
-
-            if ($typeHint !== '') {
-                $typeHints[] = $typeHint;
-            }
-        }
-
-        return $typeHints;
-    }
-
-
-    /**
-     * Get the hash algorithm name from the parameter in a hash function call.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
-     * @param int                   $stackPtr  The position of the T_STRING function token.
-     *
-     * @return string|false The algorithm name without quotes if this was a relevant hash
-     *                      function call or false if it was not.
-     */
-    public function getHashAlgorithmParameter(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        if ($tokens[$stackPtr]['code'] !== \T_STRING) {
-            return false;
-        }
-
-        $functionName   = $tokens[$stackPtr]['content'];
-        $functionNameLc = strtolower($functionName);
-
-        // Bow out if not one of the functions we're targetting.
-        if (isset($this->hashAlgoFunctions[$functionNameLc]) === false) {
-            return false;
-        }
-
-        // Get the parameter from the function call which should contain the algorithm name.
-        $algoParam = $this->getFunctionCallParameter($phpcsFile, $stackPtr, $this->hashAlgoFunctions[$functionNameLc]);
-        if ($algoParam === false) {
-            return false;
-        }
-
-        // Algorithm is a text string, so we need to remove the quotes.
-        $algo = strtolower(trim($algoParam['raw']));
-        $algo = $this->stripQuotes($algo);
-
-        return $algo;
-    }
-
-
-    /**
-     * Determine whether an arbitrary T_STRING token is the use of a global constant.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the function call token.
-     *
-     * @return bool
-     */
-    public function isUseOfGlobalConstant(File $phpcsFile, $stackPtr)
-    {
-        static $isLowPHPCS, $isLowPHP;
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // Is this one of the tokens this function handles ?
-        if ($tokens[$stackPtr]['code'] !== \T_STRING) {
-            return false;
-        }
-
-        // Check for older PHP, PHPCS version so we can compensate for misidentified tokens.
-        if (isset($isLowPHPCS, $isLowPHP) === false) {
-            $isLowPHP   = false;
-            $isLowPHPCS = false;
-            if (version_compare(\PHP_VERSION_ID, '50400', '<')) {
-                $isLowPHP   = true;
-                $isLowPHPCS = version_compare(PHPCSHelper::getVersion(), '2.4.0', '<');
-            }
-        }
-
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($next !== false
-            && ($tokens[$next]['code'] === \T_OPEN_PARENTHESIS
-                || $tokens[$next]['code'] === \T_DOUBLE_COLON)
-        ) {
-            // Function call or declaration.
-            return false;
-        }
-
-        // Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a global constant.
-        $tokensToIgnore = array(
-            'T_NAMESPACE'       => true,
-            'T_USE'             => true,
-            'T_CLASS'           => true,
-            'T_TRAIT'           => true,
-            'T_INTERFACE'       => true,
-            'T_EXTENDS'         => true,
-            'T_IMPLEMENTS'      => true,
-            'T_NEW'             => true,
-            'T_FUNCTION'        => true,
-            'T_DOUBLE_COLON'    => true,
-            'T_OBJECT_OPERATOR' => true,
-            'T_INSTANCEOF'      => true,
-            'T_INSTEADOF'       => true,
-            'T_GOTO'            => true,
-            'T_AS'              => true,
-            'T_PUBLIC'          => true,
-            'T_PROTECTED'       => true,
-            'T_PRIVATE'         => true,
-        );
-
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($prev !== false
-            && (isset($tokensToIgnore[$tokens[$prev]['type']]) === true
-                || ($tokens[$prev]['code'] === \T_STRING
-                    && (($isLowPHPCS === true
-                        && $tokens[$prev]['content'] === 'trait')
-                    || ($isLowPHP === true
-                        && $tokens[$prev]['content'] === 'insteadof'))))
-        ) {
-            // Not the use of a constant.
-            return false;
-        }
-
-        if ($prev !== false
-            && $tokens[$prev]['code'] === \T_NS_SEPARATOR
-            && $tokens[($prev - 1)]['code'] === \T_STRING
-        ) {
-            // Namespaced constant of the same name.
-            return false;
-        }
-
-        if ($prev !== false
-            && $tokens[$prev]['code'] === \T_CONST
-            && $this->isClassConstant($phpcsFile, $prev) === true
-        ) {
-            // Class constant declaration of the same name.
-            return false;
-        }
-
-        /*
+		$conditions = array_keys($tokens[$stackPtr]['conditions']);
+		$ptr        = array_pop($conditions);
+
+		if (isset($tokens[$ptr]) === false) {
+			return false;
+		}
+
+		if (isset($validScopes[$tokens[$ptr]['type']]) === true) {
+			return $ptr;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Get an array of just the type hints from a function declaration.
+	 *
+	 * Expects to be passed T_FUNCTION or T_CLOSURE token.
+	 *
+	 * Strips potential nullable indicator and potential global namespace
+	 * indicator from the type hints before returning them.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the token.
+	 *
+	 * @return array Array with type hints or an empty array if
+	 *               - the function does not have any parameters
+	 *               - no type hints were found
+	 *               - or the passed token was not of the correct type.
+	 */
+	public function getTypeHintsFromFunctionDeclaration(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
+			return array();
+		}
+
+		$parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($parameters) || \is_array($parameters) === false) {
+			return array();
+		}
+
+		$typeHints = array();
+
+		foreach ($parameters as $param) {
+			if ($param['type_hint'] === '') {
+				continue;
+			}
+
+			// Strip off potential nullable indication.
+			$typeHint = ltrim($param['type_hint'], '?');
+
+			// Strip off potential (global) namespace indication.
+			$typeHint = ltrim($typeHint, '\\');
+
+			if ($typeHint !== '') {
+				$typeHints[] = $typeHint;
+			}
+		}
+
+		return $typeHints;
+	}
+
+
+	/**
+	 * Get the hash algorithm name from the parameter in a hash function call.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile Instance of phpcsFile.
+	 * @param int                   $stackPtr  The position of the T_STRING function token.
+	 *
+	 * @return string|false The algorithm name without quotes if this was a relevant hash
+	 *                      function call or false if it was not.
+	 */
+	public function getHashAlgorithmParameter(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		if ($tokens[$stackPtr]['code'] !== \T_STRING) {
+			return false;
+		}
+
+		$functionName   = $tokens[$stackPtr]['content'];
+		$functionNameLc = strtolower($functionName);
+
+		// Bow out if not one of the functions we're targetting.
+		if (isset($this->hashAlgoFunctions[$functionNameLc]) === false) {
+			return false;
+		}
+
+		// Get the parameter from the function call which should contain the algorithm name.
+		$algoParam = $this->getFunctionCallParameter($phpcsFile, $stackPtr, $this->hashAlgoFunctions[$functionNameLc]);
+		if ($algoParam === false) {
+			return false;
+		}
+
+		// Algorithm is a text string, so we need to remove the quotes.
+		$algo = strtolower(trim($algoParam['raw']));
+		$algo = $this->stripQuotes($algo);
+
+		return $algo;
+	}
+
+
+	/**
+	 * Determine whether an arbitrary T_STRING token is the use of a global constant.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the function call token.
+	 *
+	 * @return bool
+	 */
+	public function isUseOfGlobalConstant(File $phpcsFile, $stackPtr)
+	{
+		static $isLowPHPCS, $isLowPHP;
+
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		// Is this one of the tokens this function handles ?
+		if ($tokens[$stackPtr]['code'] !== \T_STRING) {
+			return false;
+		}
+
+		// Check for older PHP, PHPCS version so we can compensate for misidentified tokens.
+		if (isset($isLowPHPCS, $isLowPHP) === false) {
+			$isLowPHP   = false;
+			$isLowPHPCS = false;
+			if (version_compare(\PHP_VERSION_ID, '50400', '<')) {
+				$isLowPHP   = true;
+				$isLowPHPCS = version_compare(PHPCSHelper::getVersion(), '2.4.0', '<');
+			}
+		}
+
+		$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+		if ($next !== false
+			&& ($tokens[$next]['code'] === \T_OPEN_PARENTHESIS
+				|| $tokens[$next]['code'] === \T_DOUBLE_COLON)
+		) {
+			// Function call or declaration.
+			return false;
+		}
+
+		// Array of tokens which if found preceding the $stackPtr indicate that a T_STRING is not a global constant.
+		$tokensToIgnore = array(
+			'T_NAMESPACE'       => true,
+			'T_USE'             => true,
+			'T_CLASS'           => true,
+			'T_TRAIT'           => true,
+			'T_INTERFACE'       => true,
+			'T_EXTENDS'         => true,
+			'T_IMPLEMENTS'      => true,
+			'T_NEW'             => true,
+			'T_FUNCTION'        => true,
+			'T_DOUBLE_COLON'    => true,
+			'T_OBJECT_OPERATOR' => true,
+			'T_INSTANCEOF'      => true,
+			'T_INSTEADOF'       => true,
+			'T_GOTO'            => true,
+			'T_AS'              => true,
+			'T_PUBLIC'          => true,
+			'T_PROTECTED'       => true,
+			'T_PRIVATE'         => true,
+		);
+
+		$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+		if ($prev !== false
+			&& (isset($tokensToIgnore[$tokens[$prev]['type']]) === true
+				|| ($tokens[$prev]['code'] === \T_STRING
+					&& (($isLowPHPCS === true
+						&& $tokens[$prev]['content'] === 'trait')
+					|| ($isLowPHP === true
+						&& $tokens[$prev]['content'] === 'insteadof'))))
+		) {
+			// Not the use of a constant.
+			return false;
+		}
+
+		if ($prev !== false
+			&& $tokens[$prev]['code'] === \T_NS_SEPARATOR
+			&& $tokens[($prev - 1)]['code'] === \T_STRING
+		) {
+			// Namespaced constant of the same name.
+			return false;
+		}
+
+		if ($prev !== false
+			&& $tokens[$prev]['code'] === \T_CONST
+			&& $this->isClassConstant($phpcsFile, $prev) === true
+		) {
+			// Class constant declaration of the same name.
+			return false;
+		}
+
+		/*
          * Deal with a number of variations of use statements.
          */
-        for ($i = $stackPtr; $i > 0; $i--) {
-            if ($tokens[$i]['line'] !== $tokens[$stackPtr]['line']) {
-                break;
-            }
-        }
-
-        $firstOnLine = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-        if ($firstOnLine !== false && $tokens[$firstOnLine]['code'] === \T_USE) {
-            $nextOnLine = $phpcsFile->findNext(Tokens::$emptyTokens, ($firstOnLine + 1), null, true);
-            if ($nextOnLine !== false) {
-                if (($tokens[$nextOnLine]['code'] === \T_STRING && $tokens[$nextOnLine]['content'] === 'const')
-                    || $tokens[$nextOnLine]['code'] === \T_CONST // Happens in some PHPCS versions.
-                ) {
-                    $hasNsSep = $phpcsFile->findNext(\T_NS_SEPARATOR, ($nextOnLine + 1), $stackPtr);
-                    if ($hasNsSep !== false) {
-                        // Namespaced const (group) use statement.
-                        return false;
-                    }
-                } else {
-                    // Not a const use statement.
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Determine whether the tokens between $start and $end together form a positive number
-     * as recognized by PHP.
-     *
-     * The outcome of this function is reliable for `true`, `false` should be regarded as
-     * "undetermined".
-     *
-     * Note: Zero is *not* regarded as a positive number.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                   $start       Start of the snippet (inclusive), i.e. this
-     *                                           token will be examined as part of the snippet.
-     * @param int                   $end         End of the snippet (inclusive), i.e. this
-     *                                           token will be examined as part of the snippet.
-     * @param bool                  $allowFloats Whether to only consider integers, or also floats.
-     *
-     * @return bool True if PHP would evaluate the snippet as a positive number.
-     *              False if not or if it could not be reliably determined
-     *              (variable or calculations and such).
-     */
-    public function isPositiveNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
-        $number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
-
-        if ($number === false) {
-            return false;
-        }
-
-        return ($number > 0);
-    }
-
-
-    /**
-     * Determine whether the tokens between $start and $end together form a negative number
-     * as recognized by PHP.
-     *
-     * The outcome of this function is reliable for `true`, `false` should be regarded as
-     * "undetermined".
-     *
-     * Note: Zero is *not* regarded as a negative number.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                   $start       Start of the snippet (inclusive), i.e. this
-     *                                           token will be examined as part of the snippet.
-     * @param int                   $end         End of the snippet (inclusive), i.e. this
-     *                                           token will be examined as part of the snippet.
-     * @param bool                  $allowFloats Whether to only consider integers, or also floats.
-     *
-     * @return bool True if PHP would evaluate the snippet as a negative number.
-     *              False if not or if it could not be reliably determined
-     *              (variable or calculations and such).
-     */
-    public function isNegativeNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
-        $number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
-
-        if ($number === false) {
-            return false;
-        }
-
-        return ($number < 0);
-    }
-
-    /**
-     * Determine whether the tokens between $start and $end together form a number
-     * as recognized by PHP.
-     *
-     * The outcome of this function is reliable for "true-ish" values, `false` should
-     * be regarded as "undetermined".
-     *
-     * @link https://3v4l.org/npTeM
-     *
-     * Mainly intended for examining variable assignments, function call parameters, array values
-     * where the start and end of the snippet to examine is very clear.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                   $start       Start of the snippet (inclusive), i.e. this
-     *                                           token will be examined as part of the snippet.
-     * @param int                   $end         End of the snippet (inclusive), i.e. this
-     *                                           token will be examined as part of the snippet.
-     * @param bool                  $allowFloats Whether to only consider integers, or also floats.
-     *
-     * @return int|float|bool The number found if PHP would evaluate the snippet as a number.
-     *                        The return type will be int if $allowFloats is false, if
-     *                        $allowFloats is true, the return type will be float.
-     *                        False will be returned when the snippet does not evaluate to a
-     *                        number or if it could not be reliably determined
-     *                        (variable or calculations and such).
-     */
-    protected function isNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
-        $stringTokens = Tokens::$heredocTokens + Tokens::$stringTokens;
-
-        $validTokens             = array();
-        $validTokens[\T_LNUMBER] = true;
-        $validTokens[\T_TRUE]    = true; // Evaluates to int 1.
-        $validTokens[\T_FALSE]   = true; // Evaluates to int 0.
-        $validTokens[\T_NULL]    = true; // Evaluates to int 0.
-
-        if ($allowFloats === true) {
-            $validTokens[\T_DNUMBER] = true;
-        }
-
-        $maybeValidTokens = $stringTokens + $validTokens;
-
-        $tokens         = $phpcsFile->getTokens();
-        $searchEnd      = ($end + 1);
-        $negativeNumber = false;
-
-        if (isset($tokens[$start], $tokens[$searchEnd]) === false) {
-            return false;
-        }
-
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $start, $searchEnd, true);
-        while ($nextNonEmpty !== false
-            && ($tokens[$nextNonEmpty]['code'] === \T_PLUS
-            || $tokens[$nextNonEmpty]['code'] === \T_MINUS)
-        ) {
-
-            if ($tokens[$nextNonEmpty]['code'] === \T_MINUS) {
-                $negativeNumber = ($negativeNumber === false) ? true : false;
-            }
-
-            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNonEmpty + 1), $searchEnd, true);
-        }
-
-        if ($nextNonEmpty === false || isset($maybeValidTokens[$tokens[$nextNonEmpty]['code']]) === false) {
-            return false;
-        }
-
-        $content = false;
-        if ($tokens[$nextNonEmpty]['code'] === \T_LNUMBER
-            || $tokens[$nextNonEmpty]['code'] === \T_DNUMBER
-        ) {
-            $content = (float) $tokens[$nextNonEmpty]['content'];
-        } elseif ($tokens[$nextNonEmpty]['code'] === \T_TRUE) {
-            $content = 1.0;
-        } elseif ($tokens[$nextNonEmpty]['code'] === \T_FALSE
-            || $tokens[$nextNonEmpty]['code'] === \T_NULL
-        ) {
-            $content = 0.0;
-        } elseif (isset($stringTokens[$tokens[$nextNonEmpty]['code']]) === true) {
-
-            if ($tokens[$nextNonEmpty]['code'] === \T_START_HEREDOC
-                || $tokens[$nextNonEmpty]['code'] === \T_START_NOWDOC
-            ) {
-                // Skip past heredoc/nowdoc opener to the first content.
-                $firstDocToken = $phpcsFile->findNext(array(\T_HEREDOC, \T_NOWDOC), ($nextNonEmpty + 1), $searchEnd);
-                if ($firstDocToken === false) {
-                    // Live coding or parse error.
-                    return false;
-                }
-
-                $stringContent = $content = $tokens[$firstDocToken]['content'];
-
-                // Skip forward to the end in preparation for the next part of the examination.
-                $nextNonEmpty = $phpcsFile->findNext(array(\T_END_HEREDOC, \T_END_NOWDOC), ($nextNonEmpty + 1), $searchEnd);
-                if ($nextNonEmpty === false) {
-                    // Live coding or parse error.
-                    return false;
-                }
-            } else {
-                // Gather subsequent lines for a multi-line string.
-                for ($i = $nextNonEmpty; $i < $searchEnd; $i++) {
-                    if ($tokens[$i]['code'] !== $tokens[$nextNonEmpty]['code']) {
-                        break;
-                    }
-                    $content .= $tokens[$i]['content'];
-                }
-
-                $nextNonEmpty  = --$i;
-                $content       = $this->stripQuotes($content);
-                $stringContent = $content;
-            }
-
-            /*
+		for ($i = $stackPtr; $i > 0; $i--) {
+			if ($tokens[$i]['line'] !== $tokens[$stackPtr]['line']) {
+				break;
+			}
+		}
+
+		$firstOnLine = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+		if ($firstOnLine !== false && $tokens[$firstOnLine]['code'] === \T_USE) {
+			$nextOnLine = $phpcsFile->findNext(Tokens::$emptyTokens, ($firstOnLine + 1), null, true);
+			if ($nextOnLine !== false) {
+				if (($tokens[$nextOnLine]['code'] === \T_STRING && $tokens[$nextOnLine]['content'] === 'const')
+					|| $tokens[$nextOnLine]['code'] === \T_CONST // Happens in some PHPCS versions.
+				) {
+					$hasNsSep = $phpcsFile->findNext(\T_NS_SEPARATOR, ($nextOnLine + 1), $stackPtr);
+					if ($hasNsSep !== false) {
+						// Namespaced const (group) use statement.
+						return false;
+					}
+				} else {
+					// Not a const use statement.
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+
+	/**
+	 * Determine whether the tokens between $start and $end together form a positive number
+	 * as recognized by PHP.
+	 *
+	 * The outcome of this function is reliable for `true`, `false` should be regarded as
+	 * "undetermined".
+	 *
+	 * Note: Zero is *not* regarded as a positive number.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	 * @param int                   $start       Start of the snippet (inclusive), i.e. this
+	 *                                           token will be examined as part of the snippet.
+	 * @param int                   $end         End of the snippet (inclusive), i.e. this
+	 *                                           token will be examined as part of the snippet.
+	 * @param bool                  $allowFloats Whether to only consider integers, or also floats.
+	 *
+	 * @return bool True if PHP would evaluate the snippet as a positive number.
+	 *              False if not or if it could not be reliably determined
+	 *              (variable or calculations and such).
+	 */
+	public function isPositiveNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+	{
+		$number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
+
+		if ($number === false) {
+			return false;
+		}
+
+		return ($number > 0);
+	}
+
+
+	/**
+	 * Determine whether the tokens between $start and $end together form a negative number
+	 * as recognized by PHP.
+	 *
+	 * The outcome of this function is reliable for `true`, `false` should be regarded as
+	 * "undetermined".
+	 *
+	 * Note: Zero is *not* regarded as a negative number.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	 * @param int                   $start       Start of the snippet (inclusive), i.e. this
+	 *                                           token will be examined as part of the snippet.
+	 * @param int                   $end         End of the snippet (inclusive), i.e. this
+	 *                                           token will be examined as part of the snippet.
+	 * @param bool                  $allowFloats Whether to only consider integers, or also floats.
+	 *
+	 * @return bool True if PHP would evaluate the snippet as a negative number.
+	 *              False if not or if it could not be reliably determined
+	 *              (variable or calculations and such).
+	 */
+	public function isNegativeNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+	{
+		$number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
+
+		if ($number === false) {
+			return false;
+		}
+
+		return ($number < 0);
+	}
+
+	/**
+	 * Determine whether the tokens between $start and $end together form a number
+	 * as recognized by PHP.
+	 *
+	 * The outcome of this function is reliable for "true-ish" values, `false` should
+	 * be regarded as "undetermined".
+	 *
+	 * @link https://3v4l.org/npTeM
+	 *
+	 * Mainly intended for examining variable assignments, function call parameters, array values
+	 * where the start and end of the snippet to examine is very clear.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	 * @param int                   $start       Start of the snippet (inclusive), i.e. this
+	 *                                           token will be examined as part of the snippet.
+	 * @param int                   $end         End of the snippet (inclusive), i.e. this
+	 *                                           token will be examined as part of the snippet.
+	 * @param bool                  $allowFloats Whether to only consider integers, or also floats.
+	 *
+	 * @return int|float|bool The number found if PHP would evaluate the snippet as a number.
+	 *                        The return type will be int if $allowFloats is false, if
+	 *                        $allowFloats is true, the return type will be float.
+	 *                        False will be returned when the snippet does not evaluate to a
+	 *                        number or if it could not be reliably determined
+	 *                        (variable or calculations and such).
+	 */
+	protected function isNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+	{
+		$stringTokens = Tokens::$heredocTokens + Tokens::$stringTokens;
+
+		$validTokens             = array();
+		$validTokens[\T_LNUMBER] = true;
+		$validTokens[\T_TRUE]    = true; // Evaluates to int 1.
+		$validTokens[\T_FALSE]   = true; // Evaluates to int 0.
+		$validTokens[\T_NULL]    = true; // Evaluates to int 0.
+
+		if ($allowFloats === true) {
+			$validTokens[\T_DNUMBER] = true;
+		}
+
+		$maybeValidTokens = $stringTokens + $validTokens;
+
+		$tokens         = $phpcsFile->getTokens();
+		$searchEnd      = ($end + 1);
+		$negativeNumber = false;
+
+		if (isset($tokens[$start], $tokens[$searchEnd]) === false) {
+			return false;
+		}
+
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $start, $searchEnd, true);
+		while ($nextNonEmpty !== false
+			&& ($tokens[$nextNonEmpty]['code'] === \T_PLUS
+			|| $tokens[$nextNonEmpty]['code'] === \T_MINUS)
+		) {
+
+			if ($tokens[$nextNonEmpty]['code'] === \T_MINUS) {
+				$negativeNumber = ($negativeNumber === false) ? true : false;
+			}
+
+			$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNonEmpty + 1), $searchEnd, true);
+		}
+
+		if ($nextNonEmpty === false || isset($maybeValidTokens[$tokens[$nextNonEmpty]['code']]) === false) {
+			return false;
+		}
+
+		$content = false;
+		if ($tokens[$nextNonEmpty]['code'] === \T_LNUMBER
+			|| $tokens[$nextNonEmpty]['code'] === \T_DNUMBER
+		) {
+			$content = (float) $tokens[$nextNonEmpty]['content'];
+		} elseif ($tokens[$nextNonEmpty]['code'] === \T_TRUE) {
+			$content = 1.0;
+		} elseif ($tokens[$nextNonEmpty]['code'] === \T_FALSE
+			|| $tokens[$nextNonEmpty]['code'] === \T_NULL
+		) {
+			$content = 0.0;
+		} elseif (isset($stringTokens[$tokens[$nextNonEmpty]['code']]) === true) {
+
+			if ($tokens[$nextNonEmpty]['code'] === \T_START_HEREDOC
+				|| $tokens[$nextNonEmpty]['code'] === \T_START_NOWDOC
+			) {
+				// Skip past heredoc/nowdoc opener to the first content.
+				$firstDocToken = $phpcsFile->findNext(array(\T_HEREDOC, \T_NOWDOC), ($nextNonEmpty + 1), $searchEnd);
+				if ($firstDocToken === false) {
+					// Live coding or parse error.
+					return false;
+				}
+
+				$stringContent = $content = $tokens[$firstDocToken]['content'];
+
+				// Skip forward to the end in preparation for the next part of the examination.
+				$nextNonEmpty = $phpcsFile->findNext(array(\T_END_HEREDOC, \T_END_NOWDOC), ($nextNonEmpty + 1), $searchEnd);
+				if ($nextNonEmpty === false) {
+					// Live coding or parse error.
+					return false;
+				}
+			} else {
+				// Gather subsequent lines for a multi-line string.
+				for ($i = $nextNonEmpty; $i < $searchEnd; $i++) {
+					if ($tokens[$i]['code'] !== $tokens[$nextNonEmpty]['code']) {
+						break;
+					}
+					$content .= $tokens[$i]['content'];
+				}
+
+				$nextNonEmpty  = --$i;
+				$content       = $this->stripQuotes($content);
+				$stringContent = $content;
+			}
+
+			/*
              * Regexes based on the formats outlined in the manual, created by JRF.
              * @link http://php.net/manual/en/language.types.float.php
              */
-            $regexInt   = '`^\s*[0-9]+`';
-            $regexFloat = '`^\s*(?:[+-]?(?:(?:(?P<LNUM>[0-9]+)|(?P<DNUM>([0-9]*\.(?P>LNUM)|(?P>LNUM)\.[0-9]*)))[eE][+-]?(?P>LNUM))|(?P>DNUM))`';
-
-            $intString   = preg_match($regexInt, $content, $intMatch);
-            $floatString = preg_match($regexFloat, $content, $floatMatch);
-
-            // Does the text string start with a number ? If so, PHP would juggle it and use it as a number.
-            if ($allowFloats === false) {
-                if ($intString !== 1 || $floatString === 1) {
-                    if ($floatString === 1) {
-                        // Found float. Only integers targetted.
-                        return false;
-                    }
-
-                    $content = 0.0;
-                } else {
-                    $content = (float) trim($intMatch[0]);
-                }
-            } else {
-                if ($intString !== 1 && $floatString !== 1) {
-                    $content = 0.0;
-                } else {
-                    $content = ($floatString === 1) ? (float) trim($floatMatch[0]) : (float) trim($intMatch[0]);
-                }
-            }
-
-            // Allow for different behaviour for hex numeric strings between PHP 5 vs PHP 7.
-            if ($intString === 1 && trim($intMatch[0]) === '0'
-                && preg_match('`^\s*(0x[A-Fa-f0-9]+)`', $stringContent, $hexNumberString) === 1
-                && $this->supportsBelow('5.6') === true
-            ) {
-                // The filter extension still allows for hex numeric strings in PHP 7, so
-                // use that to get the numeric value if possible.
-                // If the filter extension is not available, the value will be zero, but so be it.
-                if (function_exists('filter_var')) {
-                    $filtered = filter_var($hexNumberString[1], \FILTER_VALIDATE_INT, \FILTER_FLAG_ALLOW_HEX);
-                    if ($filtered !== false) {
-                        $content = $filtered;
-                    }
-                }
-            }
-        }
-
-        // OK, so we have a number, now is there still more code after it ?
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNonEmpty + 1), $searchEnd, true);
-        if ($nextNonEmpty !== false) {
-            return false;
-        }
-
-        if ($negativeNumber === true) {
-            $content = -$content;
-        }
-
-        if ($allowFloats === false) {
-            return (int) $content;
-        }
-
-        return $content;
-    }
-
-
-    /**
-     * Determine whether the tokens between $start and $end together form a numberic calculation
-     * as recognized by PHP.
-     *
-     * The outcome of this function is reliable for `true`, `false` should be regarded as "undetermined".
-     *
-     * Mainly intended for examining variable assignments, function call parameters, array values
-     * where the start and end of the snippet to examine is very clear.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $start     Start of the snippet (inclusive), i.e. this
-     *                                         token will be examined as part of the snippet.
-     * @param int                   $end       End of the snippet (inclusive), i.e. this
-     *                                         token will be examined as part of the snippet.
-     *
-     * @return bool
-     */
-    protected function isNumericCalculation(File $phpcsFile, $start, $end)
-    {
-        $arithmeticTokens = Tokens::$arithmeticTokens;
-
-        // phpcs:disable PHPCompatibility.Constants.NewConstants.t_powFound
-        if (\defined('T_POW') && isset($arithmeticTokens[\T_POW]) === false) {
-            // T_POW was not added to the arithmetic array until PHPCS 2.9.0.
-            $arithmeticTokens[\T_POW] = \T_POW;
-        }
-        // phpcs:enable
-
-        $skipTokens   = Tokens::$emptyTokens;
-        $skipTokens[] = \T_MINUS;
-        $skipTokens[] = \T_PLUS;
-
-        // Find the first arithmetic operator, but skip past +/- signs before numbers.
-        $nextNonEmpty = ($start - 1);
-        do {
-            $nextNonEmpty       = $phpcsFile->findNext($skipTokens, ($nextNonEmpty + 1), ($end + 1), true);
-            $arithmeticOperator = $phpcsFile->findNext($arithmeticTokens, ($nextNonEmpty + 1), ($end + 1));
-        } while ($nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator);
-
-        if ($arithmeticOperator === false) {
-            return false;
-        }
-
-        $tokens      = $phpcsFile->getTokens();
-        $subsetStart = $start;
-        $subsetEnd   = ($arithmeticOperator - 1);
-
-        while ($this->isNumber($phpcsFile, $subsetStart, $subsetEnd, true) !== false
-            && isset($tokens[($arithmeticOperator + 1)]) === true
-        ) {
-            // Recognize T_POW for PHPCS < 2.4.0 on low PHP versions.
-            if (\defined('T_POW') === false
-                && $tokens[$arithmeticOperator]['code'] === \T_MULTIPLY
-                && $tokens[($arithmeticOperator + 1)]['code'] === \T_MULTIPLY
-                && isset($tokens[$arithmeticOperator + 2]) === true
-            ) {
-                // Move operator one forward to the second * in T_POW.
-                ++$arithmeticOperator;
-            }
-
-            $subsetStart  = ($arithmeticOperator + 1);
-            $nextNonEmpty = $arithmeticOperator;
-            do {
-                $nextNonEmpty       = $phpcsFile->findNext($skipTokens, ($nextNonEmpty + 1), ($end + 1), true);
-                $arithmeticOperator = $phpcsFile->findNext($arithmeticTokens, ($nextNonEmpty + 1), ($end + 1));
-            } while ($nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator);
-
-            if ($arithmeticOperator === false) {
-                // Last calculation operator already reached.
-                if ($this->isNumber($phpcsFile, $subsetStart, $end, true) !== false) {
-                    return true;
-                }
-
-                return false;
-            }
-
-            $subsetEnd = ($arithmeticOperator - 1);
-        }
-
-        return false;
-    }
-
-
-
-    /**
-     * Determine whether a ternary is a short ternary, i.e. without "middle".
-     *
-     * N.B.: This is a back-fill for a new method which is expected to go into
-     * PHP_CodeSniffer 3.5.0.
-     * Once that method has been merged into PHPCS, this one should be moved
-     * to the PHPCSHelper.php file.
-     *
-     * @since 9.2.0
-     *
-     * @codeCoverageIgnore Method as pulled upstream is accompanied by unit tests.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the ternary operator
-     *                                         in the stack.
-     *
-     * @return bool True if short ternary, or false otherwise.
-     */
-    public function isShortTernary(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if (isset($tokens[$stackPtr]) === false
-            || $tokens[$stackPtr]['code'] !== \T_INLINE_THEN
-        ) {
-            return false;
-        }
-
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($nextNonEmpty === false) {
-            // Live coding or parse error.
-            return false;
-        }
-
-        if ($tokens[$nextNonEmpty]['code'] === \T_INLINE_ELSE) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Determine whether a T_OPEN/CLOSE_SHORT_ARRAY token is a list() construct.
-     *
-     * Note: A variety of PHPCS versions have bugs in the tokenizing of short arrays.
-     * In that case, the tokens are identified as T_OPEN/CLOSE_SQUARE_BRACKET.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the function call token.
-     *
-     * @return bool
-     */
-    public function isShortList(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // Is this one of the tokens this function handles ?
-        if ($tokens[$stackPtr]['code'] !== \T_OPEN_SHORT_ARRAY
-            && $tokens[$stackPtr]['code'] !== \T_CLOSE_SHORT_ARRAY
-        ) {
-            return false;
-        }
-
-        switch ($tokens[$stackPtr]['code']) {
-            case \T_OPEN_SHORT_ARRAY:
-                if (isset($tokens[$stackPtr]['bracket_closer']) === true) {
-                    $opener = $stackPtr;
-                    $closer = $tokens[$stackPtr]['bracket_closer'];
-                }
-                break;
-
-            case \T_CLOSE_SHORT_ARRAY:
-                if (isset($tokens[$stackPtr]['bracket_opener']) === true) {
-                    $opener = $tokens[$stackPtr]['bracket_opener'];
-                    $closer = $stackPtr;
-                }
-                break;
-        }
-
-        if (isset($opener, $closer) === false) {
-            // Parse error, live coding or real square bracket.
-            return false;
-        }
-
-        /*
+			$regexInt   = '`^\s*[0-9]+`';
+			$regexFloat = '`^\s*(?:[+-]?(?:(?:(?P<LNUM>[0-9]+)|(?P<DNUM>([0-9]*\.(?P>LNUM)|(?P>LNUM)\.[0-9]*)))[eE][+-]?(?P>LNUM))|(?P>DNUM))`';
+
+			$intString   = preg_match($regexInt, $content, $intMatch);
+			$floatString = preg_match($regexFloat, $content, $floatMatch);
+
+			// Does the text string start with a number ? If so, PHP would juggle it and use it as a number.
+			if ($allowFloats === false) {
+				if ($intString !== 1 || $floatString === 1) {
+					if ($floatString === 1) {
+						// Found float. Only integers targetted.
+						return false;
+					}
+
+					$content = 0.0;
+				} else {
+					$content = (float) trim($intMatch[0]);
+				}
+			} else {
+				if ($intString !== 1 && $floatString !== 1) {
+					$content = 0.0;
+				} else {
+					$content = ($floatString === 1) ? (float) trim($floatMatch[0]) : (float) trim($intMatch[0]);
+				}
+			}
+
+			// Allow for different behaviour for hex numeric strings between PHP 5 vs PHP 7.
+			if ($intString === 1 && trim($intMatch[0]) === '0'
+				&& preg_match('`^\s*(0x[A-Fa-f0-9]+)`', $stringContent, $hexNumberString) === 1
+				&& $this->supportsBelow('5.6') === true
+			) {
+				// The filter extension still allows for hex numeric strings in PHP 7, so
+				// use that to get the numeric value if possible.
+				// If the filter extension is not available, the value will be zero, but so be it.
+				if (function_exists('filter_var')) {
+					$filtered = filter_var($hexNumberString[1], \FILTER_VALIDATE_INT, \FILTER_FLAG_ALLOW_HEX);
+					if ($filtered !== false) {
+						$content = $filtered;
+					}
+				}
+			}
+		}
+
+		// OK, so we have a number, now is there still more code after it ?
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNonEmpty + 1), $searchEnd, true);
+		if ($nextNonEmpty !== false) {
+			return false;
+		}
+
+		if ($negativeNumber === true) {
+			$content = -$content;
+		}
+
+		if ($allowFloats === false) {
+			return (int) $content;
+		}
+
+		return $content;
+	}
+
+
+	/**
+	 * Determine whether the tokens between $start and $end together form a numberic calculation
+	 * as recognized by PHP.
+	 *
+	 * The outcome of this function is reliable for `true`, `false` should be regarded as "undetermined".
+	 *
+	 * Mainly intended for examining variable assignments, function call parameters, array values
+	 * where the start and end of the snippet to examine is very clear.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $start     Start of the snippet (inclusive), i.e. this
+	 *                                         token will be examined as part of the snippet.
+	 * @param int                   $end       End of the snippet (inclusive), i.e. this
+	 *                                         token will be examined as part of the snippet.
+	 *
+	 * @return bool
+	 */
+	protected function isNumericCalculation(File $phpcsFile, $start, $end)
+	{
+		$arithmeticTokens = Tokens::$arithmeticTokens;
+
+		// phpcs:disable PHPCompatibility.Constants.NewConstants.t_powFound
+		if (\defined('T_POW') && isset($arithmeticTokens[\T_POW]) === false) {
+			// T_POW was not added to the arithmetic array until PHPCS 2.9.0.
+			$arithmeticTokens[\T_POW] = \T_POW;
+		}
+		// phpcs:enable
+
+		$skipTokens   = Tokens::$emptyTokens;
+		$skipTokens[] = \T_MINUS;
+		$skipTokens[] = \T_PLUS;
+
+		// Find the first arithmetic operator, but skip past +/- signs before numbers.
+		$nextNonEmpty = ($start - 1);
+		do {
+			$nextNonEmpty       = $phpcsFile->findNext($skipTokens, ($nextNonEmpty + 1), ($end + 1), true);
+			$arithmeticOperator = $phpcsFile->findNext($arithmeticTokens, ($nextNonEmpty + 1), ($end + 1));
+		} while ($nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator);
+
+		if ($arithmeticOperator === false) {
+			return false;
+		}
+
+		$tokens      = $phpcsFile->getTokens();
+		$subsetStart = $start;
+		$subsetEnd   = ($arithmeticOperator - 1);
+
+		while ($this->isNumber($phpcsFile, $subsetStart, $subsetEnd, true) !== false
+			&& isset($tokens[($arithmeticOperator + 1)]) === true
+		) {
+			// Recognize T_POW for PHPCS < 2.4.0 on low PHP versions.
+			if (\defined('T_POW') === false
+				&& $tokens[$arithmeticOperator]['code'] === \T_MULTIPLY
+				&& $tokens[($arithmeticOperator + 1)]['code'] === \T_MULTIPLY
+				&& isset($tokens[$arithmeticOperator + 2]) === true
+			) {
+				// Move operator one forward to the second * in T_POW.
+				++$arithmeticOperator;
+			}
+
+			$subsetStart  = ($arithmeticOperator + 1);
+			$nextNonEmpty = $arithmeticOperator;
+			do {
+				$nextNonEmpty       = $phpcsFile->findNext($skipTokens, ($nextNonEmpty + 1), ($end + 1), true);
+				$arithmeticOperator = $phpcsFile->findNext($arithmeticTokens, ($nextNonEmpty + 1), ($end + 1));
+			} while ($nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator);
+
+			if ($arithmeticOperator === false) {
+				// Last calculation operator already reached.
+				if ($this->isNumber($phpcsFile, $subsetStart, $end, true) !== false) {
+					return true;
+				}
+
+				return false;
+			}
+
+			$subsetEnd = ($arithmeticOperator - 1);
+		}
+
+		return false;
+	}
+
+
+
+	/**
+	 * Determine whether a ternary is a short ternary, i.e. without "middle".
+	 *
+	 * N.B.: This is a back-fill for a new method which is expected to go into
+	 * PHP_CodeSniffer 3.5.0.
+	 * Once that method has been merged into PHPCS, this one should be moved
+	 * to the PHPCSHelper.php file.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @codeCoverageIgnore Method as pulled upstream is accompanied by unit tests.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the ternary operator
+	 *                                         in the stack.
+	 *
+	 * @return bool True if short ternary, or false otherwise.
+	 */
+	public function isShortTernary(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		if (isset($tokens[$stackPtr]) === false
+			|| $tokens[$stackPtr]['code'] !== \T_INLINE_THEN
+		) {
+			return false;
+		}
+
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+		if ($nextNonEmpty === false) {
+			// Live coding or parse error.
+			return false;
+		}
+
+		if ($tokens[$nextNonEmpty]['code'] === \T_INLINE_ELSE) {
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Determine whether a T_OPEN/CLOSE_SHORT_ARRAY token is a list() construct.
+	 *
+	 * Note: A variety of PHPCS versions have bugs in the tokenizing of short arrays.
+	 * In that case, the tokens are identified as T_OPEN/CLOSE_SQUARE_BRACKET.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the function call token.
+	 *
+	 * @return bool
+	 */
+	public function isShortList(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check for the existence of the token.
+		if (isset($tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		// Is this one of the tokens this function handles ?
+		if ($tokens[$stackPtr]['code'] !== \T_OPEN_SHORT_ARRAY
+			&& $tokens[$stackPtr]['code'] !== \T_CLOSE_SHORT_ARRAY
+		) {
+			return false;
+		}
+
+		switch ($tokens[$stackPtr]['code']) {
+			case \T_OPEN_SHORT_ARRAY:
+				if (isset($tokens[$stackPtr]['bracket_closer']) === true) {
+					$opener = $stackPtr;
+					$closer = $tokens[$stackPtr]['bracket_closer'];
+				}
+				break;
+
+			case \T_CLOSE_SHORT_ARRAY:
+				if (isset($tokens[$stackPtr]['bracket_opener']) === true) {
+					$opener = $tokens[$stackPtr]['bracket_opener'];
+					$closer = $stackPtr;
+				}
+				break;
+		}
+
+		if (isset($opener, $closer) === false) {
+			// Parse error, live coding or real square bracket.
+			return false;
+		}
+
+		/*
          * PHPCS cross-version compatibility: work around for square brackets misidentified
          * as short array when preceded by a variable variable in older PHPCS versions.
          */
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), null, true, null, true);
-
-        if ($prevNonEmpty !== false
-            && $tokens[$prevNonEmpty]['code'] === \T_CLOSE_CURLY_BRACKET
-            && isset($tokens[$prevNonEmpty]['bracket_opener']) === true
-        ) {
-            $maybeVariableVariable = $phpcsFile->findPrevious(
-                Tokens::$emptyTokens,
-                ($tokens[$prevNonEmpty]['bracket_opener'] - 1),
-                null,
-                true,
-                null,
-                true
-            );
-
-            if ($tokens[$maybeVariableVariable]['code'] === \T_VARIABLE
-                || $tokens[$maybeVariableVariable]['code'] === \T_DOLLAR
-            ) {
-                return false;
-            }
-        }
-
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($closer + 1), null, true, null, true);
-
-        if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_EQUAL) {
-            return true;
-        }
-
-        if ($prevNonEmpty !== false
-            && $tokens[$prevNonEmpty]['code'] === \T_AS
-            && isset($tokens[$prevNonEmpty]['nested_parenthesis']) === true
-        ) {
-            $parentheses = array_reverse($tokens[$prevNonEmpty]['nested_parenthesis'], true);
-            foreach ($parentheses as $open => $close) {
-                if (isset($tokens[$open]['parenthesis_owner'])
-                    && $tokens[$tokens[$open]['parenthesis_owner']]['code'] === \T_FOREACH
-                ) {
-                    return true;
-                }
-            }
-        }
-
-        // Maybe this is a short list syntax nested inside another short list syntax ?
-        $parentOpener = $opener;
-        do {
-            $parentOpener = $phpcsFile->findPrevious(
-                array(\T_OPEN_SHORT_ARRAY, \T_OPEN_SQUARE_BRACKET),
-                ($parentOpener - 1),
-                null,
-                false,
-                null,
-                true
-            );
-
-            if ($parentOpener === false) {
-                return false;
-            }
-
-        } while (isset($tokens[$parentOpener]['bracket_closer']) === true
-            && $tokens[$parentOpener]['bracket_closer'] < $opener
-        );
-
-        if (isset($tokens[$parentOpener]['bracket_closer']) === true
-            && $tokens[$parentOpener]['bracket_closer'] > $closer
-        ) {
-            // Work around tokenizer issue in PHPCS 2.0 - 2.7.
-            $phpcsVersion = PHPCSHelper::getVersion();
-            if ((version_compare($phpcsVersion, '2.0', '>') === true
-                && version_compare($phpcsVersion, '2.8', '<') === true)
-                && $tokens[$parentOpener]['code'] === \T_OPEN_SQUARE_BRACKET
-            ) {
-                $nextNonEmpty = $phpcsFile->findNext(
-                    Tokens::$emptyTokens,
-                    ($tokens[$parentOpener]['bracket_closer'] + 1),
-                    null,
-                    true,
-                    null,
-                    true
-                );
-
-                if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_EQUAL) {
-                    return true;
-                }
-
-                return false;
-            }
-
-            return $this->isShortList($phpcsFile, $parentOpener);
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Determine whether the tokens between $start and $end could together represent a variable.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile          The file being scanned.
-     * @param int                   $start              Starting point stack pointer. Inclusive.
-     *                                                  I.e. this token should be taken into account.
-     * @param int                   $end                End point stack pointer. Exclusive.
-     *                                                  I.e. this token should not be taken into account.
-     * @param int                   $targetNestingLevel The nesting level the variable should be at.
-     *
-     * @return bool
-     */
-    public function isVariable(File $phpcsFile, $start, $end, $targetNestingLevel)
-    {
-        static $tokenBlackList, $bracketTokens;
-
-        // Create the token arrays only once.
-        if (isset($tokenBlackList, $bracketTokens) === false) {
-
-            $tokenBlackList  = array(
-                \T_OPEN_PARENTHESIS => \T_OPEN_PARENTHESIS,
-                \T_STRING_CONCAT    => \T_STRING_CONCAT,
-            );
-            $tokenBlackList += Tokens::$assignmentTokens;
-            $tokenBlackList += Tokens::$equalityTokens;
-            $tokenBlackList += Tokens::$comparisonTokens;
-            $tokenBlackList += Tokens::$operators;
-            $tokenBlackList += Tokens::$booleanOperators;
-            $tokenBlackList += Tokens::$castTokens;
-
-            /*
+		$prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), null, true, null, true);
+
+		if ($prevNonEmpty !== false
+			&& $tokens[$prevNonEmpty]['code'] === \T_CLOSE_CURLY_BRACKET
+			&& isset($tokens[$prevNonEmpty]['bracket_opener']) === true
+		) {
+			$maybeVariableVariable = $phpcsFile->findPrevious(
+				Tokens::$emptyTokens,
+				($tokens[$prevNonEmpty]['bracket_opener'] - 1),
+				null,
+				true,
+				null,
+				true
+			);
+
+			if ($tokens[$maybeVariableVariable]['code'] === \T_VARIABLE
+				|| $tokens[$maybeVariableVariable]['code'] === \T_DOLLAR
+			) {
+				return false;
+			}
+		}
+
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($closer + 1), null, true, null, true);
+
+		if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_EQUAL) {
+			return true;
+		}
+
+		if ($prevNonEmpty !== false
+			&& $tokens[$prevNonEmpty]['code'] === \T_AS
+			&& isset($tokens[$prevNonEmpty]['nested_parenthesis']) === true
+		) {
+			$parentheses = array_reverse($tokens[$prevNonEmpty]['nested_parenthesis'], true);
+			foreach ($parentheses as $open => $close) {
+				if (isset($tokens[$open]['parenthesis_owner'])
+					&& $tokens[$tokens[$open]['parenthesis_owner']]['code'] === \T_FOREACH
+				) {
+					return true;
+				}
+			}
+		}
+
+		// Maybe this is a short list syntax nested inside another short list syntax ?
+		$parentOpener = $opener;
+		do {
+			$parentOpener = $phpcsFile->findPrevious(
+				array(\T_OPEN_SHORT_ARRAY, \T_OPEN_SQUARE_BRACKET),
+				($parentOpener - 1),
+				null,
+				false,
+				null,
+				true
+			);
+
+			if ($parentOpener === false) {
+				return false;
+			}
+
+		} while (isset($tokens[$parentOpener]['bracket_closer']) === true
+			&& $tokens[$parentOpener]['bracket_closer'] < $opener
+		);
+
+		if (isset($tokens[$parentOpener]['bracket_closer']) === true
+			&& $tokens[$parentOpener]['bracket_closer'] > $closer
+		) {
+			// Work around tokenizer issue in PHPCS 2.0 - 2.7.
+			$phpcsVersion = PHPCSHelper::getVersion();
+			if ((version_compare($phpcsVersion, '2.0', '>') === true
+				&& version_compare($phpcsVersion, '2.8', '<') === true)
+				&& $tokens[$parentOpener]['code'] === \T_OPEN_SQUARE_BRACKET
+			) {
+				$nextNonEmpty = $phpcsFile->findNext(
+					Tokens::$emptyTokens,
+					($tokens[$parentOpener]['bracket_closer'] + 1),
+					null,
+					true,
+					null,
+					true
+				);
+
+				if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_EQUAL) {
+					return true;
+				}
+
+				return false;
+			}
+
+			return $this->isShortList($phpcsFile, $parentOpener);
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Determine whether the tokens between $start and $end could together represent a variable.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile          The file being scanned.
+	 * @param int                   $start              Starting point stack pointer. Inclusive.
+	 *                                                  I.e. this token should be taken into account.
+	 * @param int                   $end                End point stack pointer. Exclusive.
+	 *                                                  I.e. this token should not be taken into account.
+	 * @param int                   $targetNestingLevel The nesting level the variable should be at.
+	 *
+	 * @return bool
+	 */
+	public function isVariable(File $phpcsFile, $start, $end, $targetNestingLevel)
+	{
+		static $tokenBlackList, $bracketTokens;
+
+		// Create the token arrays only once.
+		if (isset($tokenBlackList, $bracketTokens) === false) {
+
+			$tokenBlackList  = array(
+				\T_OPEN_PARENTHESIS => \T_OPEN_PARENTHESIS,
+				\T_STRING_CONCAT    => \T_STRING_CONCAT,
+			);
+			$tokenBlackList += Tokens::$assignmentTokens;
+			$tokenBlackList += Tokens::$equalityTokens;
+			$tokenBlackList += Tokens::$comparisonTokens;
+			$tokenBlackList += Tokens::$operators;
+			$tokenBlackList += Tokens::$booleanOperators;
+			$tokenBlackList += Tokens::$castTokens;
+
+			/*
              * List of brackets which can be part of a variable variable.
              *
              * Key is the open bracket token, value the close bracket token.
              */
-            $bracketTokens = array(
-                \T_OPEN_CURLY_BRACKET  => \T_CLOSE_CURLY_BRACKET,
-                \T_OPEN_SQUARE_BRACKET => \T_CLOSE_SQUARE_BRACKET,
-            );
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // If no variable at all was found, then it's definitely a no-no.
-        $hasVariable = $phpcsFile->findNext(\T_VARIABLE, $start, $end);
-        if ($hasVariable === false) {
-            return false;
-        }
-
-        // Check if the variable found is at the right level. Deeper levels are always an error.
-        if (isset($tokens[$hasVariable]['nested_parenthesis'])
-            && \count($tokens[$hasVariable]['nested_parenthesis']) !== $targetNestingLevel
-        ) {
-                return false;
-        }
-
-        // Ok, so the first variable is at the right level, now are there any
-        // blacklisted tokens within the empty() ?
-        $hasBadToken = $phpcsFile->findNext($tokenBlackList, $start, $end);
-        if ($hasBadToken === false) {
-            return true;
-        }
-
-        // If there are also bracket tokens, the blacklisted token might be part of a variable
-        // variable, but if there are no bracket tokens, we know we have an error.
-        $hasBrackets = $phpcsFile->findNext($bracketTokens, $start, $end);
-        if ($hasBrackets === false) {
-            return false;
-        }
-
-        // Ok, we have both a blacklisted token as well as brackets, so we need to walk
-        // the tokens of the variable variable.
-        for ($i = $start; $i < $end; $i++) {
-            // If this is a bracket token, skip to the end of the bracketed expression.
-            if (isset($bracketTokens[$tokens[$i]['code']], $tokens[$i]['bracket_closer'])) {
-                $i = $tokens[$i]['bracket_closer'];
-                continue;
-            }
-
-            // If it's a blacklisted token, not within brackets, we have an error.
-            if (isset($tokenBlackList[$tokens[$i]['code']])) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine whether a T_MINUS/T_PLUS token is a unary operator.
-     *
-     * N.B.: This is a back-fill for a new method which is expected to go into
-     * PHP_CodeSniffer 3.5.0.
-     * Once that method has been merged into PHPCS, this one should be moved
-     * to the PHPCSHelper.php file.
-     *
-     * @since 9.2.0
-     *
-     * @codeCoverageIgnore Method as pulled upstream is accompanied by unit tests.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the plus/minus token.
-     *
-     * @return bool True if the token passed is a unary operator.
-     *              False otherwise or if the token is not a T_PLUS/T_MINUS token.
-     */
-    public static function isUnaryPlusMinus(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]) === false
-            || ($tokens[$stackPtr]['code'] !== \T_PLUS
-            && $tokens[$stackPtr]['code'] !== \T_MINUS)
-        ) {
-            return false;
-        }
-
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($next === false) {
-            // Live coding or parse error.
-            return false;
-        }
-
-        if (isset(Tokens::$operators[$tokens[$next]['code']]) === true) {
-            // Next token is an operator, so this is not a unary.
-            return false;
-        }
-
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-
-        if ($tokens[$prev]['code'] === \T_RETURN) {
-            // Just returning a positive/negative value; eg. (return -1).
-            return true;
-        }
-
-        if (isset(Tokens::$operators[$tokens[$prev]['code']]) === true) {
-            // Just trying to operate on a positive/negative value; eg. ($var * -1).
-            return true;
-        }
-
-        if (isset(Tokens::$comparisonTokens[$tokens[$prev]['code']]) === true) {
-            // Just trying to compare a positive/negative value; eg. ($var === -1).
-            return true;
-        }
-
-        if (isset(Tokens::$booleanOperators[$tokens[$prev]['code']]) === true) {
-            // Just trying to compare a positive/negative value; eg. ($var || -1 === $b).
-            return true;
-        }
-
-        if (isset(Tokens::$assignmentTokens[$tokens[$prev]['code']]) === true) {
-            // Just trying to assign a positive/negative value; eg. ($var = -1).
-            return true;
-        }
-
-        if (isset(Tokens::$castTokens[$tokens[$prev]['code']]) === true) {
-            // Just casting a positive/negative value; eg. (string) -$var.
-            return true;
-        }
-
-        // Other indicators that a plus/minus sign is a unary operator.
-        $invalidTokens = array(
-            \T_COMMA               => true,
-            \T_OPEN_PARENTHESIS    => true,
-            \T_OPEN_SQUARE_BRACKET => true,
-            \T_OPEN_SHORT_ARRAY    => true,
-            \T_COLON               => true,
-            \T_INLINE_THEN         => true,
-            \T_INLINE_ELSE         => true,
-            \T_CASE                => true,
-            \T_OPEN_CURLY_BRACKET  => true,
-            \T_STRING_CONCAT       => true,
-        );
-
-        if (isset($invalidTokens[$tokens[$prev]['code']]) === true) {
-            // Just trying to use a positive/negative value; eg. myFunction($var, -2).
-            return true;
-        }
-
-        return false;
-    }
+			$bracketTokens = array(
+				\T_OPEN_CURLY_BRACKET  => \T_CLOSE_CURLY_BRACKET,
+				\T_OPEN_SQUARE_BRACKET => \T_CLOSE_SQUARE_BRACKET,
+			);
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		// If no variable at all was found, then it's definitely a no-no.
+		$hasVariable = $phpcsFile->findNext(\T_VARIABLE, $start, $end);
+		if ($hasVariable === false) {
+			return false;
+		}
+
+		// Check if the variable found is at the right level. Deeper levels are always an error.
+		if (isset($tokens[$hasVariable]['nested_parenthesis'])
+			&& \count($tokens[$hasVariable]['nested_parenthesis']) !== $targetNestingLevel
+		) {
+				return false;
+		}
+
+		// Ok, so the first variable is at the right level, now are there any
+		// blacklisted tokens within the empty() ?
+		$hasBadToken = $phpcsFile->findNext($tokenBlackList, $start, $end);
+		if ($hasBadToken === false) {
+			return true;
+		}
+
+		// If there are also bracket tokens, the blacklisted token might be part of a variable
+		// variable, but if there are no bracket tokens, we know we have an error.
+		$hasBrackets = $phpcsFile->findNext($bracketTokens, $start, $end);
+		if ($hasBrackets === false) {
+			return false;
+		}
+
+		// Ok, we have both a blacklisted token as well as brackets, so we need to walk
+		// the tokens of the variable variable.
+		for ($i = $start; $i < $end; $i++) {
+			// If this is a bracket token, skip to the end of the bracketed expression.
+			if (isset($bracketTokens[$tokens[$i]['code']], $tokens[$i]['bracket_closer'])) {
+				$i = $tokens[$i]['bracket_closer'];
+				continue;
+			}
+
+			// If it's a blacklisted token, not within brackets, we have an error.
+			if (isset($tokenBlackList[$tokens[$i]['code']])) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Determine whether a T_MINUS/T_PLUS token is a unary operator.
+	 *
+	 * N.B.: This is a back-fill for a new method which is expected to go into
+	 * PHP_CodeSniffer 3.5.0.
+	 * Once that method has been merged into PHPCS, this one should be moved
+	 * to the PHPCSHelper.php file.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @codeCoverageIgnore Method as pulled upstream is accompanied by unit tests.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the plus/minus token.
+	 *
+	 * @return bool True if the token passed is a unary operator.
+	 *              False otherwise or if the token is not a T_PLUS/T_MINUS token.
+	 */
+	public static function isUnaryPlusMinus(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]) === false
+			|| ($tokens[$stackPtr]['code'] !== \T_PLUS
+			&& $tokens[$stackPtr]['code'] !== \T_MINUS)
+		) {
+			return false;
+		}
+
+		$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+		if ($next === false) {
+			// Live coding or parse error.
+			return false;
+		}
+
+		if (isset(Tokens::$operators[$tokens[$next]['code']]) === true) {
+			// Next token is an operator, so this is not a unary.
+			return false;
+		}
+
+		$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+
+		if ($tokens[$prev]['code'] === \T_RETURN) {
+			// Just returning a positive/negative value; eg. (return -1).
+			return true;
+		}
+
+		if (isset(Tokens::$operators[$tokens[$prev]['code']]) === true) {
+			// Just trying to operate on a positive/negative value; eg. ($var * -1).
+			return true;
+		}
+
+		if (isset(Tokens::$comparisonTokens[$tokens[$prev]['code']]) === true) {
+			// Just trying to compare a positive/negative value; eg. ($var === -1).
+			return true;
+		}
+
+		if (isset(Tokens::$booleanOperators[$tokens[$prev]['code']]) === true) {
+			// Just trying to compare a positive/negative value; eg. ($var || -1 === $b).
+			return true;
+		}
+
+		if (isset(Tokens::$assignmentTokens[$tokens[$prev]['code']]) === true) {
+			// Just trying to assign a positive/negative value; eg. ($var = -1).
+			return true;
+		}
+
+		if (isset(Tokens::$castTokens[$tokens[$prev]['code']]) === true) {
+			// Just casting a positive/negative value; eg. (string) -$var.
+			return true;
+		}
+
+		// Other indicators that a plus/minus sign is a unary operator.
+		$invalidTokens = array(
+			\T_COMMA               => true,
+			\T_OPEN_PARENTHESIS    => true,
+			\T_OPEN_SQUARE_BRACKET => true,
+			\T_OPEN_SHORT_ARRAY    => true,
+			\T_COLON               => true,
+			\T_INLINE_THEN         => true,
+			\T_INLINE_ELSE         => true,
+			\T_CASE                => true,
+			\T_OPEN_CURLY_BRACKET  => true,
+			\T_STRING_CONCAT       => true,
+		);
+
+		if (isset($invalidTokens[$tokens[$prev]['code']]) === true) {
+			// Just trying to use a positive/negative value; eg. myFunction($var, -2).
+			return true;
+		}
+
+		return false;
+	}
 }

Spacing +418 added lines, -418 removed lines

@@ -109,39 +109,39 @@ 
     {
         static $arrTestVersions = array();
 
-        $default     = array(null, null);
-        $testVersion = trim(PHPCSHelper::getConfigData('testVersion'));
+        $default     = array( null, null );
+        $testVersion = trim( PHPCSHelper::getConfigData( 'testVersion' ) );
 
-        if (empty($testVersion) === false && isset($arrTestVersions[$testVersion]) === false) {
+        if ( empty( $testVersion ) === false && isset( $arrTestVersions[ $testVersion ] ) === false ) {
 
-            $arrTestVersions[$testVersion] = $default;
+            $arrTestVersions[ $testVersion ] = $default;
 
-            if (preg_match('`^\d+\.\d+$`', $testVersion)) {
-                $arrTestVersions[$testVersion] = array($testVersion, $testVersion);
-                return $arrTestVersions[$testVersion];
+            if ( preg_match( '`^\d+\.\d+$`', $testVersion ) ) {
+                $arrTestVersions[ $testVersion ] = array( $testVersion, $testVersion );
+                return $arrTestVersions[ $testVersion ];
             }
 
-            if (preg_match('`^(\d+\.\d+)?\s*-\s*(\d+\.\d+)?$`', $testVersion, $matches)) {
-                if (empty($matches[1]) === false || empty($matches[2]) === false) {
+            if ( preg_match( '`^(\d+\.\d+)?\s*-\s*(\d+\.\d+)?$`', $testVersion, $matches ) ) {
+                if ( empty( $matches[ 1 ] ) === false || empty( $matches[ 2 ] ) === false ) {
                     // If no lower-limit is set, we set the min version to 4.0.
                     // Whilst development focuses on PHP 5 and above, we also accept
                     // sniffs for PHP 4, so we include that as the minimum.
                     // (It makes no sense to support PHP 3 as this was effectively a
                     // different language).
-                    $min = empty($matches[1]) ? '4.0' : $matches[1];
+                    $min = empty( $matches[ 1 ] ) ? '4.0' : $matches[ 1 ];
 
                     // If no upper-limit is set, we set the max version to 99.9.
-                    $max = empty($matches[2]) ? '99.9' : $matches[2];
+                    $max = empty( $matches[ 2 ] ) ? '99.9' : $matches[ 2 ];
 
-                    if (version_compare($min, $max, '>')) {
+                    if ( version_compare( $min, $max, '>' ) ) {
                         trigger_error(
                             "Invalid range in testVersion setting: '" . $testVersion . "'",
                             \E_USER_WARNING
                         );
                         return $default;
                     } else {
-                        $arrTestVersions[$testVersion] = array($min, $max);
-                        return $arrTestVersions[$testVersion];
+                        $arrTestVersions[ $testVersion ] = array( $min, $max );
+                        return $arrTestVersions[ $testVersion ];
                     }
                 }
             }
@@ -153,8 +153,8 @@ 
             return $default;
         }
 
-        if (isset($arrTestVersions[$testVersion])) {
-            return $arrTestVersions[$testVersion];
+        if ( isset( $arrTestVersions[ $testVersion ] ) ) {
+            return $arrTestVersions[ $testVersion ];
         }
 
         return $default;
@@ -173,13 +173,13 @@ 
      *              is equal to or higher than the highest supported PHP version
      *              in testVersion. False otherwise.
      */
-    public function supportsAbove($phpVersion)
+    public function supportsAbove( $phpVersion )
     {
         $testVersion = $this->getTestVersion();
-        $testVersion = $testVersion[1];
+        $testVersion = $testVersion[ 1 ];
 
-        if (\is_null($testVersion)
-            || version_compare($testVersion, $phpVersion) >= 0
+        if ( \is_null( $testVersion )
+            || version_compare( $testVersion, $phpVersion ) >= 0
         ) {
             return true;
         } else {
@@ -200,13 +200,13 @@ 
      *              supported PHP version in testVersion.
      *              False otherwise or if no testVersion is provided.
      */
-    public function supportsBelow($phpVersion)
+    public function supportsBelow( $phpVersion )
     {
         $testVersion = $this->getTestVersion();
-        $testVersion = $testVersion[0];
+        $testVersion = $testVersion[ 0 ];
 
-        if (\is_null($testVersion) === false
-            && version_compare($testVersion, $phpVersion) <= 0
+        if ( \is_null( $testVersion ) === false
+            && version_compare( $testVersion, $phpVersion ) <= 0
         ) {
             return true;
         } else {
@@ -231,12 +231,12 @@ 
      *
      * @return void
      */
-    public function addMessage(File $phpcsFile, $message, $stackPtr, $isError, $code = 'Found', $data = array())
+    public function addMessage( File $phpcsFile, $message, $stackPtr, $isError, $code = 'Found', $data = array() )
     {
-        if ($isError === true) {
-            $phpcsFile->addError($message, $stackPtr, $code, $data);
+        if ( $isError === true ) {
+            $phpcsFile->addError( $message, $stackPtr, $code, $data );
         } else {
-            $phpcsFile->addWarning($message, $stackPtr, $code, $data);
+            $phpcsFile->addWarning( $message, $stackPtr, $code, $data );
         }
     }
 
@@ -250,9 +250,9 @@ 
      *
      * @return string
      */
-    public function stringToErrorCode($baseString)
+    public function stringToErrorCode( $baseString )
     {
-        return preg_replace('`[^a-z0-9_]`i', '_', strtolower($baseString));
+        return preg_replace( '`[^a-z0-9_]`i', '_', strtolower( $baseString ) );
     }
 
 
@@ -265,9 +265,9 @@ 
      *
      * @return string String without quotes around it.
      */
-    public function stripQuotes($string)
+    public function stripQuotes( $string )
     {
-        return preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $string);
+        return preg_replace( '`^([\'"])(.*)\1$`Ds', '$2', $string );
     }
 
 
@@ -280,13 +280,13 @@ 
      *
      * @return string String without variables in it.
      */
-    public function stripVariables($string)
+    public function stripVariables( $string )
     {
-        if (strpos($string, '$') === false) {
+        if ( strpos( $string, '$' ) === false ) {
             return $string;
         }
 
-        return preg_replace(self::REGEX_COMPLEX_VARS, '', $string);
+        return preg_replace( self::REGEX_COMPLEX_VARS, '', $string );
     }
 
 
@@ -297,9 +297,9 @@ 
      *
      * @return array Same array, but with all lowercase top level keys.
      */
-    public function arrayKeysToLowercase($array)
+    public function arrayKeysToLowercase( $array )
     {
-        return array_change_key_case($array, \CASE_LOWER);
+        return array_change_key_case( $array, \CASE_LOWER );
     }
 
 
@@ -320,29 +320,29 @@ 
      *
      * @return bool
      */
-    public function doesFunctionCallHaveParameters(File $phpcsFile, $stackPtr)
+    public function doesFunctionCallHaveParameters( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
         // Is this one of the tokens this function handles ?
-        if (\in_array($tokens[$stackPtr]['code'], array(\T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY, \T_VARIABLE), true) === false) {
+        if ( \in_array( $tokens[ $stackPtr ][ 'code' ], array( \T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY, \T_VARIABLE ), true ) === false ) {
             return false;
         }
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
 
         // Deal with short array syntax.
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            if (isset($tokens[$stackPtr]['bracket_closer']) === false) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_OPEN_SHORT_ARRAY ) {
+            if ( isset( $tokens[ $stackPtr ][ 'bracket_closer' ] ) === false ) {
                 return false;
             }
 
-            if ($nextNonEmpty === $tokens[$stackPtr]['bracket_closer']) {
+            if ( $nextNonEmpty === $tokens[ $stackPtr ][ 'bracket_closer' ] ) {
                 // No parameters.
                 return false;
             } else {
@@ -352,18 +352,18 @@ 
 
         // Deal with function calls & long arrays.
         // Next non-empty token should be the open parenthesis.
-        if ($nextNonEmpty === false && $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
+        if ( $nextNonEmpty === false && $tokens[ $nextNonEmpty ][ 'code' ] !== \T_OPEN_PARENTHESIS ) {
             return false;
         }
 
-        if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
+        if ( isset( $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ] ) === false ) {
             return false;
         }
 
-        $closeParenthesis = $tokens[$nextNonEmpty]['parenthesis_closer'];
-        $nextNextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $nextNonEmpty + 1, $closeParenthesis + 1, true);
+        $closeParenthesis = $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ];
+        $nextNextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, $nextNonEmpty + 1, $closeParenthesis + 1, true );
 
-        if ($nextNextNonEmpty === $closeParenthesis) {
+        if ( $nextNextNonEmpty === $closeParenthesis ) {
             // No parameters.
             return false;
         }
@@ -390,13 +390,13 @@ 
      *
      * @return int
      */
-    public function getFunctionCallParameterCount(File $phpcsFile, $stackPtr)
+    public function getFunctionCallParameterCount( File $phpcsFile, $stackPtr )
     {
-        if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
+        if ( $this->doesFunctionCallHaveParameters( $phpcsFile, $stackPtr ) === false ) {
             return 0;
         }
 
-        return \count($this->getFunctionCallParameters($phpcsFile, $stackPtr));
+        return \count( $this->getFunctionCallParameters( $phpcsFile, $stackPtr ) );
     }
 
 
@@ -418,9 +418,9 @@ 
      *
      * @return array
      */
-    public function getFunctionCallParameters(File $phpcsFile, $stackPtr)
+    public function getFunctionCallParameters( File $phpcsFile, $stackPtr )
     {
-        if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
+        if ( $this->doesFunctionCallHaveParameters( $phpcsFile, $stackPtr ) === false ) {
             return array();
         }
 
@@ -429,74 +429,74 @@ 
         $tokens = $phpcsFile->getTokens();
 
         // Mark the beginning and end tokens.
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_OPEN_SHORT_ARRAY ) {
             $opener = $stackPtr;
-            $closer = $tokens[$stackPtr]['bracket_closer'];
+            $closer = $tokens[ $stackPtr ][ 'bracket_closer' ];
 
             $nestedParenthesisCount = 0;
 
         } else {
-            $opener = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-            $closer = $tokens[$opener]['parenthesis_closer'];
+            $opener = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
+            $closer = $tokens[ $opener ][ 'parenthesis_closer' ];
 
             $nestedParenthesisCount = 1;
         }
 
         // Which nesting level is the one we are interested in ?
-        if (isset($tokens[$opener]['nested_parenthesis'])) {
-            $nestedParenthesisCount += \count($tokens[$opener]['nested_parenthesis']);
+        if ( isset( $tokens[ $opener ][ 'nested_parenthesis' ] ) ) {
+            $nestedParenthesisCount += \count( $tokens[ $opener ][ 'nested_parenthesis' ] );
         }
 
         $parameters = array();
         $nextComma  = $opener;
         $paramStart = $opener + 1;
         $cnt        = 1;
-        while (($nextComma = $phpcsFile->findNext(array(\T_COMMA, $tokens[$closer]['code'], \T_OPEN_SHORT_ARRAY, \T_CLOSURE), $nextComma + 1, $closer + 1)) !== false) {
+        while ( ( $nextComma = $phpcsFile->findNext( array( \T_COMMA, $tokens[ $closer ][ 'code' ], \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), $nextComma + 1, $closer + 1 ) ) !== false ) {
             // Ignore anything within short array definition brackets.
-            if ($tokens[$nextComma]['type'] === 'T_OPEN_SHORT_ARRAY'
-                && (isset($tokens[$nextComma]['bracket_opener'])
-                    && $tokens[$nextComma]['bracket_opener'] === $nextComma)
-                && isset($tokens[$nextComma]['bracket_closer'])
+            if ( $tokens[ $nextComma ][ 'type' ] === 'T_OPEN_SHORT_ARRAY'
+                && ( isset( $tokens[ $nextComma ][ 'bracket_opener' ] )
+                    && $tokens[ $nextComma ][ 'bracket_opener' ] === $nextComma )
+                && isset( $tokens[ $nextComma ][ 'bracket_closer' ] )
             ) {
                 // Skip forward to the end of the short array definition.
-                $nextComma = $tokens[$nextComma]['bracket_closer'];
+                $nextComma = $tokens[ $nextComma ][ 'bracket_closer' ];
                 continue;
             }
 
             // Skip past closures passed as function parameters.
-            if ($tokens[$nextComma]['type'] === 'T_CLOSURE'
-                && (isset($tokens[$nextComma]['scope_condition'])
-                    && $tokens[$nextComma]['scope_condition'] === $nextComma)
-                && isset($tokens[$nextComma]['scope_closer'])
+            if ( $tokens[ $nextComma ][ 'type' ] === 'T_CLOSURE'
+                && ( isset( $tokens[ $nextComma ][ 'scope_condition' ] )
+                    && $tokens[ $nextComma ][ 'scope_condition' ] === $nextComma )
+                && isset( $tokens[ $nextComma ][ 'scope_closer' ] )
             ) {
                 // Skip forward to the end of the closure declaration.
-                $nextComma = $tokens[$nextComma]['scope_closer'];
+                $nextComma = $tokens[ $nextComma ][ 'scope_closer' ];
                 continue;
             }
 
             // Ignore comma's at a lower nesting level.
-            if ($tokens[$nextComma]['type'] === 'T_COMMA'
-                && isset($tokens[$nextComma]['nested_parenthesis'])
-                && \count($tokens[$nextComma]['nested_parenthesis']) !== $nestedParenthesisCount
+            if ( $tokens[ $nextComma ][ 'type' ] === 'T_COMMA'
+                && isset( $tokens[ $nextComma ][ 'nested_parenthesis' ] )
+                && \count( $tokens[ $nextComma ][ 'nested_parenthesis' ] ) !== $nestedParenthesisCount
             ) {
                 continue;
             }
 
             // Ignore closing parenthesis/bracket if not 'ours'.
-            if ($tokens[$nextComma]['type'] === $tokens[$closer]['type'] && $nextComma !== $closer) {
+            if ( $tokens[ $nextComma ][ 'type' ] === $tokens[ $closer ][ 'type' ] && $nextComma !== $closer ) {
                 continue;
             }
 
             // Ok, we've reached the end of the parameter.
-            $parameters[$cnt]['start'] = $paramStart;
-            $parameters[$cnt]['end']   = $nextComma - 1;
-            $parameters[$cnt]['raw']   = trim($phpcsFile->getTokensAsString($paramStart, ($nextComma - $paramStart)));
+            $parameters[ $cnt ][ 'start' ] = $paramStart;
+            $parameters[ $cnt ][ 'end' ]   = $nextComma - 1;
+            $parameters[ $cnt ][ 'raw' ]   = trim( $phpcsFile->getTokensAsString( $paramStart, ( $nextComma - $paramStart ) ) );
 
             // Check if there are more tokens before the closing parenthesis.
             // Prevents code like the following from setting a third parameter:
             // functionCall( $param1, $param2, );
-            $hasNextParam = $phpcsFile->findNext(Tokens::$emptyTokens, $nextComma + 1, $closer, true, null, true);
-            if ($hasNextParam === false) {
+            $hasNextParam = $phpcsFile->findNext( Tokens::$emptyTokens, $nextComma + 1, $closer, true, null, true );
+            if ( $hasNextParam === false ) {
                 break;
             }
 
@@ -525,14 +525,14 @@ 
      *
      * @return array|false
      */
-    public function getFunctionCallParameter(File $phpcsFile, $stackPtr, $paramOffset)
+    public function getFunctionCallParameter( File $phpcsFile, $stackPtr, $paramOffset )
     {
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
+        $parameters = $this->getFunctionCallParameters( $phpcsFile, $stackPtr );
 
-        if (isset($parameters[$paramOffset]) === false) {
+        if ( isset( $parameters[ $paramOffset ] ) === false ) {
             return false;
         } else {
-            return $parameters[$paramOffset];
+            return $parameters[ $paramOffset ];
         }
     }
 
@@ -555,26 +555,26 @@ 
      *              If the $scopeTypes are set: True if *one* of the conditions is a
      *              valid scope, false otherwise.
      */
-    public function tokenHasScope(File $phpcsFile, $stackPtr, $validScopes = null)
+    public function tokenHasScope( File $phpcsFile, $stackPtr, $validScopes = null )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
         // No conditions = no scope.
-        if (empty($tokens[$stackPtr]['conditions'])) {
+        if ( empty( $tokens[ $stackPtr ][ 'conditions' ] ) ) {
             return false;
         }
 
         // Ok, there are conditions, do we have to check for specific ones ?
-        if (isset($validScopes) === false) {
+        if ( isset( $validScopes ) === false ) {
             return true;
         }
 
-        return $phpcsFile->hasCondition($stackPtr, $validScopes);
+        return $phpcsFile->hasCondition( $stackPtr, $validScopes );
     }
 
 
@@ -589,19 +589,19 @@ 
      *
      * @return bool True if within class scope, false otherwise.
      */
-    public function inClassScope(File $phpcsFile, $stackPtr, $strict = true)
+    public function inClassScope( File $phpcsFile, $stackPtr, $strict = true )
     {
-        $validScopes = array(\T_CLASS);
-        if (\defined('T_ANON_CLASS') === true) {
-            $validScopes[] = \T_ANON_CLASS;
+        $validScopes = array( \T_CLASS );
+        if ( \defined( 'T_ANON_CLASS' ) === true ) {
+            $validScopes[ ] = \T_ANON_CLASS;
         }
 
-        if ($strict === false) {
-            $validScopes[] = \T_INTERFACE;
-            $validScopes[] = \T_TRAIT;
+        if ( $strict === false ) {
+            $validScopes[ ] = \T_INTERFACE;
+            $validScopes[ ] = \T_TRAIT;
         }
 
-        return $phpcsFile->hasCondition($stackPtr, $validScopes);
+        return $phpcsFile->hasCondition( $stackPtr, $validScopes );
     }
 
 
@@ -615,31 +615,31 @@ 
      *
      * @return string
      */
-    public function getFQClassNameFromNewToken(File $phpcsFile, $stackPtr)
+    public function getFQClassNameFromNewToken( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return '';
         }
 
-        if ($tokens[$stackPtr]['code'] !== \T_NEW) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_NEW ) {
             return '';
         }
 
-        $start = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-        if ($start === false) {
+        $start = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
+        if ( $start === false ) {
             return '';
         }
 
         // Bow out if the next token is a variable as we don't know where it was defined.
-        if ($tokens[$start]['code'] === \T_VARIABLE) {
+        if ( $tokens[ $start ][ 'code' ] === \T_VARIABLE ) {
             return '';
         }
 
         // Bow out if the next token is the class keyword.
-        if ($tokens[$start]['type'] === 'T_ANON_CLASS' || $tokens[$start]['code'] === \T_CLASS) {
+        if ( $tokens[ $start ][ 'type' ] === 'T_ANON_CLASS' || $tokens[ $start ][ 'code' ] === \T_CLASS ) {
             return '';
         }
 
@@ -650,11 +650,11 @@ 
             \T_WHITESPACE,
         );
 
-        $end       = $phpcsFile->findNext($find, ($start + 1), null, true, null, true);
-        $className = $phpcsFile->getTokensAsString($start, ($end - $start));
-        $className = trim($className);
+        $end       = $phpcsFile->findNext( $find, ( $start + 1 ), null, true, null, true );
+        $className = $phpcsFile->getTokensAsString( $start, ( $end - $start ) );
+        $className = trim( $className );
 
-        return $this->getFQName($phpcsFile, $stackPtr, $className);
+        return $this->getFQName( $phpcsFile, $stackPtr, $className );
     }
 
 
@@ -669,28 +669,28 @@ 
      *
      * @return string
      */
-    public function getFQExtendedClassName(File $phpcsFile, $stackPtr)
+    public function getFQExtendedClassName( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return '';
         }
 
-        if ($tokens[$stackPtr]['code'] !== \T_CLASS
-            && $tokens[$stackPtr]['type'] !== 'T_ANON_CLASS'
-            && $tokens[$stackPtr]['type'] !== 'T_INTERFACE'
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_CLASS
+            && $tokens[ $stackPtr ][ 'type' ] !== 'T_ANON_CLASS'
+            && $tokens[ $stackPtr ][ 'type' ] !== 'T_INTERFACE'
         ) {
             return '';
         }
 
-        $extends = PHPCSHelper::findExtendedClassName($phpcsFile, $stackPtr);
-        if (empty($extends) || \is_string($extends) === false) {
+        $extends = PHPCSHelper::findExtendedClassName( $phpcsFile, $stackPtr );
+        if ( empty( $extends ) || \is_string( $extends ) === false ) {
             return '';
         }
 
-        return $this->getFQName($phpcsFile, $stackPtr, $extends);
+        return $this->getFQName( $phpcsFile, $stackPtr, $extends );
     }
 
 
@@ -705,37 +705,37 @@ 
      *
      * @return string
      */
-    public function getFQClassNameFromDoubleColonToken(File $phpcsFile, $stackPtr)
+    public function getFQClassNameFromDoubleColonToken( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return '';
         }
 
-        if ($tokens[$stackPtr]['code'] !== \T_DOUBLE_COLON) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_DOUBLE_COLON ) {
             return '';
         }
 
         // Nothing to do if previous token is a variable as we don't know where it was defined.
-        if ($tokens[$stackPtr - 1]['code'] === \T_VARIABLE) {
+        if ( $tokens[ $stackPtr - 1 ][ 'code' ] === \T_VARIABLE ) {
             return '';
         }
 
         // Nothing to do if 'parent' or 'static' as we don't know how far the class tree extends.
-        if (\in_array($tokens[$stackPtr - 1]['code'], array(\T_PARENT, \T_STATIC), true)) {
+        if ( \in_array( $tokens[ $stackPtr - 1 ][ 'code' ], array( \T_PARENT, \T_STATIC ), true ) ) {
             return '';
         }
 
         // Get the classname from the class declaration if self is used.
-        if ($tokens[$stackPtr - 1]['code'] === \T_SELF) {
-            $classDeclarationPtr = $phpcsFile->findPrevious(\T_CLASS, $stackPtr - 1);
-            if ($classDeclarationPtr === false) {
+        if ( $tokens[ $stackPtr - 1 ][ 'code' ] === \T_SELF ) {
+            $classDeclarationPtr = $phpcsFile->findPrevious( \T_CLASS, $stackPtr - 1 );
+            if ( $classDeclarationPtr === false ) {
                 return '';
             }
-            $className = $phpcsFile->getDeclarationName($classDeclarationPtr);
-            return $this->getFQName($phpcsFile, $classDeclarationPtr, $className);
+            $className = $phpcsFile->getDeclarationName( $classDeclarationPtr );
+            return $this->getFQName( $phpcsFile, $classDeclarationPtr, $className );
         }
 
         $find = array(
@@ -745,16 +745,16 @@ 
             \T_WHITESPACE,
         );
 
-        $start = $phpcsFile->findPrevious($find, $stackPtr - 1, null, true, null, true);
-        if ($start === false || isset($tokens[($start + 1)]) === false) {
+        $start = $phpcsFile->findPrevious( $find, $stackPtr - 1, null, true, null, true );
+        if ( $start === false || isset( $tokens[ ( $start + 1 ) ] ) === false ) {
             return '';
         }
 
-        $start     = ($start + 1);
-        $className = $phpcsFile->getTokensAsString($start, ($stackPtr - $start));
-        $className = trim($className);
+        $start     = ( $start + 1 );
+        $className = $phpcsFile->getTokensAsString( $start, ( $stackPtr - $start ) );
+        $className = trim( $className );
 
-        return $this->getFQName($phpcsFile, $stackPtr, $className);
+        return $this->getFQName( $phpcsFile, $stackPtr, $className );
     }
 
 
@@ -770,21 +770,21 @@ 
      *
      * @return string
      */
-    public function getFQName(File $phpcsFile, $stackPtr, $name)
+    public function getFQName( File $phpcsFile, $stackPtr, $name )
     {
-        if (strpos($name, '\\') === 0) {
+        if ( strpos( $name, '\\' ) === 0 ) {
             // Already fully qualified.
             return $name;
         }
 
         // Remove the namespace keyword if used.
-        if (strpos($name, 'namespace\\') === 0) {
-            $name = substr($name, 10);
+        if ( strpos( $name, 'namespace\\' ) === 0 ) {
+            $name = substr( $name, 10 );
         }
 
-        $namespace = $this->determineNamespace($phpcsFile, $stackPtr);
+        $namespace = $this->determineNamespace( $phpcsFile, $stackPtr );
 
-        if ($namespace === '') {
+        if ( $namespace === '' ) {
             return '\\' . $name;
         } else {
             return '\\' . $namespace . '\\' . $name;
@@ -800,13 +800,13 @@ 
      *
      * @return bool True if namespaced, false if global.
      */
-    public function isNamespaced($FQName)
+    public function isNamespaced( $FQName )
     {
-        if (strpos($FQName, '\\') !== 0) {
-            throw new PHPCS_Exception('$FQName must be a fully qualified name');
+        if ( strpos( $FQName, '\\' ) !== 0 ) {
+            throw new PHPCS_Exception( '$FQName must be a fully qualified name' );
         }
 
-        return (strpos(substr($FQName, 1), '\\') !== false);
+        return ( strpos( substr( $FQName, 1 ), '\\' ) !== false );
     }
 
 
@@ -818,21 +818,21 @@ 
      *
      * @return string Namespace name or empty string if it couldn't be determined or no namespace applies.
      */
-    public function determineNamespace(File $phpcsFile, $stackPtr)
+    public function determineNamespace( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return '';
         }
 
         // Check for scoped namespace {}.
-        if (empty($tokens[$stackPtr]['conditions']) === false) {
-            $namespacePtr = $phpcsFile->getCondition($stackPtr, \T_NAMESPACE);
-            if ($namespacePtr !== false) {
-                $namespace = $this->getDeclaredNamespaceName($phpcsFile, $namespacePtr);
-                if ($namespace !== false) {
+        if ( empty( $tokens[ $stackPtr ][ 'conditions' ] ) === false ) {
+            $namespacePtr = $phpcsFile->getCondition( $stackPtr, \T_NAMESPACE );
+            if ( $namespacePtr !== false ) {
+                $namespace = $this->getDeclaredNamespaceName( $phpcsFile, $namespacePtr );
+                if ( $namespace !== false ) {
                     return $namespace;
                 }
 
@@ -851,19 +851,19 @@ 
         $previousNSToken = $stackPtr;
         $namespace       = false;
         do {
-            $previousNSToken = $phpcsFile->findPrevious(\T_NAMESPACE, ($previousNSToken - 1));
+            $previousNSToken = $phpcsFile->findPrevious( \T_NAMESPACE, ( $previousNSToken - 1 ) );
 
             // Stop if we encounter a scoped namespace declaration as we already know we're not in one.
-            if (empty($tokens[$previousNSToken]['scope_condition']) === false && $tokens[$previousNSToken]['scope_condition'] === $previousNSToken) {
+            if ( empty( $tokens[ $previousNSToken ][ 'scope_condition' ] ) === false && $tokens[ $previousNSToken ][ 'scope_condition' ] === $previousNSToken ) {
                 break;
             }
 
-            $namespace = $this->getDeclaredNamespaceName($phpcsFile, $previousNSToken);
+            $namespace = $this->getDeclaredNamespaceName( $phpcsFile, $previousNSToken );
 
-        } while ($namespace === false && $previousNSToken !== false);
+        } while ( $namespace === false && $previousNSToken !== false );
 
         // If we still haven't got a namespace, return an empty string.
-        if ($namespace === false) {
+        if ( $namespace === false ) {
             return '';
         } else {
             return $namespace;
@@ -882,26 +882,26 @@ 
      * @return string|false Namespace name or false if not a namespace declaration.
      *                      Namespace name can be an empty string for global namespace declaration.
      */
-    public function getDeclaredNamespaceName(File $phpcsFile, $stackPtr)
+    public function getDeclaredNamespaceName( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if ($stackPtr === false || isset($tokens[$stackPtr]) === false) {
+        if ( $stackPtr === false || isset( $tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
-        if ($tokens[$stackPtr]['code'] !== \T_NAMESPACE) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_NAMESPACE ) {
             return false;
         }
 
-        if ($tokens[($stackPtr + 1)]['code'] === \T_NS_SEPARATOR) {
+        if ( $tokens[ ( $stackPtr + 1 ) ][ 'code' ] === \T_NS_SEPARATOR ) {
             // Not a namespace declaration, but use of, i.e. namespace\someFunction();
             return false;
         }
 
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
-        if ($tokens[$nextToken]['code'] === \T_OPEN_CURLY_BRACKET) {
+        $nextToken = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
+        if ( $tokens[ $nextToken ][ 'code' ] === \T_OPEN_CURLY_BRACKET ) {
             // Declaration for global namespace when using multiple namespaces in a file.
             // I.e.: namespace {}
             return '';
@@ -915,8 +915,8 @@ 
         );
 
         $namespaceName = '';
-        while (isset($validTokens[$tokens[$nextToken]['code']]) === true) {
-            $namespaceName .= trim($tokens[$nextToken]['content']);
+        while ( isset( $validTokens[ $tokens[ $nextToken ][ 'code' ] ] ) === true ) {
+            $namespaceName .= trim( $tokens[ $nextToken ][ 'content' ] );
             $nextToken++;
         }
 
@@ -939,43 +939,43 @@ 
      *                   no return type was found or the passed token was
      *                   not of the correct type.
      */
-    public function getReturnTypeHintToken(File $phpcsFile, $stackPtr)
+    public function getReturnTypeHintToken( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE) {
+        if ( \defined( 'T_RETURN_TYPE' ) && $tokens[ $stackPtr ][ 'code' ] === \T_RETURN_TYPE ) {
             return $stackPtr;
         }
 
-        if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_FUNCTION && $tokens[ $stackPtr ][ 'code' ] !== \T_CLOSURE ) {
             return false;
         }
 
-        if (isset($tokens[$stackPtr]['parenthesis_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === false ) {
             return false;
         }
 
         // Allow for interface and abstract method declarations.
         $endOfFunctionDeclaration = null;
-        if (isset($tokens[$stackPtr]['scope_opener'])) {
-            $endOfFunctionDeclaration = $tokens[$stackPtr]['scope_opener'];
+        if ( isset( $tokens[ $stackPtr ][ 'scope_opener' ] ) ) {
+            $endOfFunctionDeclaration = $tokens[ $stackPtr ][ 'scope_opener' ];
         } else {
-            $nextSemiColon = $phpcsFile->findNext(\T_SEMICOLON, ($tokens[$stackPtr]['parenthesis_closer'] + 1), null, false, null, true);
-            if ($nextSemiColon !== false) {
+            $nextSemiColon = $phpcsFile->findNext( \T_SEMICOLON, ( $tokens[ $stackPtr ][ 'parenthesis_closer' ] + 1 ), null, false, null, true );
+            if ( $nextSemiColon !== false ) {
                 $endOfFunctionDeclaration = $nextSemiColon;
             }
         }
 
-        if (isset($endOfFunctionDeclaration) === false) {
+        if ( isset( $endOfFunctionDeclaration ) === false ) {
             return false;
         }
 
         $hasColon = $phpcsFile->findNext(
-            array(\T_COLON, \T_INLINE_ELSE),
-            ($tokens[$stackPtr]['parenthesis_closer'] + 1),
+            array( \T_COLON, \T_INLINE_ELSE ),
+            ( $tokens[ $stackPtr ][ 'parenthesis_closer' ] + 1 ),
             $endOfFunctionDeclaration
         );
-        if ($hasColon === false) {
+        if ( $hasColon === false ) {
             return false;
         }
 
@@ -996,7 +996,7 @@ 
             \T_STRING,
         );
 
-        return $phpcsFile->findPrevious($unrecognizedTypes, ($endOfFunctionDeclaration - 1), $hasColon);
+        return $phpcsFile->findPrevious( $unrecognizedTypes, ( $endOfFunctionDeclaration - 1 ), $hasColon );
     }
 
 
@@ -1018,37 +1018,37 @@ 
      *
      * @return string|false The name of the return type token.
      */
-    public function getReturnTypeHintName(File $phpcsFile, $stackPtr)
+    public function getReturnTypeHintName( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // In older PHPCS versions, the nullable indicator will turn a return type colon into a T_INLINE_ELSE.
-        $colon = $phpcsFile->findPrevious(array(\T_COLON, \T_INLINE_ELSE, \T_FUNCTION, \T_CLOSE_PARENTHESIS), ($stackPtr - 1));
-        if ($colon === false
-            || ($tokens[$colon]['code'] !== \T_COLON && $tokens[$colon]['code'] !== \T_INLINE_ELSE)
+        $colon = $phpcsFile->findPrevious( array( \T_COLON, \T_INLINE_ELSE, \T_FUNCTION, \T_CLOSE_PARENTHESIS ), ( $stackPtr - 1 ) );
+        if ( $colon === false
+            || ( $tokens[ $colon ][ 'code' ] !== \T_COLON && $tokens[ $colon ][ 'code' ] !== \T_INLINE_ELSE )
         ) {
             // Shouldn't happen, just in case.
             return;
         }
 
         $returnTypeHint = '';
-        for ($i = ($colon + 1); $i <= $stackPtr; $i++) {
+        for ( $i = ( $colon + 1 ); $i <= $stackPtr; $i++ ) {
             // As of PHPCS 3.3.0+, all tokens are tokenized as "normal", so T_CALLABLE, T_SELF etc are
             // all possible, just exclude anything that's regarded as empty and the nullable indicator.
-            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
+            if ( isset( Tokens::$emptyTokens[ $tokens[ $i ][ 'code' ] ] ) ) {
                 continue;
             }
 
-            if ($tokens[$i]['type'] === 'T_NULLABLE') {
+            if ( $tokens[ $i ][ 'type' ] === 'T_NULLABLE' ) {
                 continue;
             }
 
-            if (\defined('T_NULLABLE') === false && $tokens[$i]['code'] === \T_INLINE_THEN) {
+            if ( \defined( 'T_NULLABLE' ) === false && $tokens[ $i ][ 'code' ] === \T_INLINE_THEN ) {
                 // Old PHPCS.
                 continue;
             }
 
-            $returnTypeHint .= $tokens[$i]['content'];
+            $returnTypeHint .= $tokens[ $i ][ 'content' ];
         }
 
         return $returnTypeHint;
@@ -1069,11 +1069,11 @@ 
      *
      * @return bool
      */
-    public function isClassProperty(File $phpcsFile, $stackPtr)
+    public function isClassProperty( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_VARIABLE) {
+        if ( isset( $tokens[ $stackPtr ] ) === false || $tokens[ $stackPtr ][ 'code' ] !== \T_VARIABLE ) {
             return false;
         }
 
@@ -1084,17 +1084,17 @@ 
             'T_TRAIT'      => true,
         );
 
-        $scopePtr = $this->validDirectScope($phpcsFile, $stackPtr, $validScopes);
-        if ($scopePtr !== false) {
+        $scopePtr = $this->validDirectScope( $phpcsFile, $stackPtr, $validScopes );
+        if ( $scopePtr !== false ) {
             // Make sure it's not a method parameter.
-            if (empty($tokens[$stackPtr]['nested_parenthesis']) === true) {
+            if ( empty( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true ) {
                 return true;
             } else {
-                $parenthesis = array_keys($tokens[$stackPtr]['nested_parenthesis']);
-                $deepestOpen = array_pop($parenthesis);
-                if ($deepestOpen < $scopePtr
-                    || isset($tokens[$deepestOpen]['parenthesis_owner']) === false
-                    || $tokens[$tokens[$deepestOpen]['parenthesis_owner']]['code'] !== \T_FUNCTION
+                $parenthesis = array_keys( $tokens[ $stackPtr ][ 'nested_parenthesis' ] );
+                $deepestOpen = array_pop( $parenthesis );
+                if ( $deepestOpen < $scopePtr
+                    || isset( $tokens[ $deepestOpen ][ 'parenthesis_owner' ] ) === false
+                    || $tokens[ $tokens[ $deepestOpen ][ 'parenthesis_owner' ] ][ 'code' ] !== \T_FUNCTION
                 ) {
                     return true;
                 }
@@ -1114,11 +1114,11 @@ 
      *
      * @return bool
      */
-    public function isClassConstant(File $phpcsFile, $stackPtr)
+    public function isClassConstant( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_CONST) {
+        if ( isset( $tokens[ $stackPtr ] ) === false || $tokens[ $stackPtr ][ 'code' ] !== \T_CONST ) {
             return false;
         }
 
@@ -1128,7 +1128,7 @@ 
             'T_ANON_CLASS' => true,
             'T_INTERFACE'  => true,
         );
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $validScopes) !== false) {
+        if ( $this->validDirectScope( $phpcsFile, $stackPtr, $validScopes ) !== false ) {
             return true;
         }
 
@@ -1152,25 +1152,25 @@ 
      *
      * @return int|bool StackPtr to the scope if valid, false otherwise.
      */
-    protected function validDirectScope(File $phpcsFile, $stackPtr, $validScopes)
+    protected function validDirectScope( File $phpcsFile, $stackPtr, $validScopes )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (empty($tokens[$stackPtr]['conditions']) === true) {
+        if ( empty( $tokens[ $stackPtr ][ 'conditions' ] ) === true ) {
             return false;
         }
 
         /*
          * Check only the direct wrapping scope of the token.
          */
-        $conditions = array_keys($tokens[$stackPtr]['conditions']);
-        $ptr        = array_pop($conditions);
+        $conditions = array_keys( $tokens[ $stackPtr ][ 'conditions' ] );
+        $ptr        = array_pop( $conditions );
 
-        if (isset($tokens[$ptr]) === false) {
+        if ( isset( $tokens[ $ptr ] ) === false ) {
             return false;
         }
 
-        if (isset($validScopes[$tokens[$ptr]['type']]) === true) {
+        if ( isset( $validScopes[ $tokens[ $ptr ][ 'type' ] ] ) === true ) {
             return $ptr;
         }
 
@@ -1194,34 +1194,34 @@ 
      *               - no type hints were found
      *               - or the passed token was not of the correct type.
      */
-    public function getTypeHintsFromFunctionDeclaration(File $phpcsFile, $stackPtr)
+    public function getTypeHintsFromFunctionDeclaration( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_FUNCTION && $tokens[ $stackPtr ][ 'code' ] !== \T_CLOSURE ) {
             return array();
         }
 
-        $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($parameters) || \is_array($parameters) === false) {
+        $parameters = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $parameters ) || \is_array( $parameters ) === false ) {
             return array();
         }
 
         $typeHints = array();
 
-        foreach ($parameters as $param) {
-            if ($param['type_hint'] === '') {
+        foreach ( $parameters as $param ) {
+            if ( $param[ 'type_hint' ] === '' ) {
                 continue;
             }
 
             // Strip off potential nullable indication.
-            $typeHint = ltrim($param['type_hint'], '?');
+            $typeHint = ltrim( $param[ 'type_hint' ], '?' );
 
             // Strip off potential (global) namespace indication.
-            $typeHint = ltrim($typeHint, '\\');
+            $typeHint = ltrim( $typeHint, '\\' );
 
-            if ($typeHint !== '') {
-                $typeHints[] = $typeHint;
+            if ( $typeHint !== '' ) {
+                $typeHints[ ] = $typeHint;
             }
         }
 
@@ -1238,36 +1238,36 @@ 
      * @return string|false The algorithm name without quotes if this was a relevant hash
      *                      function call or false if it was not.
      */
-    public function getHashAlgorithmParameter(File $phpcsFile, $stackPtr)
+    public function getHashAlgorithmParameter( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
-        if ($tokens[$stackPtr]['code'] !== \T_STRING) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_STRING ) {
             return false;
         }
 
-        $functionName   = $tokens[$stackPtr]['content'];
-        $functionNameLc = strtolower($functionName);
+        $functionName   = $tokens[ $stackPtr ][ 'content' ];
+        $functionNameLc = strtolower( $functionName );
 
         // Bow out if not one of the functions we're targetting.
-        if (isset($this->hashAlgoFunctions[$functionNameLc]) === false) {
+        if ( isset( $this->hashAlgoFunctions[ $functionNameLc ] ) === false ) {
             return false;
         }
 
         // Get the parameter from the function call which should contain the algorithm name.
-        $algoParam = $this->getFunctionCallParameter($phpcsFile, $stackPtr, $this->hashAlgoFunctions[$functionNameLc]);
-        if ($algoParam === false) {
+        $algoParam = $this->getFunctionCallParameter( $phpcsFile, $stackPtr, $this->hashAlgoFunctions[ $functionNameLc ] );
+        if ( $algoParam === false ) {
             return false;
         }
 
         // Algorithm is a text string, so we need to remove the quotes.
-        $algo = strtolower(trim($algoParam['raw']));
-        $algo = $this->stripQuotes($algo);
+        $algo = strtolower( trim( $algoParam[ 'raw' ] ) );
+        $algo = $this->stripQuotes( $algo );
 
         return $algo;
     }
@@ -1281,36 +1281,36 @@ 
      *
      * @return bool
      */
-    public function isUseOfGlobalConstant(File $phpcsFile, $stackPtr)
+    public function isUseOfGlobalConstant( File $phpcsFile, $stackPtr )
     {
         static $isLowPHPCS, $isLowPHP;
 
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
         // Is this one of the tokens this function handles ?
-        if ($tokens[$stackPtr]['code'] !== \T_STRING) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_STRING ) {
             return false;
         }
 
         // Check for older PHP, PHPCS version so we can compensate for misidentified tokens.
-        if (isset($isLowPHPCS, $isLowPHP) === false) {
+        if ( isset( $isLowPHPCS, $isLowPHP ) === false ) {
             $isLowPHP   = false;
             $isLowPHPCS = false;
-            if (version_compare(\PHP_VERSION_ID, '50400', '<')) {
+            if ( version_compare( \PHP_VERSION_ID, '50400', '<' ) ) {
                 $isLowPHP   = true;
-                $isLowPHPCS = version_compare(PHPCSHelper::getVersion(), '2.4.0', '<');
+                $isLowPHPCS = version_compare( PHPCSHelper::getVersion(), '2.4.0', '<' );
             }
         }
 
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($next !== false
-            && ($tokens[$next]['code'] === \T_OPEN_PARENTHESIS
-                || $tokens[$next]['code'] === \T_DOUBLE_COLON)
+        $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+        if ( $next !== false
+            && ( $tokens[ $next ][ 'code' ] === \T_OPEN_PARENTHESIS
+                || $tokens[ $next ][ 'code' ] === \T_DOUBLE_COLON )
         ) {
             // Function call or declaration.
             return false;
@@ -1338,30 +1338,30 @@ 
             'T_PRIVATE'         => true,
         );
 
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($prev !== false
-            && (isset($tokensToIgnore[$tokens[$prev]['type']]) === true
-                || ($tokens[$prev]['code'] === \T_STRING
-                    && (($isLowPHPCS === true
-                        && $tokens[$prev]['content'] === 'trait')
-                    || ($isLowPHP === true
-                        && $tokens[$prev]['content'] === 'insteadof'))))
+        $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+        if ( $prev !== false
+            && ( isset( $tokensToIgnore[ $tokens[ $prev ][ 'type' ] ] ) === true
+                || ( $tokens[ $prev ][ 'code' ] === \T_STRING
+                    && ( ( $isLowPHPCS === true
+                        && $tokens[ $prev ][ 'content' ] === 'trait' )
+                    || ( $isLowPHP === true
+                        && $tokens[ $prev ][ 'content' ] === 'insteadof' ) ) ) )
         ) {
             // Not the use of a constant.
             return false;
         }
 
-        if ($prev !== false
-            && $tokens[$prev]['code'] === \T_NS_SEPARATOR
-            && $tokens[($prev - 1)]['code'] === \T_STRING
+        if ( $prev !== false
+            && $tokens[ $prev ][ 'code' ] === \T_NS_SEPARATOR
+            && $tokens[ ( $prev - 1 ) ][ 'code' ] === \T_STRING
         ) {
             // Namespaced constant of the same name.
             return false;
         }
 
-        if ($prev !== false
-            && $tokens[$prev]['code'] === \T_CONST
-            && $this->isClassConstant($phpcsFile, $prev) === true
+        if ( $prev !== false
+            && $tokens[ $prev ][ 'code' ] === \T_CONST
+            && $this->isClassConstant( $phpcsFile, $prev ) === true
         ) {
             // Class constant declaration of the same name.
             return false;
@@ -1370,21 +1370,21 @@ 
         /*
          * Deal with a number of variations of use statements.
          */
-        for ($i = $stackPtr; $i > 0; $i--) {
-            if ($tokens[$i]['line'] !== $tokens[$stackPtr]['line']) {
+        for ( $i = $stackPtr; $i > 0; $i-- ) {
+            if ( $tokens[ $i ][ 'line' ] !== $tokens[ $stackPtr ][ 'line' ] ) {
                 break;
             }
         }
 
-        $firstOnLine = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-        if ($firstOnLine !== false && $tokens[$firstOnLine]['code'] === \T_USE) {
-            $nextOnLine = $phpcsFile->findNext(Tokens::$emptyTokens, ($firstOnLine + 1), null, true);
-            if ($nextOnLine !== false) {
-                if (($tokens[$nextOnLine]['code'] === \T_STRING && $tokens[$nextOnLine]['content'] === 'const')
-                    || $tokens[$nextOnLine]['code'] === \T_CONST // Happens in some PHPCS versions.
+        $firstOnLine = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+        if ( $firstOnLine !== false && $tokens[ $firstOnLine ][ 'code' ] === \T_USE ) {
+            $nextOnLine = $phpcsFile->findNext( Tokens::$emptyTokens, ( $firstOnLine + 1 ), null, true );
+            if ( $nextOnLine !== false ) {
+                if ( ( $tokens[ $nextOnLine ][ 'code' ] === \T_STRING && $tokens[ $nextOnLine ][ 'content' ] === 'const' )
+                    || $tokens[ $nextOnLine ][ 'code' ] === \T_CONST // Happens in some PHPCS versions.
                 ) {
-                    $hasNsSep = $phpcsFile->findNext(\T_NS_SEPARATOR, ($nextOnLine + 1), $stackPtr);
-                    if ($hasNsSep !== false) {
+                    $hasNsSep = $phpcsFile->findNext( \T_NS_SEPARATOR, ( $nextOnLine + 1 ), $stackPtr );
+                    if ( $hasNsSep !== false ) {
                         // Namespaced const (group) use statement.
                         return false;
                     }
@@ -1419,15 +1419,15 @@ 
      *              False if not or if it could not be reliably determined
      *              (variable or calculations and such).
      */
-    public function isPositiveNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+    public function isPositiveNumber( File $phpcsFile, $start, $end, $allowFloats = false )
     {
-        $number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
+        $number = $this->isNumber( $phpcsFile, $start, $end, $allowFloats );
 
-        if ($number === false) {
+        if ( $number === false ) {
             return false;
         }
 
-        return ($number > 0);
+        return ( $number > 0 );
     }
 
 
@@ -1451,15 +1451,15 @@ 
      *              False if not or if it could not be reliably determined
      *              (variable or calculations and such).
      */
-    public function isNegativeNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+    public function isNegativeNumber( File $phpcsFile, $start, $end, $allowFloats = false )
     {
-        $number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
+        $number = $this->isNumber( $phpcsFile, $start, $end, $allowFloats );
 
-        if ($number === false) {
+        if ( $number === false ) {
             return false;
         }
 
-        return ($number < 0);
+        return ( $number < 0 );
     }
 
     /**
@@ -1488,89 +1488,89 @@ 
      *                        number or if it could not be reliably determined
      *                        (variable or calculations and such).
      */
-    protected function isNumber(File $phpcsFile, $start, $end, $allowFloats = false)
+    protected function isNumber( File $phpcsFile, $start, $end, $allowFloats = false )
     {
         $stringTokens = Tokens::$heredocTokens + Tokens::$stringTokens;
 
         $validTokens             = array();
-        $validTokens[\T_LNUMBER] = true;
-        $validTokens[\T_TRUE]    = true; // Evaluates to int 1.
-        $validTokens[\T_FALSE]   = true; // Evaluates to int 0.
-        $validTokens[\T_NULL]    = true; // Evaluates to int 0.
+        $validTokens[ \T_LNUMBER ] = true;
+        $validTokens[ \T_TRUE ]    = true; // Evaluates to int 1.
+        $validTokens[ \T_FALSE ]   = true; // Evaluates to int 0.
+        $validTokens[ \T_NULL ]    = true; // Evaluates to int 0.
 
-        if ($allowFloats === true) {
-            $validTokens[\T_DNUMBER] = true;
+        if ( $allowFloats === true ) {
+            $validTokens[ \T_DNUMBER ] = true;
         }
 
         $maybeValidTokens = $stringTokens + $validTokens;
 
         $tokens         = $phpcsFile->getTokens();
-        $searchEnd      = ($end + 1);
+        $searchEnd      = ( $end + 1 );
         $negativeNumber = false;
 
-        if (isset($tokens[$start], $tokens[$searchEnd]) === false) {
+        if ( isset( $tokens[ $start ], $tokens[ $searchEnd ] ) === false ) {
             return false;
         }
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $start, $searchEnd, true);
-        while ($nextNonEmpty !== false
-            && ($tokens[$nextNonEmpty]['code'] === \T_PLUS
-            || $tokens[$nextNonEmpty]['code'] === \T_MINUS)
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, $start, $searchEnd, true );
+        while ( $nextNonEmpty !== false
+            && ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_PLUS
+            || $tokens[ $nextNonEmpty ][ 'code' ] === \T_MINUS )
         ) {
 
-            if ($tokens[$nextNonEmpty]['code'] === \T_MINUS) {
-                $negativeNumber = ($negativeNumber === false) ? true : false;
+            if ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_MINUS ) {
+                $negativeNumber = ( $negativeNumber === false ) ? true : false;
             }
 
-            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNonEmpty + 1), $searchEnd, true);
+            $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $nextNonEmpty + 1 ), $searchEnd, true );
         }
 
-        if ($nextNonEmpty === false || isset($maybeValidTokens[$tokens[$nextNonEmpty]['code']]) === false) {
+        if ( $nextNonEmpty === false || isset( $maybeValidTokens[ $tokens[ $nextNonEmpty ][ 'code' ] ] ) === false ) {
             return false;
         }
 
         $content = false;
-        if ($tokens[$nextNonEmpty]['code'] === \T_LNUMBER
-            || $tokens[$nextNonEmpty]['code'] === \T_DNUMBER
+        if ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_LNUMBER
+            || $tokens[ $nextNonEmpty ][ 'code' ] === \T_DNUMBER
         ) {
-            $content = (float) $tokens[$nextNonEmpty]['content'];
-        } elseif ($tokens[$nextNonEmpty]['code'] === \T_TRUE) {
+            $content = (float)$tokens[ $nextNonEmpty ][ 'content' ];
+        } elseif ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_TRUE ) {
             $content = 1.0;
-        } elseif ($tokens[$nextNonEmpty]['code'] === \T_FALSE
-            || $tokens[$nextNonEmpty]['code'] === \T_NULL
+        } elseif ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_FALSE
+            || $tokens[ $nextNonEmpty ][ 'code' ] === \T_NULL
         ) {
             $content = 0.0;
-        } elseif (isset($stringTokens[$tokens[$nextNonEmpty]['code']]) === true) {
+        } elseif ( isset( $stringTokens[ $tokens[ $nextNonEmpty ][ 'code' ] ] ) === true ) {
 
-            if ($tokens[$nextNonEmpty]['code'] === \T_START_HEREDOC
-                || $tokens[$nextNonEmpty]['code'] === \T_START_NOWDOC
+            if ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_START_HEREDOC
+                || $tokens[ $nextNonEmpty ][ 'code' ] === \T_START_NOWDOC
             ) {
                 // Skip past heredoc/nowdoc opener to the first content.
-                $firstDocToken = $phpcsFile->findNext(array(\T_HEREDOC, \T_NOWDOC), ($nextNonEmpty + 1), $searchEnd);
-                if ($firstDocToken === false) {
+                $firstDocToken = $phpcsFile->findNext( array( \T_HEREDOC, \T_NOWDOC ), ( $nextNonEmpty + 1 ), $searchEnd );
+                if ( $firstDocToken === false ) {
                     // Live coding or parse error.
                     return false;
                 }
 
-                $stringContent = $content = $tokens[$firstDocToken]['content'];
+                $stringContent = $content = $tokens[ $firstDocToken ][ 'content' ];
 
                 // Skip forward to the end in preparation for the next part of the examination.
-                $nextNonEmpty = $phpcsFile->findNext(array(\T_END_HEREDOC, \T_END_NOWDOC), ($nextNonEmpty + 1), $searchEnd);
-                if ($nextNonEmpty === false) {
+                $nextNonEmpty = $phpcsFile->findNext( array( \T_END_HEREDOC, \T_END_NOWDOC ), ( $nextNonEmpty + 1 ), $searchEnd );
+                if ( $nextNonEmpty === false ) {
                     // Live coding or parse error.
                     return false;
                 }
             } else {
                 // Gather subsequent lines for a multi-line string.
-                for ($i = $nextNonEmpty; $i < $searchEnd; $i++) {
-                    if ($tokens[$i]['code'] !== $tokens[$nextNonEmpty]['code']) {
+                for ( $i = $nextNonEmpty; $i < $searchEnd; $i++ ) {
+                    if ( $tokens[ $i ][ 'code' ] !== $tokens[ $nextNonEmpty ][ 'code' ] ) {
                         break;
                     }
-                    $content .= $tokens[$i]['content'];
+                    $content .= $tokens[ $i ][ 'content' ];
                 }
 
                 $nextNonEmpty  = --$i;
-                $content       = $this->stripQuotes($content);
+                $content       = $this->stripQuotes( $content );
                 $stringContent = $content;
             }
 
@@ -1581,40 +1581,40 @@ 
             $regexInt   = '`^\s*[0-9]+`';
             $regexFloat = '`^\s*(?:[+-]?(?:(?:(?P<LNUM>[0-9]+)|(?P<DNUM>([0-9]*\.(?P>LNUM)|(?P>LNUM)\.[0-9]*)))[eE][+-]?(?P>LNUM))|(?P>DNUM))`';
 
-            $intString   = preg_match($regexInt, $content, $intMatch);
-            $floatString = preg_match($regexFloat, $content, $floatMatch);
+            $intString   = preg_match( $regexInt, $content, $intMatch );
+            $floatString = preg_match( $regexFloat, $content, $floatMatch );
 
             // Does the text string start with a number ? If so, PHP would juggle it and use it as a number.
-            if ($allowFloats === false) {
-                if ($intString !== 1 || $floatString === 1) {
-                    if ($floatString === 1) {
+            if ( $allowFloats === false ) {
+                if ( $intString !== 1 || $floatString === 1 ) {
+                    if ( $floatString === 1 ) {
                         // Found float. Only integers targetted.
                         return false;
                     }
 
                     $content = 0.0;
                 } else {
-                    $content = (float) trim($intMatch[0]);
+                    $content = (float)trim( $intMatch[ 0 ] );
                 }
             } else {
-                if ($intString !== 1 && $floatString !== 1) {
+                if ( $intString !== 1 && $floatString !== 1 ) {
                     $content = 0.0;
                 } else {
-                    $content = ($floatString === 1) ? (float) trim($floatMatch[0]) : (float) trim($intMatch[0]);
+                    $content = ( $floatString === 1 ) ? (float)trim( $floatMatch[ 0 ] ) : (float)trim( $intMatch[ 0 ] );
                 }
             }
 
             // Allow for different behaviour for hex numeric strings between PHP 5 vs PHP 7.
-            if ($intString === 1 && trim($intMatch[0]) === '0'
-                && preg_match('`^\s*(0x[A-Fa-f0-9]+)`', $stringContent, $hexNumberString) === 1
-                && $this->supportsBelow('5.6') === true
+            if ( $intString === 1 && trim( $intMatch[ 0 ] ) === '0'
+                && preg_match( '`^\s*(0x[A-Fa-f0-9]+)`', $stringContent, $hexNumberString ) === 1
+                && $this->supportsBelow( '5.6' ) === true
             ) {
                 // The filter extension still allows for hex numeric strings in PHP 7, so
                 // use that to get the numeric value if possible.
                 // If the filter extension is not available, the value will be zero, but so be it.
-                if (function_exists('filter_var')) {
-                    $filtered = filter_var($hexNumberString[1], \FILTER_VALIDATE_INT, \FILTER_FLAG_ALLOW_HEX);
-                    if ($filtered !== false) {
+                if ( function_exists( 'filter_var' ) ) {
+                    $filtered = filter_var( $hexNumberString[ 1 ], \FILTER_VALIDATE_INT, \FILTER_FLAG_ALLOW_HEX );
+                    if ( $filtered !== false ) {
                         $content = $filtered;
                     }
                 }
@@ -1622,17 +1622,17 @@ 
         }
 
         // OK, so we have a number, now is there still more code after it ?
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextNonEmpty + 1), $searchEnd, true);
-        if ($nextNonEmpty !== false) {
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $nextNonEmpty + 1 ), $searchEnd, true );
+        if ( $nextNonEmpty !== false ) {
             return false;
         }
 
-        if ($negativeNumber === true) {
+        if ( $negativeNumber === true ) {
             $content = -$content;
         }
 
-        if ($allowFloats === false) {
-            return (int) $content;
+        if ( $allowFloats === false ) {
+            return (int)$content;
         }
 
         return $content;
@@ -1656,66 +1656,66 @@ 
      *
      * @return bool
      */
-    protected function isNumericCalculation(File $phpcsFile, $start, $end)
+    protected function isNumericCalculation( File $phpcsFile, $start, $end )
     {
         $arithmeticTokens = Tokens::$arithmeticTokens;
 
         // phpcs:disable PHPCompatibility.Constants.NewConstants.t_powFound
-        if (\defined('T_POW') && isset($arithmeticTokens[\T_POW]) === false) {
+        if ( \defined( 'T_POW' ) && isset( $arithmeticTokens[ \T_POW ] ) === false ) {
             // T_POW was not added to the arithmetic array until PHPCS 2.9.0.
-            $arithmeticTokens[\T_POW] = \T_POW;
+            $arithmeticTokens[ \T_POW ] = \T_POW;
         }
         // phpcs:enable
 
         $skipTokens   = Tokens::$emptyTokens;
-        $skipTokens[] = \T_MINUS;
-        $skipTokens[] = \T_PLUS;
+        $skipTokens[ ] = \T_MINUS;
+        $skipTokens[ ] = \T_PLUS;
 
         // Find the first arithmetic operator, but skip past +/- signs before numbers.
-        $nextNonEmpty = ($start - 1);
+        $nextNonEmpty = ( $start - 1 );
         do {
-            $nextNonEmpty       = $phpcsFile->findNext($skipTokens, ($nextNonEmpty + 1), ($end + 1), true);
-            $arithmeticOperator = $phpcsFile->findNext($arithmeticTokens, ($nextNonEmpty + 1), ($end + 1));
-        } while ($nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator);
+            $nextNonEmpty       = $phpcsFile->findNext( $skipTokens, ( $nextNonEmpty + 1 ), ( $end + 1 ), true );
+            $arithmeticOperator = $phpcsFile->findNext( $arithmeticTokens, ( $nextNonEmpty + 1 ), ( $end + 1 ) );
+        } while ( $nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator );
 
-        if ($arithmeticOperator === false) {
+        if ( $arithmeticOperator === false ) {
             return false;
         }
 
         $tokens      = $phpcsFile->getTokens();
         $subsetStart = $start;
-        $subsetEnd   = ($arithmeticOperator - 1);
+        $subsetEnd   = ( $arithmeticOperator - 1 );
 
-        while ($this->isNumber($phpcsFile, $subsetStart, $subsetEnd, true) !== false
-            && isset($tokens[($arithmeticOperator + 1)]) === true
+        while ( $this->isNumber( $phpcsFile, $subsetStart, $subsetEnd, true ) !== false
+            && isset( $tokens[ ( $arithmeticOperator + 1 ) ] ) === true
         ) {
             // Recognize T_POW for PHPCS < 2.4.0 on low PHP versions.
-            if (\defined('T_POW') === false
-                && $tokens[$arithmeticOperator]['code'] === \T_MULTIPLY
-                && $tokens[($arithmeticOperator + 1)]['code'] === \T_MULTIPLY
-                && isset($tokens[$arithmeticOperator + 2]) === true
+            if ( \defined( 'T_POW' ) === false
+                && $tokens[ $arithmeticOperator ][ 'code' ] === \T_MULTIPLY
+                && $tokens[ ( $arithmeticOperator + 1 ) ][ 'code' ] === \T_MULTIPLY
+                && isset( $tokens[ $arithmeticOperator + 2 ] ) === true
             ) {
                 // Move operator one forward to the second * in T_POW.
                 ++$arithmeticOperator;
             }
 
-            $subsetStart  = ($arithmeticOperator + 1);
+            $subsetStart  = ( $arithmeticOperator + 1 );
             $nextNonEmpty = $arithmeticOperator;
             do {
-                $nextNonEmpty       = $phpcsFile->findNext($skipTokens, ($nextNonEmpty + 1), ($end + 1), true);
-                $arithmeticOperator = $phpcsFile->findNext($arithmeticTokens, ($nextNonEmpty + 1), ($end + 1));
-            } while ($nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator);
+                $nextNonEmpty       = $phpcsFile->findNext( $skipTokens, ( $nextNonEmpty + 1 ), ( $end + 1 ), true );
+                $arithmeticOperator = $phpcsFile->findNext( $arithmeticTokens, ( $nextNonEmpty + 1 ), ( $end + 1 ) );
+            } while ( $nextNonEmpty !== false && $arithmeticOperator !== false && $nextNonEmpty === $arithmeticOperator );
 
-            if ($arithmeticOperator === false) {
+            if ( $arithmeticOperator === false ) {
                 // Last calculation operator already reached.
-                if ($this->isNumber($phpcsFile, $subsetStart, $end, true) !== false) {
+                if ( $this->isNumber( $phpcsFile, $subsetStart, $end, true ) !== false ) {
                     return true;
                 }
 
                 return false;
             }
 
-            $subsetEnd = ($arithmeticOperator - 1);
+            $subsetEnd = ( $arithmeticOperator - 1 );
         }
 
         return false;
@@ -1741,22 +1741,22 @@ 
      *
      * @return bool True if short ternary, or false otherwise.
      */
-    public function isShortTernary(File $phpcsFile, $stackPtr)
+    public function isShortTernary( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
-        if (isset($tokens[$stackPtr]) === false
-            || $tokens[$stackPtr]['code'] !== \T_INLINE_THEN
+        if ( isset( $tokens[ $stackPtr ] ) === false
+            || $tokens[ $stackPtr ][ 'code' ] !== \T_INLINE_THEN
         ) {
             return false;
         }
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($nextNonEmpty === false) {
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+        if ( $nextNonEmpty === false ) {
             // Live coding or parse error.
             return false;
         }
 
-        if ($tokens[$nextNonEmpty]['code'] === \T_INLINE_ELSE) {
+        if ( $tokens[ $nextNonEmpty ][ 'code' ] === \T_INLINE_ELSE ) {
             return true;
         }
 
@@ -1775,39 +1775,39 @@ 
      *
      * @return bool
      */
-    public function isShortList(File $phpcsFile, $stackPtr)
+    public function isShortList( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
-        if (isset($tokens[$stackPtr]) === false) {
+        if ( isset( $tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
         // Is this one of the tokens this function handles ?
-        if ($tokens[$stackPtr]['code'] !== \T_OPEN_SHORT_ARRAY
-            && $tokens[$stackPtr]['code'] !== \T_CLOSE_SHORT_ARRAY
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_OPEN_SHORT_ARRAY
+            && $tokens[ $stackPtr ][ 'code' ] !== \T_CLOSE_SHORT_ARRAY
         ) {
             return false;
         }
 
-        switch ($tokens[$stackPtr]['code']) {
+        switch ( $tokens[ $stackPtr ][ 'code' ] ) {
             case \T_OPEN_SHORT_ARRAY:
-                if (isset($tokens[$stackPtr]['bracket_closer']) === true) {
+                if ( isset( $tokens[ $stackPtr ][ 'bracket_closer' ] ) === true ) {
                     $opener = $stackPtr;
-                    $closer = $tokens[$stackPtr]['bracket_closer'];
+                    $closer = $tokens[ $stackPtr ][ 'bracket_closer' ];
                 }
                 break;
 
             case \T_CLOSE_SHORT_ARRAY:
-                if (isset($tokens[$stackPtr]['bracket_opener']) === true) {
-                    $opener = $tokens[$stackPtr]['bracket_opener'];
+                if ( isset( $tokens[ $stackPtr ][ 'bracket_opener' ] ) === true ) {
+                    $opener = $tokens[ $stackPtr ][ 'bracket_opener' ];
                     $closer = $stackPtr;
                 }
                 break;
         }
 
-        if (isset($opener, $closer) === false) {
+        if ( isset( $opener, $closer ) === false ) {
             // Parse error, live coding or real square bracket.
             return false;
         }
@@ -1816,42 +1816,42 @@ 
          * PHPCS cross-version compatibility: work around for square brackets misidentified
          * as short array when preceded by a variable variable in older PHPCS versions.
          */
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), null, true, null, true);
+        $prevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $opener - 1 ), null, true, null, true );
 
-        if ($prevNonEmpty !== false
-            && $tokens[$prevNonEmpty]['code'] === \T_CLOSE_CURLY_BRACKET
-            && isset($tokens[$prevNonEmpty]['bracket_opener']) === true
+        if ( $prevNonEmpty !== false
+            && $tokens[ $prevNonEmpty ][ 'code' ] === \T_CLOSE_CURLY_BRACKET
+            && isset( $tokens[ $prevNonEmpty ][ 'bracket_opener' ] ) === true
         ) {
             $maybeVariableVariable = $phpcsFile->findPrevious(
                 Tokens::$emptyTokens,
-                ($tokens[$prevNonEmpty]['bracket_opener'] - 1),
+                ( $tokens[ $prevNonEmpty ][ 'bracket_opener' ] - 1 ),
                 null,
                 true,
                 null,
                 true
             );
 
-            if ($tokens[$maybeVariableVariable]['code'] === \T_VARIABLE
-                || $tokens[$maybeVariableVariable]['code'] === \T_DOLLAR
+            if ( $tokens[ $maybeVariableVariable ][ 'code' ] === \T_VARIABLE
+                || $tokens[ $maybeVariableVariable ][ 'code' ] === \T_DOLLAR
             ) {
                 return false;
             }
         }
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($closer + 1), null, true, null, true);
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $closer + 1 ), null, true, null, true );
 
-        if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_EQUAL) {
+        if ( $nextNonEmpty !== false && $tokens[ $nextNonEmpty ][ 'code' ] === \T_EQUAL ) {
             return true;
         }
 
-        if ($prevNonEmpty !== false
-            && $tokens[$prevNonEmpty]['code'] === \T_AS
-            && isset($tokens[$prevNonEmpty]['nested_parenthesis']) === true
+        if ( $prevNonEmpty !== false
+            && $tokens[ $prevNonEmpty ][ 'code' ] === \T_AS
+            && isset( $tokens[ $prevNonEmpty ][ 'nested_parenthesis' ] ) === true
         ) {
-            $parentheses = array_reverse($tokens[$prevNonEmpty]['nested_parenthesis'], true);
-            foreach ($parentheses as $open => $close) {
-                if (isset($tokens[$open]['parenthesis_owner'])
-                    && $tokens[$tokens[$open]['parenthesis_owner']]['code'] === \T_FOREACH
+            $parentheses = array_reverse( $tokens[ $prevNonEmpty ][ 'nested_parenthesis' ], true );
+            foreach ( $parentheses as $open => $close ) {
+                if ( isset( $tokens[ $open ][ 'parenthesis_owner' ] )
+                    && $tokens[ $tokens[ $open ][ 'parenthesis_owner' ] ][ 'code' ] === \T_FOREACH
                 ) {
                     return true;
                 }
@@ -1862,48 +1862,48 @@ 
         $parentOpener = $opener;
         do {
             $parentOpener = $phpcsFile->findPrevious(
-                array(\T_OPEN_SHORT_ARRAY, \T_OPEN_SQUARE_BRACKET),
-                ($parentOpener - 1),
+                array( \T_OPEN_SHORT_ARRAY, \T_OPEN_SQUARE_BRACKET ),
+                ( $parentOpener - 1 ),
                 null,
                 false,
                 null,
                 true
             );
 
-            if ($parentOpener === false) {
+            if ( $parentOpener === false ) {
                 return false;
             }
 
-        } while (isset($tokens[$parentOpener]['bracket_closer']) === true
-            && $tokens[$parentOpener]['bracket_closer'] < $opener
+        } while ( isset( $tokens[ $parentOpener ][ 'bracket_closer' ] ) === true
+            && $tokens[ $parentOpener ][ 'bracket_closer' ] < $opener
         );
 
-        if (isset($tokens[$parentOpener]['bracket_closer']) === true
-            && $tokens[$parentOpener]['bracket_closer'] > $closer
+        if ( isset( $tokens[ $parentOpener ][ 'bracket_closer' ] ) === true
+            && $tokens[ $parentOpener ][ 'bracket_closer' ] > $closer
         ) {
             // Work around tokenizer issue in PHPCS 2.0 - 2.7.
             $phpcsVersion = PHPCSHelper::getVersion();
-            if ((version_compare($phpcsVersion, '2.0', '>') === true
-                && version_compare($phpcsVersion, '2.8', '<') === true)
-                && $tokens[$parentOpener]['code'] === \T_OPEN_SQUARE_BRACKET
+            if ( ( version_compare( $phpcsVersion, '2.0', '>' ) === true
+                && version_compare( $phpcsVersion, '2.8', '<' ) === true )
+                && $tokens[ $parentOpener ][ 'code' ] === \T_OPEN_SQUARE_BRACKET
             ) {
                 $nextNonEmpty = $phpcsFile->findNext(
                     Tokens::$emptyTokens,
-                    ($tokens[$parentOpener]['bracket_closer'] + 1),
+                    ( $tokens[ $parentOpener ][ 'bracket_closer' ] + 1 ),
                     null,
                     true,
                     null,
                     true
                 );
 
-                if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_EQUAL) {
+                if ( $nextNonEmpty !== false && $tokens[ $nextNonEmpty ][ 'code' ] === \T_EQUAL ) {
                     return true;
                 }
 
                 return false;
             }
 
-            return $this->isShortList($phpcsFile, $parentOpener);
+            return $this->isShortList( $phpcsFile, $parentOpener );
         }
 
         return false;
@@ -1922,14 +1922,14 @@ 
      *
      * @return bool
      */
-    public function isVariable(File $phpcsFile, $start, $end, $targetNestingLevel)
+    public function isVariable( File $phpcsFile, $start, $end, $targetNestingLevel )
     {
         static $tokenBlackList, $bracketTokens;
 
         // Create the token arrays only once.
-        if (isset($tokenBlackList, $bracketTokens) === false) {
+        if ( isset( $tokenBlackList, $bracketTokens ) === false ) {
 
-            $tokenBlackList  = array(
+            $tokenBlackList = array(
                 \T_OPEN_PARENTHESIS => \T_OPEN_PARENTHESIS,
                 \T_STRING_CONCAT    => \T_STRING_CONCAT,
             );
@@ -1954,43 +1954,43 @@ 
         $tokens = $phpcsFile->getTokens();
 
         // If no variable at all was found, then it's definitely a no-no.
-        $hasVariable = $phpcsFile->findNext(\T_VARIABLE, $start, $end);
-        if ($hasVariable === false) {
+        $hasVariable = $phpcsFile->findNext( \T_VARIABLE, $start, $end );
+        if ( $hasVariable === false ) {
             return false;
         }
 
         // Check if the variable found is at the right level. Deeper levels are always an error.
-        if (isset($tokens[$hasVariable]['nested_parenthesis'])
-            && \count($tokens[$hasVariable]['nested_parenthesis']) !== $targetNestingLevel
+        if ( isset( $tokens[ $hasVariable ][ 'nested_parenthesis' ] )
+            && \count( $tokens[ $hasVariable ][ 'nested_parenthesis' ] ) !== $targetNestingLevel
         ) {
                 return false;
         }
 
         // Ok, so the first variable is at the right level, now are there any
         // blacklisted tokens within the empty() ?
-        $hasBadToken = $phpcsFile->findNext($tokenBlackList, $start, $end);
-        if ($hasBadToken === false) {
+        $hasBadToken = $phpcsFile->findNext( $tokenBlackList, $start, $end );
+        if ( $hasBadToken === false ) {
             return true;
         }
 
         // If there are also bracket tokens, the blacklisted token might be part of a variable
         // variable, but if there are no bracket tokens, we know we have an error.
-        $hasBrackets = $phpcsFile->findNext($bracketTokens, $start, $end);
-        if ($hasBrackets === false) {
+        $hasBrackets = $phpcsFile->findNext( $bracketTokens, $start, $end );
+        if ( $hasBrackets === false ) {
             return false;
         }
 
         // Ok, we have both a blacklisted token as well as brackets, so we need to walk
         // the tokens of the variable variable.
-        for ($i = $start; $i < $end; $i++) {
+        for ( $i = $start; $i < $end; $i++ ) {
             // If this is a bracket token, skip to the end of the bracketed expression.
-            if (isset($bracketTokens[$tokens[$i]['code']], $tokens[$i]['bracket_closer'])) {
-                $i = $tokens[$i]['bracket_closer'];
+            if ( isset( $bracketTokens[ $tokens[ $i ][ 'code' ] ], $tokens[ $i ][ 'bracket_closer' ] ) ) {
+                $i = $tokens[ $i ][ 'bracket_closer' ];
                 continue;
             }
 
             // If it's a blacklisted token, not within brackets, we have an error.
-            if (isset($tokenBlackList[$tokens[$i]['code']])) {
+            if ( isset( $tokenBlackList[ $tokens[ $i ][ 'code' ] ] ) ) {
                 return false;
             }
         }
@@ -2016,56 +2016,56 @@ 
      * @return bool True if the token passed is a unary operator.
      *              False otherwise or if the token is not a T_PLUS/T_MINUS token.
      */
-    public static function isUnaryPlusMinus(File $phpcsFile, $stackPtr)
+    public static function isUnaryPlusMinus( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]) === false
-            || ($tokens[$stackPtr]['code'] !== \T_PLUS
-            && $tokens[$stackPtr]['code'] !== \T_MINUS)
+        if ( isset( $tokens[ $stackPtr ] ) === false
+            || ( $tokens[ $stackPtr ][ 'code' ] !== \T_PLUS
+            && $tokens[ $stackPtr ][ 'code' ] !== \T_MINUS )
         ) {
             return false;
         }
 
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($next === false) {
+        $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+        if ( $next === false ) {
             // Live coding or parse error.
             return false;
         }
 
-        if (isset(Tokens::$operators[$tokens[$next]['code']]) === true) {
+        if ( isset( Tokens::$operators[ $tokens[ $next ][ 'code' ] ] ) === true ) {
             // Next token is an operator, so this is not a unary.
             return false;
         }
 
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
-        if ($tokens[$prev]['code'] === \T_RETURN) {
+        if ( $tokens[ $prev ][ 'code' ] === \T_RETURN ) {
             // Just returning a positive/negative value; eg. (return -1).
             return true;
         }
 
-        if (isset(Tokens::$operators[$tokens[$prev]['code']]) === true) {
+        if ( isset( Tokens::$operators[ $tokens[ $prev ][ 'code' ] ] ) === true ) {
             // Just trying to operate on a positive/negative value; eg. ($var * -1).
             return true;
         }
 
-        if (isset(Tokens::$comparisonTokens[$tokens[$prev]['code']]) === true) {
+        if ( isset( Tokens::$comparisonTokens[ $tokens[ $prev ][ 'code' ] ] ) === true ) {
             // Just trying to compare a positive/negative value; eg. ($var === -1).
             return true;
         }
 
-        if (isset(Tokens::$booleanOperators[$tokens[$prev]['code']]) === true) {
+        if ( isset( Tokens::$booleanOperators[ $tokens[ $prev ][ 'code' ] ] ) === true ) {
             // Just trying to compare a positive/negative value; eg. ($var || -1 === $b).
             return true;
         }
 
-        if (isset(Tokens::$assignmentTokens[$tokens[$prev]['code']]) === true) {
+        if ( isset( Tokens::$assignmentTokens[ $tokens[ $prev ][ 'code' ] ] ) === true ) {
             // Just trying to assign a positive/negative value; eg. ($var = -1).
             return true;
         }
 
-        if (isset(Tokens::$castTokens[$tokens[$prev]['code']]) === true) {
+        if ( isset( Tokens::$castTokens[ $tokens[ $prev ][ 'code' ] ] ) === true ) {
             // Just casting a positive/negative value; eg. (string) -$var.
             return true;
         }
@@ -2084,7 +2084,7 @@ 
             \T_STRING_CONCAT       => true,
         );
 
-        if (isset($invalidTokens[$tokens[$prev]['code']]) === true) {
+        if ( isset( $invalidTokens[ $tokens[ $prev ][ 'code' ] ] ) === true ) {
             // Just trying to use a positive/negative value; eg. myFunction($var, -2).
             return true;
         }

Braces +38 added lines, -76 removed lines

@@ -24,8 +24,7 @@ 
  * @author    Wim Godden <wim.godden@cu.be>
  * @copyright 2014 Cu.be Solutions bvba
  */
-abstract class Sniff implements PHPCS_Sniff
-{
+abstract class Sniff implements PHPCS_Sniff {
 
     const REGEX_COMPLEX_VARS = '`(?:(\{)?(?<!\\\\)\$)?(\{)?(?<!\\\\)\$(\{)?(?P<varname>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(?:->\$?(?P>varname)|\[[^\]]+\]|::\$?(?P>varname)|\([^\)]*\))*(?(3)\}|)(?(2)\}|)(?(1)\}|)`';
 
@@ -105,8 +104,7 @@ 
      *
      * @throws \PHP_CodeSniffer_Exception If testVersion is invalid.
      */
-    private function getTestVersion()
-    {
+    private function getTestVersion() {
         static $arrTestVersions = array();
 
         $default     = array(null, null);
@@ -173,8 +171,7 @@ 
      *              is equal to or higher than the highest supported PHP version
      *              in testVersion. False otherwise.
      */
-    public function supportsAbove($phpVersion)
-    {
+    public function supportsAbove($phpVersion) {
         $testVersion = $this->getTestVersion();
         $testVersion = $testVersion[1];
 
@@ -200,8 +197,7 @@ 
      *              supported PHP version in testVersion.
      *              False otherwise or if no testVersion is provided.
      */
-    public function supportsBelow($phpVersion)
-    {
+    public function supportsBelow($phpVersion) {
         $testVersion = $this->getTestVersion();
         $testVersion = $testVersion[0];
 
@@ -231,8 +227,7 @@ 
      *
      * @return void
      */
-    public function addMessage(File $phpcsFile, $message, $stackPtr, $isError, $code = 'Found', $data = array())
-    {
+    public function addMessage(File $phpcsFile, $message, $stackPtr, $isError, $code = 'Found', $data = array()) {
         if ($isError === true) {
             $phpcsFile->addError($message, $stackPtr, $code, $data);
         } else {
@@ -250,8 +245,7 @@ 
      *
      * @return string
      */
-    public function stringToErrorCode($baseString)
-    {
+    public function stringToErrorCode($baseString) {
         return preg_replace('`[^a-z0-9_]`i', '_', strtolower($baseString));
     }
 
@@ -265,8 +259,7 @@ 
      *
      * @return string String without quotes around it.
      */
-    public function stripQuotes($string)
-    {
+    public function stripQuotes($string) {
         return preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $string);
     }
 
@@ -280,8 +273,7 @@ 
      *
      * @return string String without variables in it.
      */
-    public function stripVariables($string)
-    {
+    public function stripVariables($string) {
         if (strpos($string, '$') === false) {
             return $string;
         }
@@ -297,8 +289,7 @@ 
      *
      * @return array Same array, but with all lowercase top level keys.
      */
-    public function arrayKeysToLowercase($array)
-    {
+    public function arrayKeysToLowercase($array) {
         return array_change_key_case($array, \CASE_LOWER);
     }
 
@@ -320,8 +311,7 @@ 
      *
      * @return bool
      */
-    public function doesFunctionCallHaveParameters(File $phpcsFile, $stackPtr)
-    {
+    public function doesFunctionCallHaveParameters(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -390,8 +380,7 @@ 
      *
      * @return int
      */
-    public function getFunctionCallParameterCount(File $phpcsFile, $stackPtr)
-    {
+    public function getFunctionCallParameterCount(File $phpcsFile, $stackPtr) {
         if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
             return 0;
         }
@@ -418,8 +407,7 @@ 
      *
      * @return array
      */
-    public function getFunctionCallParameters(File $phpcsFile, $stackPtr)
-    {
+    public function getFunctionCallParameters(File $phpcsFile, $stackPtr) {
         if ($this->doesFunctionCallHaveParameters($phpcsFile, $stackPtr) === false) {
             return array();
         }
@@ -525,8 +513,7 @@ 
      *
      * @return array|false
      */
-    public function getFunctionCallParameter(File $phpcsFile, $stackPtr, $paramOffset)
-    {
+    public function getFunctionCallParameter(File $phpcsFile, $stackPtr, $paramOffset) {
         $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
 
         if (isset($parameters[$paramOffset]) === false) {
@@ -555,8 +542,7 @@ 
      *              If the $scopeTypes are set: True if *one* of the conditions is a
      *              valid scope, false otherwise.
      */
-    public function tokenHasScope(File $phpcsFile, $stackPtr, $validScopes = null)
-    {
+    public function tokenHasScope(File $phpcsFile, $stackPtr, $validScopes = null) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -589,8 +575,7 @@ 
      *
      * @return bool True if within class scope, false otherwise.
      */
-    public function inClassScope(File $phpcsFile, $stackPtr, $strict = true)
-    {
+    public function inClassScope(File $phpcsFile, $stackPtr, $strict = true) {
         $validScopes = array(\T_CLASS);
         if (\defined('T_ANON_CLASS') === true) {
             $validScopes[] = \T_ANON_CLASS;
@@ -615,8 +600,7 @@ 
      *
      * @return string
      */
-    public function getFQClassNameFromNewToken(File $phpcsFile, $stackPtr)
-    {
+    public function getFQClassNameFromNewToken(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -669,8 +653,7 @@ 
      *
      * @return string
      */
-    public function getFQExtendedClassName(File $phpcsFile, $stackPtr)
-    {
+    public function getFQExtendedClassName(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -705,8 +688,7 @@ 
      *
      * @return string
      */
-    public function getFQClassNameFromDoubleColonToken(File $phpcsFile, $stackPtr)
-    {
+    public function getFQClassNameFromDoubleColonToken(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -770,8 +752,7 @@ 
      *
      * @return string
      */
-    public function getFQName(File $phpcsFile, $stackPtr, $name)
-    {
+    public function getFQName(File $phpcsFile, $stackPtr, $name) {
         if (strpos($name, '\\') === 0) {
             // Already fully qualified.
             return $name;
@@ -800,8 +781,7 @@ 
      *
      * @return bool True if namespaced, false if global.
      */
-    public function isNamespaced($FQName)
-    {
+    public function isNamespaced($FQName) {
         if (strpos($FQName, '\\') !== 0) {
             throw new PHPCS_Exception('$FQName must be a fully qualified name');
         }
@@ -818,8 +798,7 @@ 
      *
      * @return string Namespace name or empty string if it couldn't be determined or no namespace applies.
      */
-    public function determineNamespace(File $phpcsFile, $stackPtr)
-    {
+    public function determineNamespace(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -882,8 +861,7 @@ 
      * @return string|false Namespace name or false if not a namespace declaration.
      *                      Namespace name can be an empty string for global namespace declaration.
      */
-    public function getDeclaredNamespaceName(File $phpcsFile, $stackPtr)
-    {
+    public function getDeclaredNamespaceName(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -939,8 +917,7 @@ 
      *                   no return type was found or the passed token was
      *                   not of the correct type.
      */
-    public function getReturnTypeHintToken(File $phpcsFile, $stackPtr)
-    {
+    public function getReturnTypeHintToken(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE) {
@@ -1018,8 +995,7 @@ 
      *
      * @return string|false The name of the return type token.
      */
-    public function getReturnTypeHintName(File $phpcsFile, $stackPtr)
-    {
+    public function getReturnTypeHintName(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // In older PHPCS versions, the nullable indicator will turn a return type colon into a T_INLINE_ELSE.
@@ -1069,8 +1045,7 @@ 
      *
      * @return bool
      */
-    public function isClassProperty(File $phpcsFile, $stackPtr)
-    {
+    public function isClassProperty(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_VARIABLE) {
@@ -1114,8 +1089,7 @@ 
      *
      * @return bool
      */
-    public function isClassConstant(File $phpcsFile, $stackPtr)
-    {
+    public function isClassConstant(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]) === false || $tokens[$stackPtr]['code'] !== \T_CONST) {
@@ -1152,8 +1126,7 @@ 
      *
      * @return int|bool StackPtr to the scope if valid, false otherwise.
      */
-    protected function validDirectScope(File $phpcsFile, $stackPtr, $validScopes)
-    {
+    protected function validDirectScope(File $phpcsFile, $stackPtr, $validScopes) {
         $tokens = $phpcsFile->getTokens();
 
         if (empty($tokens[$stackPtr]['conditions']) === true) {
@@ -1194,8 +1167,7 @@ 
      *               - no type hints were found
      *               - or the passed token was not of the correct type.
      */
-    public function getTypeHintsFromFunctionDeclaration(File $phpcsFile, $stackPtr)
-    {
+    public function getTypeHintsFromFunctionDeclaration(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if ($tokens[$stackPtr]['code'] !== \T_FUNCTION && $tokens[$stackPtr]['code'] !== \T_CLOSURE) {
@@ -1238,8 +1210,7 @@ 
      * @return string|false The algorithm name without quotes if this was a relevant hash
      *                      function call or false if it was not.
      */
-    public function getHashAlgorithmParameter(File $phpcsFile, $stackPtr)
-    {
+    public function getHashAlgorithmParameter(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -1281,8 +1252,7 @@ 
      *
      * @return bool
      */
-    public function isUseOfGlobalConstant(File $phpcsFile, $stackPtr)
-    {
+    public function isUseOfGlobalConstant(File $phpcsFile, $stackPtr) {
         static $isLowPHPCS, $isLowPHP;
 
         $tokens = $phpcsFile->getTokens();
@@ -1419,8 +1389,7 @@ 
      *              False if not or if it could not be reliably determined
      *              (variable or calculations and such).
      */
-    public function isPositiveNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
+    public function isPositiveNumber(File $phpcsFile, $start, $end, $allowFloats = false) {
         $number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
 
         if ($number === false) {
@@ -1451,8 +1420,7 @@ 
      *              False if not or if it could not be reliably determined
      *              (variable or calculations and such).
      */
-    public function isNegativeNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
+    public function isNegativeNumber(File $phpcsFile, $start, $end, $allowFloats = false) {
         $number = $this->isNumber($phpcsFile, $start, $end, $allowFloats);
 
         if ($number === false) {
@@ -1488,8 +1456,7 @@ 
      *                        number or if it could not be reliably determined
      *                        (variable or calculations and such).
      */
-    protected function isNumber(File $phpcsFile, $start, $end, $allowFloats = false)
-    {
+    protected function isNumber(File $phpcsFile, $start, $end, $allowFloats = false) {
         $stringTokens = Tokens::$heredocTokens + Tokens::$stringTokens;
 
         $validTokens             = array();
@@ -1656,8 +1623,7 @@ 
      *
      * @return bool
      */
-    protected function isNumericCalculation(File $phpcsFile, $start, $end)
-    {
+    protected function isNumericCalculation(File $phpcsFile, $start, $end) {
         $arithmeticTokens = Tokens::$arithmeticTokens;
 
         // phpcs:disable PHPCompatibility.Constants.NewConstants.t_powFound
@@ -1741,8 +1707,7 @@ 
      *
      * @return bool True if short ternary, or false otherwise.
      */
-    public function isShortTernary(File $phpcsFile, $stackPtr)
-    {
+    public function isShortTernary(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
         if (isset($tokens[$stackPtr]) === false
             || $tokens[$stackPtr]['code'] !== \T_INLINE_THEN
@@ -1775,8 +1740,7 @@ 
      *
      * @return bool
      */
-    public function isShortList(File $phpcsFile, $stackPtr)
-    {
+    public function isShortList(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Check for the existence of the token.
@@ -1922,8 +1886,7 @@ 
      *
      * @return bool
      */
-    public function isVariable(File $phpcsFile, $start, $end, $targetNestingLevel)
-    {
+    public function isVariable(File $phpcsFile, $start, $end, $targetNestingLevel) {
         static $tokenBlackList, $bracketTokens;
 
         // Create the token arrays only once.
@@ -2016,8 +1979,7 @@ 
      * @return bool True if the token passed is a unary operator.
      *              False otherwise or if the token is not a T_PLUS/T_MINUS token.
      */
-    public static function isUnaryPlusMinus(File $phpcsFile, $stackPtr)
-    {
+    public static function isUnaryPlusMinus(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]) === false

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Classes/ForbiddenAbstractPrivateMethodsSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      *
      * @since 9.2.0
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

Indentation +53 added lines, -53 removed lines

@@ -29,62 +29,62 @@
 class ForbiddenAbstractPrivateMethodsSniff extends Sniff
 {
 
-    /**
-     * Valid scopes to check for abstract private methods.
-     *
-     * @since 9.2.0
-     *
-     * @var array
-     */
-    public $ooScopeTokens = array(
-        'T_CLASS'      => true,
-        'T_TRAIT'      => true,
-        'T_ANON_CLASS' => true,
-    );
+	/**
+	 * Valid scopes to check for abstract private methods.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @var array
+	 */
+	public $ooScopeTokens = array(
+		'T_CLASS'      => true,
+		'T_TRAIT'      => true,
+		'T_ANON_CLASS' => true,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_FUNCTION);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_FUNCTION);
+	}
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 9.2.0
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token
-     *                                         in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('5.1') === false) {
-            return;
-        }
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token
+	 *                                         in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('5.1') === false) {
+			return;
+		}
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
-            // Function, not method.
-            return;
-        }
+		if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
+			// Function, not method.
+			return;
+		}
 
-        $properties = $phpcsFile->getMethodProperties($stackPtr);
-        if ($properties['scope'] !== 'private' || $properties['is_abstract'] !== true) {
-            return;
-        }
+		$properties = $phpcsFile->getMethodProperties($stackPtr);
+		if ($properties['scope'] !== 'private' || $properties['is_abstract'] !== true) {
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Abstract methods cannot be declared as private since PHP 5.1',
-            $stackPtr,
-            'Found'
-        );
-    }
+		$phpcsFile->addError(
+			'Abstract methods cannot be declared as private since PHP 5.1',
+			$stackPtr,
+			'Found'
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function register()
     {
-        return array(\T_FUNCTION);
+        return array( \T_FUNCTION );
     }
 
     /**
@@ -65,19 +65,19 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('5.1') === false) {
+        if ( $this->supportsAbove( '5.1' ) === false ) {
             return;
         }
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
+        if ( $this->validDirectScope( $phpcsFile, $stackPtr, $this->ooScopeTokens ) === false ) {
             // Function, not method.
             return;
         }
 
-        $properties = $phpcsFile->getMethodProperties($stackPtr);
-        if ($properties['scope'] !== 'private' || $properties['is_abstract'] !== true) {
+        $properties = $phpcsFile->getMethodProperties( $stackPtr );
+        if ( $properties[ 'scope' ] !== 'private' || $properties[ 'is_abstract' ] !== true ) {
             return;
         }
 

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @since 9.2.0
  */
-class ForbiddenAbstractPrivateMethodsSniff extends Sniff
-{
+class ForbiddenAbstractPrivateMethodsSniff extends Sniff {
 
     /**
      * Valid scopes to check for abstract private methods.
@@ -49,8 +48,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_FUNCTION);
     }
 
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.1') === false) {
             return;
         }

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Classes/RemovedOrphanedParentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      *
      * @since 9.2.0
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

Indentation +72 added lines, -72 removed lines

@@ -28,88 +28,88 @@
 class RemovedOrphanedParentSniff extends Sniff
 {
 
-    /**
-     * Class scopes to check the class declaration.
-     *
-     * @since 9.2.0
-     *
-     * @var array
-     */
-    public $classScopeTokens = array(
-        'T_CLASS'      => true,
-        'T_ANON_CLASS' => true,
-    );
+	/**
+	 * Class scopes to check the class declaration.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @var array
+	 */
+	public $classScopeTokens = array(
+		'T_CLASS'      => true,
+		'T_ANON_CLASS' => true,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_PARENT);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_PARENT);
+	}
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 9.2.0
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token
-     *                                         in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.4') === false) {
-            return;
-        }
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token
+	 *                                         in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.4') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        if (empty($tokens[$stackPtr]['conditions']) === true) {
-            // Use within the global namespace. Not our concern.
-            return;
-        }
+		if (empty($tokens[$stackPtr]['conditions']) === true) {
+			// Use within the global namespace. Not our concern.
+			return;
+		}
 
-        /*
+		/*
          * Find the class within which this parent keyword is used.
          */
-        $conditions = $tokens[$stackPtr]['conditions'];
-        $conditions = array_reverse($conditions, true);
-        $classPtr   = false;
+		$conditions = $tokens[$stackPtr]['conditions'];
+		$conditions = array_reverse($conditions, true);
+		$classPtr   = false;
 
-        foreach ($conditions as $ptr => $type) {
-            if (isset($this->classScopeTokens[$tokens[$ptr]['type']])) {
-                $classPtr = $ptr;
-                break;
-            }
-        }
+		foreach ($conditions as $ptr => $type) {
+			if (isset($this->classScopeTokens[$tokens[$ptr]['type']])) {
+				$classPtr = $ptr;
+				break;
+			}
+		}
 
-        if ($classPtr === false) {
-            // Use outside of a class scope. Not our concern.
-            return;
-        }
+		if ($classPtr === false) {
+			// Use outside of a class scope. Not our concern.
+			return;
+		}
 
-        if (isset($tokens[$classPtr]['scope_opener']) === false) {
-            // No scope opener known. Probably a parse error.
-            return;
-        }
+		if (isset($tokens[$classPtr]['scope_opener']) === false) {
+			// No scope opener known. Probably a parse error.
+			return;
+		}
 
-        $extends = $phpcsFile->findNext(\T_EXTENDS, ($classPtr + 1), $tokens[$classPtr]['scope_opener']);
-        if ($extends !== false) {
-            // Class has a parent.
-            return;
-        }
+		$extends = $phpcsFile->findNext(\T_EXTENDS, ($classPtr + 1), $tokens[$classPtr]['scope_opener']);
+		if ($extends !== false) {
+			// Class has a parent.
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Using "parent" inside a class without parent is deprecated since PHP 7.4',
-            $stackPtr,
-            'Deprecated'
-        );
-    }
+		$phpcsFile->addError(
+			'Using "parent" inside a class without parent is deprecated since PHP 7.4',
+			$stackPtr,
+			'Deprecated'
+		);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function register()
     {
-        return array(\T_PARENT);
+        return array( \T_PARENT );
     }
 
     /**
@@ -63,15 +63,15 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.4') === false) {
+        if ( $this->supportsAbove( '7.4' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        if (empty($tokens[$stackPtr]['conditions']) === true) {
+        if ( empty( $tokens[ $stackPtr ][ 'conditions' ] ) === true ) {
             // Use within the global namespace. Not our concern.
             return;
         }
@@ -79,29 +79,29 @@ 
         /*
          * Find the class within which this parent keyword is used.
          */
-        $conditions = $tokens[$stackPtr]['conditions'];
-        $conditions = array_reverse($conditions, true);
+        $conditions = $tokens[ $stackPtr ][ 'conditions' ];
+        $conditions = array_reverse( $conditions, true );
         $classPtr   = false;
 
-        foreach ($conditions as $ptr => $type) {
-            if (isset($this->classScopeTokens[$tokens[$ptr]['type']])) {
+        foreach ( $conditions as $ptr => $type ) {
+            if ( isset( $this->classScopeTokens[ $tokens[ $ptr ][ 'type' ] ] ) ) {
                 $classPtr = $ptr;
                 break;
             }
         }
 
-        if ($classPtr === false) {
+        if ( $classPtr === false ) {
             // Use outside of a class scope. Not our concern.
             return;
         }
 
-        if (isset($tokens[$classPtr]['scope_opener']) === false) {
+        if ( isset( $tokens[ $classPtr ][ 'scope_opener' ] ) === false ) {
             // No scope opener known. Probably a parse error.
             return;
         }
 
-        $extends = $phpcsFile->findNext(\T_EXTENDS, ($classPtr + 1), $tokens[$classPtr]['scope_opener']);
-        if ($extends !== false) {
+        $extends = $phpcsFile->findNext( \T_EXTENDS, ( $classPtr + 1 ), $tokens[ $classPtr ][ 'scope_opener' ] );
+        if ( $extends !== false ) {
             // Class has a parent.
             return;
         }

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  *
  * @since 9.2.0
  */
-class RemovedOrphanedParentSniff extends Sniff
-{
+class RemovedOrphanedParentSniff extends Sniff {
 
     /**
      * Class scopes to check the class declaration.
@@ -47,8 +46,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_PARENT);
     }
 
@@ -63,8 +61,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.4') === false) {
             return;
         }

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/ControlStructures/NewExecutionDirectivesSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -167,7 +167,7 @@ 
     /**
      * Get an array of the non-PHP-version array keys used in a sub-array.
      *
-     * @return array
+     * @return string[]
      */
     protected function getNonVersionArrayKeys()
     {

Indentation +307 added lines, -307 removed lines

@@ -24,311 +24,311 @@
 class NewExecutionDirectivesSniff extends AbstractNewFeatureSniff
 {
 
-    /**
-     * A list of new execution directives
-     *
-     * The array lists : version number with false (not present) or true (present).
-     * If the execution order is conditional, add the condition as a string to the version nr.
-     * If's sufficient to list the first version where the execution directive appears.
-     *
-     * @var array(string => array(string => int|string|null))
-     */
-    protected $newDirectives = array(
-        'ticks' => array(
-            '3.1' => false,
-            '4.0' => true,
-            'valid_value_callback' => 'isNumeric',
-        ),
-        'encoding' => array(
-            '5.2' => false,
-            '5.3' => '--enable-zend-multibyte', // Directive ignored unless.
-            '5.4' => true,
-            'valid_value_callback' => 'validEncoding',
-        ),
-        'strict_types' => array(
-            '5.6' => false,
-            '7.0' => true,
-            'valid_values' => array(1),
-        ),
-    );
-
-
-    /**
-     * Tokens to ignore when trying to find the value for the directive.
-     *
-     * @var array
-     */
-    protected $ignoreTokens = array();
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->ignoreTokens           = Tokens::$emptyTokens;
-        $this->ignoreTokens[\T_EQUAL] = \T_EQUAL;
-
-        return array(\T_DECLARE);
-    }
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in
-     *                                         the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === true) {
-            $openParenthesis  = $tokens[$stackPtr]['parenthesis_opener'];
-            $closeParenthesis = $tokens[$stackPtr]['parenthesis_closer'];
-        } else {
-            if (version_compare(PHPCSHelper::getVersion(), '2.3.4', '>=')) {
-                return;
-            }
-
-            // Deal with PHPCS 2.3.0-2.3.3 which do not yet set the parenthesis properly for declare statements.
-            $openParenthesis = $phpcsFile->findNext(\T_OPEN_PARENTHESIS, ($stackPtr + 1), null, false, null, true);
-            if ($openParenthesis === false || isset($tokens[$openParenthesis]['parenthesis_closer']) === false) {
-                return;
-            }
-            $closeParenthesis = $tokens[$openParenthesis]['parenthesis_closer'];
-        }
-
-        $directivePtr = $phpcsFile->findNext(\T_STRING, ($openParenthesis + 1), $closeParenthesis, false);
-        if ($directivePtr === false) {
-            return;
-        }
-
-        $directiveContent = $tokens[$directivePtr]['content'];
-
-        if (isset($this->newDirectives[$directiveContent]) === false) {
-            $error = 'Declare can only be used with the directives %s. Found: %s';
-            $data  = array(
-                implode(', ', array_keys($this->newDirectives)),
-                $directiveContent,
-            );
-
-            $phpcsFile->addError($error, $stackPtr, 'InvalidDirectiveFound', $data);
-
-        } else {
-            // Check for valid directive for version.
-            $itemInfo = array(
-                'name'   => $directiveContent,
-            );
-            $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-
-            // Check for valid directive value.
-            $valuePtr = $phpcsFile->findNext($this->ignoreTokens, $directivePtr + 1, $closeParenthesis, true);
-            if ($valuePtr === false) {
-                return;
-            }
-
-            $this->addWarningOnInvalidValue($phpcsFile, $valuePtr, $directiveContent);
-        }
-    }
-
-
-    /**
-     * Determine whether an error/warning should be thrown for an item based on collected information.
-     *
-     * @param array $errorInfo Detail information about an item.
-     *
-     * @return bool
-     */
-    protected function shouldThrowError(array $errorInfo)
-    {
-        return ($errorInfo['not_in_version'] !== '' || $errorInfo['conditional_version'] !== '');
-    }
-
-
-    /**
-     * Get the relevant sub-array for a specific item from a multi-dimensional array.
-     *
-     * @param array $itemInfo Base information about the item.
-     *
-     * @return array Version and other information about the item.
-     */
-    public function getItemArray(array $itemInfo)
-    {
-        return $this->newDirectives[$itemInfo['name']];
-    }
-
-
-    /**
-     * Get an array of the non-PHP-version array keys used in a sub-array.
-     *
-     * @return array
-     */
-    protected function getNonVersionArrayKeys()
-    {
-        return array(
-            'valid_value_callback',
-            'valid_values',
-        );
-    }
-
-
-    /**
-     * Retrieve the relevant detail (version) information for use in an error message.
-     *
-     * @param array $itemArray Version and other information about the item.
-     * @param array $itemInfo  Base information about the item.
-     *
-     * @return array
-     */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
-    {
-        $errorInfo                        = parent::getErrorInfo($itemArray, $itemInfo);
-        $errorInfo['conditional_version'] = '';
-        $errorInfo['condition']           = '';
-
-        $versionArray = $this->getVersionArray($itemArray);
-
-        if (empty($versionArray) === false) {
-            foreach ($versionArray as $version => $present) {
-                if (\is_string($present) === true && $this->supportsBelow($version) === true) {
-                    // We cannot test for compilation option (ok, except by scraping the output of phpinfo...).
-                    $errorInfo['conditional_version'] = $version;
-                    $errorInfo['condition']           = $present;
-                }
-            }
-        }
-
-        return $errorInfo;
-    }
-
-
-    /**
-     * Get the error message template for this sniff.
-     *
-     * @return string
-     */
-    protected function getErrorMsgTemplate()
-    {
-        return 'Directive ' . parent::getErrorMsgTemplate();
-    }
-
-
-    /**
-     * Generates the error or warning for this item.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the relevant token in
-     *                                         the stack.
-     * @param array                 $itemInfo  Base information about the item.
-     * @param array                 $errorInfo Array with detail (version) information
-     *                                         relevant to the item.
-     *
-     * @return void
-     */
-    public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo)
-    {
-        if ($errorInfo['not_in_version'] !== '') {
-            parent::addError($phpcsFile, $stackPtr, $itemInfo, $errorInfo);
-        } elseif ($errorInfo['conditional_version'] !== '') {
-            $error     = 'Directive %s is present in PHP version %s but will be disregarded unless PHP is compiled with %s';
-            $errorCode = $this->stringToErrorCode($itemInfo['name']) . 'WithConditionFound';
-            $data      = array(
-                $itemInfo['name'],
-                $errorInfo['conditional_version'],
-                $errorInfo['condition'],
-            );
-
-            $phpcsFile->addWarning($error, $stackPtr, $errorCode, $data);
-        }
-    }
-
-
-    /**
-     * Generates a error or warning for this sniff.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the execution directive value
-     *                                         in the token array.
-     * @param string                $directive The directive.
-     *
-     * @return void
-     */
-    protected function addWarningOnInvalidValue(File $phpcsFile, $stackPtr, $directive)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $value = $tokens[$stackPtr]['content'];
-        if (isset(Tokens::$stringTokens[$tokens[$stackPtr]['code']]) === true) {
-            $value = $this->stripQuotes($value);
-        }
-
-        $isError = false;
-        if (isset($this->newDirectives[$directive]['valid_values'])) {
-            if (\in_array($value, $this->newDirectives[$directive]['valid_values']) === false) {
-                $isError = true;
-            }
-        } elseif (isset($this->newDirectives[$directive]['valid_value_callback'])) {
-            $valid = \call_user_func(array($this, $this->newDirectives[$directive]['valid_value_callback']), $value);
-            if ($valid === false) {
-                $isError = true;
-            }
-        }
-
-        if ($isError === true) {
-            $error     = 'The execution directive %s does not seem to have a valid value. Please review. Found: %s';
-            $errorCode = $this->stringToErrorCode($directive) . 'InvalidValueFound';
-            $data      = array(
-                $directive,
-                $value,
-            );
-
-            $phpcsFile->addWarning($error, $stackPtr, $errorCode, $data);
-        }
-    }
-
-
-    /**
-     * Check whether a value is numeric.
-     *
-     * Callback function to test whether the value for an execution directive is valid.
-     *
-     * @param mixed $value The value to test.
-     *
-     * @return bool
-     */
-    protected function isNumeric($value)
-    {
-        return is_numeric($value);
-    }
-
-
-    /**
-     * Check whether a value is a valid encoding.
-     *
-     * Callback function to test whether the value for an execution directive is valid.
-     *
-     * @param mixed $value The value to test.
-     *
-     * @return bool
-     */
-    protected function validEncoding($value)
-    {
-        static $encodings;
-        if (isset($encodings) === false && function_exists('mb_list_encodings')) {
-            $encodings = mb_list_encodings();
-        }
-
-        if (empty($encodings) || \is_array($encodings) === false) {
-            // If we can't test the encoding, let it pass through.
-            return true;
-        }
-
-        return \in_array($value, $encodings, true);
-    }
+	/**
+	 * A list of new execution directives
+	 *
+	 * The array lists : version number with false (not present) or true (present).
+	 * If the execution order is conditional, add the condition as a string to the version nr.
+	 * If's sufficient to list the first version where the execution directive appears.
+	 *
+	 * @var array(string => array(string => int|string|null))
+	 */
+	protected $newDirectives = array(
+		'ticks' => array(
+			'3.1' => false,
+			'4.0' => true,
+			'valid_value_callback' => 'isNumeric',
+		),
+		'encoding' => array(
+			'5.2' => false,
+			'5.3' => '--enable-zend-multibyte', // Directive ignored unless.
+			'5.4' => true,
+			'valid_value_callback' => 'validEncoding',
+		),
+		'strict_types' => array(
+			'5.6' => false,
+			'7.0' => true,
+			'valid_values' => array(1),
+		),
+	);
+
+
+	/**
+	 * Tokens to ignore when trying to find the value for the directive.
+	 *
+	 * @var array
+	 */
+	protected $ignoreTokens = array();
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$this->ignoreTokens           = Tokens::$emptyTokens;
+		$this->ignoreTokens[\T_EQUAL] = \T_EQUAL;
+
+		return array(\T_DECLARE);
+	}
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in
+	 *                                         the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === true) {
+			$openParenthesis  = $tokens[$stackPtr]['parenthesis_opener'];
+			$closeParenthesis = $tokens[$stackPtr]['parenthesis_closer'];
+		} else {
+			if (version_compare(PHPCSHelper::getVersion(), '2.3.4', '>=')) {
+				return;
+			}
+
+			// Deal with PHPCS 2.3.0-2.3.3 which do not yet set the parenthesis properly for declare statements.
+			$openParenthesis = $phpcsFile->findNext(\T_OPEN_PARENTHESIS, ($stackPtr + 1), null, false, null, true);
+			if ($openParenthesis === false || isset($tokens[$openParenthesis]['parenthesis_closer']) === false) {
+				return;
+			}
+			$closeParenthesis = $tokens[$openParenthesis]['parenthesis_closer'];
+		}
+
+		$directivePtr = $phpcsFile->findNext(\T_STRING, ($openParenthesis + 1), $closeParenthesis, false);
+		if ($directivePtr === false) {
+			return;
+		}
+
+		$directiveContent = $tokens[$directivePtr]['content'];
+
+		if (isset($this->newDirectives[$directiveContent]) === false) {
+			$error = 'Declare can only be used with the directives %s. Found: %s';
+			$data  = array(
+				implode(', ', array_keys($this->newDirectives)),
+				$directiveContent,
+			);
+
+			$phpcsFile->addError($error, $stackPtr, 'InvalidDirectiveFound', $data);
+
+		} else {
+			// Check for valid directive for version.
+			$itemInfo = array(
+				'name'   => $directiveContent,
+			);
+			$this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+
+			// Check for valid directive value.
+			$valuePtr = $phpcsFile->findNext($this->ignoreTokens, $directivePtr + 1, $closeParenthesis, true);
+			if ($valuePtr === false) {
+				return;
+			}
+
+			$this->addWarningOnInvalidValue($phpcsFile, $valuePtr, $directiveContent);
+		}
+	}
+
+
+	/**
+	 * Determine whether an error/warning should be thrown for an item based on collected information.
+	 *
+	 * @param array $errorInfo Detail information about an item.
+	 *
+	 * @return bool
+	 */
+	protected function shouldThrowError(array $errorInfo)
+	{
+		return ($errorInfo['not_in_version'] !== '' || $errorInfo['conditional_version'] !== '');
+	}
+
+
+	/**
+	 * Get the relevant sub-array for a specific item from a multi-dimensional array.
+	 *
+	 * @param array $itemInfo Base information about the item.
+	 *
+	 * @return array Version and other information about the item.
+	 */
+	public function getItemArray(array $itemInfo)
+	{
+		return $this->newDirectives[$itemInfo['name']];
+	}
+
+
+	/**
+	 * Get an array of the non-PHP-version array keys used in a sub-array.
+	 *
+	 * @return array
+	 */
+	protected function getNonVersionArrayKeys()
+	{
+		return array(
+			'valid_value_callback',
+			'valid_values',
+		);
+	}
+
+
+	/**
+	 * Retrieve the relevant detail (version) information for use in an error message.
+	 *
+	 * @param array $itemArray Version and other information about the item.
+	 * @param array $itemInfo  Base information about the item.
+	 *
+	 * @return array
+	 */
+	public function getErrorInfo(array $itemArray, array $itemInfo)
+	{
+		$errorInfo                        = parent::getErrorInfo($itemArray, $itemInfo);
+		$errorInfo['conditional_version'] = '';
+		$errorInfo['condition']           = '';
+
+		$versionArray = $this->getVersionArray($itemArray);
+
+		if (empty($versionArray) === false) {
+			foreach ($versionArray as $version => $present) {
+				if (\is_string($present) === true && $this->supportsBelow($version) === true) {
+					// We cannot test for compilation option (ok, except by scraping the output of phpinfo...).
+					$errorInfo['conditional_version'] = $version;
+					$errorInfo['condition']           = $present;
+				}
+			}
+		}
+
+		return $errorInfo;
+	}
+
+
+	/**
+	 * Get the error message template for this sniff.
+	 *
+	 * @return string
+	 */
+	protected function getErrorMsgTemplate()
+	{
+		return 'Directive ' . parent::getErrorMsgTemplate();
+	}
+
+
+	/**
+	 * Generates the error or warning for this item.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the relevant token in
+	 *                                         the stack.
+	 * @param array                 $itemInfo  Base information about the item.
+	 * @param array                 $errorInfo Array with detail (version) information
+	 *                                         relevant to the item.
+	 *
+	 * @return void
+	 */
+	public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo)
+	{
+		if ($errorInfo['not_in_version'] !== '') {
+			parent::addError($phpcsFile, $stackPtr, $itemInfo, $errorInfo);
+		} elseif ($errorInfo['conditional_version'] !== '') {
+			$error     = 'Directive %s is present in PHP version %s but will be disregarded unless PHP is compiled with %s';
+			$errorCode = $this->stringToErrorCode($itemInfo['name']) . 'WithConditionFound';
+			$data      = array(
+				$itemInfo['name'],
+				$errorInfo['conditional_version'],
+				$errorInfo['condition'],
+			);
+
+			$phpcsFile->addWarning($error, $stackPtr, $errorCode, $data);
+		}
+	}
+
+
+	/**
+	 * Generates a error or warning for this sniff.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the execution directive value
+	 *                                         in the token array.
+	 * @param string                $directive The directive.
+	 *
+	 * @return void
+	 */
+	protected function addWarningOnInvalidValue(File $phpcsFile, $stackPtr, $directive)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$value = $tokens[$stackPtr]['content'];
+		if (isset(Tokens::$stringTokens[$tokens[$stackPtr]['code']]) === true) {
+			$value = $this->stripQuotes($value);
+		}
+
+		$isError = false;
+		if (isset($this->newDirectives[$directive]['valid_values'])) {
+			if (\in_array($value, $this->newDirectives[$directive]['valid_values']) === false) {
+				$isError = true;
+			}
+		} elseif (isset($this->newDirectives[$directive]['valid_value_callback'])) {
+			$valid = \call_user_func(array($this, $this->newDirectives[$directive]['valid_value_callback']), $value);
+			if ($valid === false) {
+				$isError = true;
+			}
+		}
+
+		if ($isError === true) {
+			$error     = 'The execution directive %s does not seem to have a valid value. Please review. Found: %s';
+			$errorCode = $this->stringToErrorCode($directive) . 'InvalidValueFound';
+			$data      = array(
+				$directive,
+				$value,
+			);
+
+			$phpcsFile->addWarning($error, $stackPtr, $errorCode, $data);
+		}
+	}
+
+
+	/**
+	 * Check whether a value is numeric.
+	 *
+	 * Callback function to test whether the value for an execution directive is valid.
+	 *
+	 * @param mixed $value The value to test.
+	 *
+	 * @return bool
+	 */
+	protected function isNumeric($value)
+	{
+		return is_numeric($value);
+	}
+
+
+	/**
+	 * Check whether a value is a valid encoding.
+	 *
+	 * Callback function to test whether the value for an execution directive is valid.
+	 *
+	 * @param mixed $value The value to test.
+	 *
+	 * @return bool
+	 */
+	protected function validEncoding($value)
+	{
+		static $encodings;
+		if (isset($encodings) === false && function_exists('mb_list_encodings')) {
+			$encodings = mb_list_encodings();
+		}
+
+		if (empty($encodings) || \is_array($encodings) === false) {
+			// If we can't test the encoding, let it pass through.
+			return true;
+		}
+
+		return \in_array($value, $encodings, true);
+	}
 }

Spacing +62 added lines, -62 removed lines

@@ -48,7 +48,7 @@ 
         'strict_types' => array(
             '5.6' => false,
             '7.0' => true,
-            'valid_values' => array(1),
+            'valid_values' => array( 1 ),
         ),
     );
 
@@ -69,9 +69,9 @@ 
     public function register()
     {
         $this->ignoreTokens           = Tokens::$emptyTokens;
-        $this->ignoreTokens[\T_EQUAL] = \T_EQUAL;
+        $this->ignoreTokens[ \T_EQUAL ] = \T_EQUAL;
 
-        return array(\T_DECLARE);
+        return array( \T_DECLARE );
     }
 
 
@@ -84,56 +84,56 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === true) {
-            $openParenthesis  = $tokens[$stackPtr]['parenthesis_opener'];
-            $closeParenthesis = $tokens[$stackPtr]['parenthesis_closer'];
+        if ( isset( $tokens[ $stackPtr ][ 'parenthesis_opener' ], $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === true ) {
+            $openParenthesis  = $tokens[ $stackPtr ][ 'parenthesis_opener' ];
+            $closeParenthesis = $tokens[ $stackPtr ][ 'parenthesis_closer' ];
         } else {
-            if (version_compare(PHPCSHelper::getVersion(), '2.3.4', '>=')) {
+            if ( version_compare( PHPCSHelper::getVersion(), '2.3.4', '>=' ) ) {
                 return;
             }
 
             // Deal with PHPCS 2.3.0-2.3.3 which do not yet set the parenthesis properly for declare statements.
-            $openParenthesis = $phpcsFile->findNext(\T_OPEN_PARENTHESIS, ($stackPtr + 1), null, false, null, true);
-            if ($openParenthesis === false || isset($tokens[$openParenthesis]['parenthesis_closer']) === false) {
+            $openParenthesis = $phpcsFile->findNext( \T_OPEN_PARENTHESIS, ( $stackPtr + 1 ), null, false, null, true );
+            if ( $openParenthesis === false || isset( $tokens[ $openParenthesis ][ 'parenthesis_closer' ] ) === false ) {
                 return;
             }
-            $closeParenthesis = $tokens[$openParenthesis]['parenthesis_closer'];
+            $closeParenthesis = $tokens[ $openParenthesis ][ 'parenthesis_closer' ];
         }
 
-        $directivePtr = $phpcsFile->findNext(\T_STRING, ($openParenthesis + 1), $closeParenthesis, false);
-        if ($directivePtr === false) {
+        $directivePtr = $phpcsFile->findNext( \T_STRING, ( $openParenthesis + 1 ), $closeParenthesis, false );
+        if ( $directivePtr === false ) {
             return;
         }
 
-        $directiveContent = $tokens[$directivePtr]['content'];
+        $directiveContent = $tokens[ $directivePtr ][ 'content' ];
 
-        if (isset($this->newDirectives[$directiveContent]) === false) {
+        if ( isset( $this->newDirectives[ $directiveContent ] ) === false ) {
             $error = 'Declare can only be used with the directives %s. Found: %s';
             $data  = array(
-                implode(', ', array_keys($this->newDirectives)),
+                implode( ', ', array_keys( $this->newDirectives ) ),
                 $directiveContent,
             );
 
-            $phpcsFile->addError($error, $stackPtr, 'InvalidDirectiveFound', $data);
+            $phpcsFile->addError( $error, $stackPtr, 'InvalidDirectiveFound', $data );
 
         } else {
             // Check for valid directive for version.
             $itemInfo = array(
                 'name'   => $directiveContent,
             );
-            $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+            $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
 
             // Check for valid directive value.
-            $valuePtr = $phpcsFile->findNext($this->ignoreTokens, $directivePtr + 1, $closeParenthesis, true);
-            if ($valuePtr === false) {
+            $valuePtr = $phpcsFile->findNext( $this->ignoreTokens, $directivePtr + 1, $closeParenthesis, true );
+            if ( $valuePtr === false ) {
                 return;
             }
 
-            $this->addWarningOnInvalidValue($phpcsFile, $valuePtr, $directiveContent);
+            $this->addWarningOnInvalidValue( $phpcsFile, $valuePtr, $directiveContent );
         }
     }
 
@@ -145,9 +145,9 @@ 
      *
      * @return bool
      */
-    protected function shouldThrowError(array $errorInfo)
+    protected function shouldThrowError( array $errorInfo )
     {
-        return ($errorInfo['not_in_version'] !== '' || $errorInfo['conditional_version'] !== '');
+        return ( $errorInfo[ 'not_in_version' ] !== '' || $errorInfo[ 'conditional_version' ] !== '' );
     }
 
 
@@ -158,9 +158,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newDirectives[$itemInfo['name']];
+        return $this->newDirectives[ $itemInfo[ 'name' ] ];
     }
 
 
@@ -186,20 +186,20 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
+    public function getErrorInfo( array $itemArray, array $itemInfo )
     {
-        $errorInfo                        = parent::getErrorInfo($itemArray, $itemInfo);
-        $errorInfo['conditional_version'] = '';
-        $errorInfo['condition']           = '';
+        $errorInfo                        = parent::getErrorInfo( $itemArray, $itemInfo );
+        $errorInfo[ 'conditional_version' ] = '';
+        $errorInfo[ 'condition' ]           = '';
 
-        $versionArray = $this->getVersionArray($itemArray);
+        $versionArray = $this->getVersionArray( $itemArray );
 
-        if (empty($versionArray) === false) {
-            foreach ($versionArray as $version => $present) {
-                if (\is_string($present) === true && $this->supportsBelow($version) === true) {
+        if ( empty( $versionArray ) === false ) {
+            foreach ( $versionArray as $version => $present ) {
+                if ( \is_string( $present ) === true && $this->supportsBelow( $version ) === true ) {
                     // We cannot test for compilation option (ok, except by scraping the output of phpinfo...).
-                    $errorInfo['conditional_version'] = $version;
-                    $errorInfo['condition']           = $present;
+                    $errorInfo[ 'conditional_version' ] = $version;
+                    $errorInfo[ 'condition' ]           = $present;
                 }
             }
         }
@@ -231,20 +231,20 @@ 
      *
      * @return void
      */
-    public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo)
+    public function addError( File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo )
     {
-        if ($errorInfo['not_in_version'] !== '') {
-            parent::addError($phpcsFile, $stackPtr, $itemInfo, $errorInfo);
-        } elseif ($errorInfo['conditional_version'] !== '') {
+        if ( $errorInfo[ 'not_in_version' ] !== '' ) {
+            parent::addError( $phpcsFile, $stackPtr, $itemInfo, $errorInfo );
+        } elseif ( $errorInfo[ 'conditional_version' ] !== '' ) {
             $error     = 'Directive %s is present in PHP version %s but will be disregarded unless PHP is compiled with %s';
-            $errorCode = $this->stringToErrorCode($itemInfo['name']) . 'WithConditionFound';
+            $errorCode = $this->stringToErrorCode( $itemInfo[ 'name' ] ) . 'WithConditionFound';
             $data      = array(
-                $itemInfo['name'],
-                $errorInfo['conditional_version'],
-                $errorInfo['condition'],
+                $itemInfo[ 'name' ],
+                $errorInfo[ 'conditional_version' ],
+                $errorInfo[ 'condition' ],
             );
 
-            $phpcsFile->addWarning($error, $stackPtr, $errorCode, $data);
+            $phpcsFile->addWarning( $error, $stackPtr, $errorCode, $data );
         }
     }
 
@@ -259,36 +259,36 @@ 
      *
      * @return void
      */
-    protected function addWarningOnInvalidValue(File $phpcsFile, $stackPtr, $directive)
+    protected function addWarningOnInvalidValue( File $phpcsFile, $stackPtr, $directive )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $value = $tokens[$stackPtr]['content'];
-        if (isset(Tokens::$stringTokens[$tokens[$stackPtr]['code']]) === true) {
-            $value = $this->stripQuotes($value);
+        $value = $tokens[ $stackPtr ][ 'content' ];
+        if ( isset( Tokens::$stringTokens[ $tokens[ $stackPtr ][ 'code' ] ] ) === true ) {
+            $value = $this->stripQuotes( $value );
         }
 
         $isError = false;
-        if (isset($this->newDirectives[$directive]['valid_values'])) {
-            if (\in_array($value, $this->newDirectives[$directive]['valid_values']) === false) {
+        if ( isset( $this->newDirectives[ $directive ][ 'valid_values' ] ) ) {
+            if ( \in_array( $value, $this->newDirectives[ $directive ][ 'valid_values' ] ) === false ) {
                 $isError = true;
             }
-        } elseif (isset($this->newDirectives[$directive]['valid_value_callback'])) {
-            $valid = \call_user_func(array($this, $this->newDirectives[$directive]['valid_value_callback']), $value);
-            if ($valid === false) {
+        } elseif ( isset( $this->newDirectives[ $directive ][ 'valid_value_callback' ] ) ) {
+            $valid = \call_user_func( array( $this, $this->newDirectives[ $directive ][ 'valid_value_callback' ] ), $value );
+            if ( $valid === false ) {
                 $isError = true;
             }
         }
 
-        if ($isError === true) {
+        if ( $isError === true ) {
             $error     = 'The execution directive %s does not seem to have a valid value. Please review. Found: %s';
-            $errorCode = $this->stringToErrorCode($directive) . 'InvalidValueFound';
+            $errorCode = $this->stringToErrorCode( $directive ) . 'InvalidValueFound';
             $data      = array(
                 $directive,
                 $value,
             );
 
-            $phpcsFile->addWarning($error, $stackPtr, $errorCode, $data);
+            $phpcsFile->addWarning( $error, $stackPtr, $errorCode, $data );
         }
     }
 
@@ -302,9 +302,9 @@ 
      *
      * @return bool
      */
-    protected function isNumeric($value)
+    protected function isNumeric( $value )
     {
-        return is_numeric($value);
+        return is_numeric( $value );
     }
 
 
@@ -317,18 +317,18 @@ 
      *
      * @return bool
      */
-    protected function validEncoding($value)
+    protected function validEncoding( $value )
     {
         static $encodings;
-        if (isset($encodings) === false && function_exists('mb_list_encodings')) {
+        if ( isset( $encodings ) === false && function_exists( 'mb_list_encodings' ) ) {
             $encodings = mb_list_encodings();
         }
 
-        if (empty($encodings) || \is_array($encodings) === false) {
+        if ( empty( $encodings ) || \is_array( $encodings ) === false ) {
             // If we can't test the encoding, let it pass through.
             return true;
         }
 
-        return \in_array($value, $encodings, true);
+        return \in_array( $value, $encodings, true );
     }
 }

Braces +12 added lines, -24 removed lines

@@ -21,8 +21,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewExecutionDirectivesSniff extends AbstractNewFeatureSniff
-{
+class NewExecutionDirectivesSniff extends AbstractNewFeatureSniff {
 
     /**
      * A list of new execution directives
@@ -66,8 +65,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $this->ignoreTokens           = Tokens::$emptyTokens;
         $this->ignoreTokens[\T_EQUAL] = \T_EQUAL;
 
@@ -84,8 +82,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === true) {
@@ -145,8 +142,7 @@ 
      *
      * @return bool
      */
-    protected function shouldThrowError(array $errorInfo)
-    {
+    protected function shouldThrowError(array $errorInfo) {
         return ($errorInfo['not_in_version'] !== '' || $errorInfo['conditional_version'] !== '');
     }
 
@@ -158,8 +154,7 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
-    {
+    public function getItemArray(array $itemInfo) {
         return $this->newDirectives[$itemInfo['name']];
     }
 
@@ -169,8 +164,7 @@ 
      *
      * @return array
      */
-    protected function getNonVersionArrayKeys()
-    {
+    protected function getNonVersionArrayKeys() {
         return array(
             'valid_value_callback',
             'valid_values',
@@ -186,8 +180,7 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
-    {
+    public function getErrorInfo(array $itemArray, array $itemInfo) {
         $errorInfo                        = parent::getErrorInfo($itemArray, $itemInfo);
         $errorInfo['conditional_version'] = '';
         $errorInfo['condition']           = '';
@@ -213,8 +206,7 @@ 
      *
      * @return string
      */
-    protected function getErrorMsgTemplate()
-    {
+    protected function getErrorMsgTemplate() {
         return 'Directive ' . parent::getErrorMsgTemplate();
     }
 
@@ -231,8 +223,7 @@ 
      *
      * @return void
      */
-    public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo)
-    {
+    public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo) {
         if ($errorInfo['not_in_version'] !== '') {
             parent::addError($phpcsFile, $stackPtr, $itemInfo, $errorInfo);
         } elseif ($errorInfo['conditional_version'] !== '') {
@@ -259,8 +250,7 @@ 
      *
      * @return void
      */
-    protected function addWarningOnInvalidValue(File $phpcsFile, $stackPtr, $directive)
-    {
+    protected function addWarningOnInvalidValue(File $phpcsFile, $stackPtr, $directive) {
         $tokens = $phpcsFile->getTokens();
 
         $value = $tokens[$stackPtr]['content'];
@@ -302,8 +292,7 @@ 
      *
      * @return bool
      */
-    protected function isNumeric($value)
-    {
+    protected function isNumeric($value) {
         return is_numeric($value);
     }
 
@@ -317,8 +306,7 @@ 
      *
      * @return bool
      */
-    protected function validEncoding($value)
-    {
+    protected function validEncoding($value) {
         static $encodings;
         if (isset($encodings) === false && function_exists('mb_list_encodings')) {
             $encodings = mb_list_encodings();

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewClosureSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

Indentation +185 added lines, -185 removed lines

@@ -28,210 +28,210 @@
  */
 class NewClosureSniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_CLOSURE);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token
-     *                                         in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsBelow('5.2')) {
-            $phpcsFile->addError(
-                'Closures / anonymous functions are not available in PHP 5.2 or earlier',
-                $stackPtr,
-                'Found'
-            );
-        }
-
-        /*
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_CLOSURE);
+	}
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token
+	 *                                         in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsBelow('5.2')) {
+			$phpcsFile->addError(
+				'Closures / anonymous functions are not available in PHP 5.2 or earlier',
+				$stackPtr,
+				'Found'
+			);
+		}
+
+		/*
          * Closures can only be declared as static since PHP 5.4.
          */
-        $isStatic = $this->isClosureStatic($phpcsFile, $stackPtr);
-        if ($this->supportsBelow('5.3') && $isStatic === true) {
-            $phpcsFile->addError(
-                'Closures / anonymous functions could not be declared as static in PHP 5.3 or earlier',
-                $stackPtr,
-                'StaticFound'
-            );
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
-            // Live coding or parse error.
-            return;
-        }
-
-        $scopeStart = ($tokens[$stackPtr]['scope_opener'] + 1);
-        $scopeEnd   = $tokens[$stackPtr]['scope_closer'];
-        $usesThis   = $this->findThisUsageInClosure($phpcsFile, $scopeStart, $scopeEnd);
-
-        if ($this->supportsBelow('5.3')) {
-            /*
+		$isStatic = $this->isClosureStatic($phpcsFile, $stackPtr);
+		if ($this->supportsBelow('5.3') && $isStatic === true) {
+			$phpcsFile->addError(
+				'Closures / anonymous functions could not be declared as static in PHP 5.3 or earlier',
+				$stackPtr,
+				'StaticFound'
+			);
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+			// Live coding or parse error.
+			return;
+		}
+
+		$scopeStart = ($tokens[$stackPtr]['scope_opener'] + 1);
+		$scopeEnd   = $tokens[$stackPtr]['scope_closer'];
+		$usesThis   = $this->findThisUsageInClosure($phpcsFile, $scopeStart, $scopeEnd);
+
+		if ($this->supportsBelow('5.3')) {
+			/*
              * Closures declared within classes only have access to $this since PHP 5.4.
              */
-            if ($usesThis !== false) {
-                $thisFound = $usesThis;
-                do {
-                    $phpcsFile->addError(
-                        'Closures / anonymous functions did not have access to $this in PHP 5.3 or earlier',
-                        $thisFound,
-                        'ThisFound'
-                    );
+			if ($usesThis !== false) {
+				$thisFound = $usesThis;
+				do {
+					$phpcsFile->addError(
+						'Closures / anonymous functions did not have access to $this in PHP 5.3 or earlier',
+						$thisFound,
+						'ThisFound'
+					);
 
-                    $thisFound = $this->findThisUsageInClosure($phpcsFile, ($thisFound + 1), $scopeEnd);
+					$thisFound = $this->findThisUsageInClosure($phpcsFile, ($thisFound + 1), $scopeEnd);
 
-                } while ($thisFound !== false);
-            }
+				} while ($thisFound !== false);
+			}
 
-            /*
+			/*
              * Closures declared within classes only have access to self/parent/static since PHP 5.4.
              */
-            $usesClassRef = $this->findClassRefUsageInClosure($phpcsFile, $scopeStart, $scopeEnd);
+			$usesClassRef = $this->findClassRefUsageInClosure($phpcsFile, $scopeStart, $scopeEnd);
 
-            if ($usesClassRef !== false) {
-                do {
-                    $phpcsFile->addError(
-                        'Closures / anonymous functions could not use "%s::" in PHP 5.3 or earlier',
-                        $usesClassRef,
-                        'ClassRefFound',
-                        array(strtolower($tokens[$usesClassRef]['content']))
-                    );
+			if ($usesClassRef !== false) {
+				do {
+					$phpcsFile->addError(
+						'Closures / anonymous functions could not use "%s::" in PHP 5.3 or earlier',
+						$usesClassRef,
+						'ClassRefFound',
+						array(strtolower($tokens[$usesClassRef]['content']))
+					);
 
-                    $usesClassRef = $this->findClassRefUsageInClosure($phpcsFile, ($usesClassRef + 1), $scopeEnd);
+					$usesClassRef = $this->findClassRefUsageInClosure($phpcsFile, ($usesClassRef + 1), $scopeEnd);
 
-                } while ($usesClassRef !== false);
-            }
-        }
+				} while ($usesClassRef !== false);
+			}
+		}
 
-        /*
+		/*
          * Check for correct usage.
          */
-        if ($this->supportsAbove('5.4') && $usesThis !== false) {
+		if ($this->supportsAbove('5.4') && $usesThis !== false) {
 
-            $thisFound = $usesThis;
+			$thisFound = $usesThis;
 
-            do {
-                /*
+			do {
+				/*
                  * Closures only have access to $this if not declared as static.
                  */
-                if ($isStatic === true) {
-                    $phpcsFile->addError(
-                        'Closures / anonymous functions declared as static do not have access to $this',
-                        $thisFound,
-                        'ThisFoundInStatic'
-                    );
-                }
-
-                /*
+				if ($isStatic === true) {
+					$phpcsFile->addError(
+						'Closures / anonymous functions declared as static do not have access to $this',
+						$thisFound,
+						'ThisFoundInStatic'
+					);
+				}
+
+				/*
                  * Closures only have access to $this if used within a class context.
                  */
-                elseif ($this->inClassScope($phpcsFile, $stackPtr, false) === false) {
-                    $phpcsFile->addWarning(
-                        'Closures / anonymous functions only have access to $this if used within a class or when bound to an object using bindTo(). Please verify.',
-                        $thisFound,
-                        'ThisFoundOutsideClass'
-                    );
-                }
-
-                $thisFound = $this->findThisUsageInClosure($phpcsFile, ($thisFound + 1), $scopeEnd);
-
-            } while ($thisFound !== false);
-        }
-
-        // Prevent double reporting for nested closures.
-        return $scopeEnd;
-    }
-
-
-    /**
-     * Check whether the closure is declared as static.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token
-     *                                         in the stack passed in $tokens.
-     *
-     * @return bool
-     */
-    protected function isClosureStatic(File $phpcsFile, $stackPtr)
-    {
-        $tokens    = $phpcsFile->getTokens();
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-
-        return ($prevToken !== false && $tokens[$prevToken]['code'] === \T_STATIC);
-    }
-
-
-    /**
-     * Check if the code within a closure uses the $this variable.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile  The file being scanned.
-     * @param int                   $startToken The position within the closure to continue searching from.
-     * @param int                   $endToken   The closure scope closer to stop searching at.
-     *
-     * @return int|false The stackPtr to the first $this usage if found or false if
-     *                   $this is not used.
-     */
-    protected function findThisUsageInClosure(File $phpcsFile, $startToken, $endToken)
-    {
-        // Make sure the $startToken is valid.
-        if ($startToken >= $endToken) {
-            return false;
-        }
-
-        return $phpcsFile->findNext(
-            \T_VARIABLE,
-            $startToken,
-            $endToken,
-            false,
-            '$this'
-        );
-    }
-
-    /**
-     * Check if the code within a closure uses "self/parent/static".
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile  The file being scanned.
-     * @param int                   $startToken The position within the closure to continue searching from.
-     * @param int                   $endToken   The closure scope closer to stop searching at.
-     *
-     * @return int|false The stackPtr to the first classRef usage if found or false if
-     *                   they are not used.
-     */
-    protected function findClassRefUsageInClosure(File $phpcsFile, $startToken, $endToken)
-    {
-        // Make sure the $startToken is valid.
-        if ($startToken >= $endToken) {
-            return false;
-        }
-
-        $tokens   = $phpcsFile->getTokens();
-        $classRef = $phpcsFile->findNext(array(\T_SELF, \T_PARENT, \T_STATIC), $startToken, $endToken);
-
-        if ($classRef === false || $tokens[$classRef]['code'] !== \T_STATIC) {
-            return $classRef;
-        }
-
-        // T_STATIC, make sure it is used as a class reference.
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($classRef + 1), $endToken, true);
-        if ($next === false || $tokens[$next]['code'] !== \T_DOUBLE_COLON) {
-            return false;
-        }
-
-        return $classRef;
-    }
+				elseif ($this->inClassScope($phpcsFile, $stackPtr, false) === false) {
+					$phpcsFile->addWarning(
+						'Closures / anonymous functions only have access to $this if used within a class or when bound to an object using bindTo(). Please verify.',
+						$thisFound,
+						'ThisFoundOutsideClass'
+					);
+				}
+
+				$thisFound = $this->findThisUsageInClosure($phpcsFile, ($thisFound + 1), $scopeEnd);
+
+			} while ($thisFound !== false);
+		}
+
+		// Prevent double reporting for nested closures.
+		return $scopeEnd;
+	}
+
+
+	/**
+	 * Check whether the closure is declared as static.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token
+	 *                                         in the stack passed in $tokens.
+	 *
+	 * @return bool
+	 */
+	protected function isClosureStatic(File $phpcsFile, $stackPtr)
+	{
+		$tokens    = $phpcsFile->getTokens();
+		$prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+
+		return ($prevToken !== false && $tokens[$prevToken]['code'] === \T_STATIC);
+	}
+
+
+	/**
+	 * Check if the code within a closure uses the $this variable.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile  The file being scanned.
+	 * @param int                   $startToken The position within the closure to continue searching from.
+	 * @param int                   $endToken   The closure scope closer to stop searching at.
+	 *
+	 * @return int|false The stackPtr to the first $this usage if found or false if
+	 *                   $this is not used.
+	 */
+	protected function findThisUsageInClosure(File $phpcsFile, $startToken, $endToken)
+	{
+		// Make sure the $startToken is valid.
+		if ($startToken >= $endToken) {
+			return false;
+		}
+
+		return $phpcsFile->findNext(
+			\T_VARIABLE,
+			$startToken,
+			$endToken,
+			false,
+			'$this'
+		);
+	}
+
+	/**
+	 * Check if the code within a closure uses "self/parent/static".
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile  The file being scanned.
+	 * @param int                   $startToken The position within the closure to continue searching from.
+	 * @param int                   $endToken   The closure scope closer to stop searching at.
+	 *
+	 * @return int|false The stackPtr to the first classRef usage if found or false if
+	 *                   they are not used.
+	 */
+	protected function findClassRefUsageInClosure(File $phpcsFile, $startToken, $endToken)
+	{
+		// Make sure the $startToken is valid.
+		if ($startToken >= $endToken) {
+			return false;
+		}
+
+		$tokens   = $phpcsFile->getTokens();
+		$classRef = $phpcsFile->findNext(array(\T_SELF, \T_PARENT, \T_STATIC), $startToken, $endToken);
+
+		if ($classRef === false || $tokens[$classRef]['code'] !== \T_STATIC) {
+			return $classRef;
+		}
+
+		// T_STATIC, make sure it is used as a class reference.
+		$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($classRef + 1), $endToken, true);
+		if ($next === false || $tokens[$next]['code'] !== \T_DOUBLE_COLON) {
+			return false;
+		}
+
+		return $classRef;
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function register()
     {
-        return array(\T_CLOSURE);
+        return array( \T_CLOSURE );
     }
 
     /**
@@ -47,9 +47,9 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.2')) {
+        if ( $this->supportsBelow( '5.2' ) ) {
             $phpcsFile->addError(
                 'Closures / anonymous functions are not available in PHP 5.2 or earlier',
                 $stackPtr,
@@ -60,8 +60,8 @@ 
         /*
          * Closures can only be declared as static since PHP 5.4.
          */
-        $isStatic = $this->isClosureStatic($phpcsFile, $stackPtr);
-        if ($this->supportsBelow('5.3') && $isStatic === true) {
+        $isStatic = $this->isClosureStatic( $phpcsFile, $stackPtr );
+        if ( $this->supportsBelow( '5.3' ) && $isStatic === true ) {
             $phpcsFile->addError(
                 'Closures / anonymous functions could not be declared as static in PHP 5.3 or earlier',
                 $stackPtr,
@@ -71,20 +71,20 @@ 
 
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_opener' ], $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             // Live coding or parse error.
             return;
         }
 
-        $scopeStart = ($tokens[$stackPtr]['scope_opener'] + 1);
-        $scopeEnd   = $tokens[$stackPtr]['scope_closer'];
-        $usesThis   = $this->findThisUsageInClosure($phpcsFile, $scopeStart, $scopeEnd);
+        $scopeStart = ( $tokens[ $stackPtr ][ 'scope_opener' ] + 1 );
+        $scopeEnd   = $tokens[ $stackPtr ][ 'scope_closer' ];
+        $usesThis   = $this->findThisUsageInClosure( $phpcsFile, $scopeStart, $scopeEnd );
 
-        if ($this->supportsBelow('5.3')) {
+        if ( $this->supportsBelow( '5.3' ) ) {
             /*
              * Closures declared within classes only have access to $this since PHP 5.4.
              */
-            if ($usesThis !== false) {
+            if ( $usesThis !== false ) {
                 $thisFound = $usesThis;
                 do {
                     $phpcsFile->addError(
@@ -93,35 +93,35 @@ 
                         'ThisFound'
                     );
 
-                    $thisFound = $this->findThisUsageInClosure($phpcsFile, ($thisFound + 1), $scopeEnd);
+                    $thisFound = $this->findThisUsageInClosure( $phpcsFile, ( $thisFound + 1 ), $scopeEnd );
 
-                } while ($thisFound !== false);
+                } while ( $thisFound !== false );
             }
 
             /*
              * Closures declared within classes only have access to self/parent/static since PHP 5.4.
              */
-            $usesClassRef = $this->findClassRefUsageInClosure($phpcsFile, $scopeStart, $scopeEnd);
+            $usesClassRef = $this->findClassRefUsageInClosure( $phpcsFile, $scopeStart, $scopeEnd );
 
-            if ($usesClassRef !== false) {
+            if ( $usesClassRef !== false ) {
                 do {
                     $phpcsFile->addError(
                         'Closures / anonymous functions could not use "%s::" in PHP 5.3 or earlier',
                         $usesClassRef,
                         'ClassRefFound',
-                        array(strtolower($tokens[$usesClassRef]['content']))
+                        array( strtolower( $tokens[ $usesClassRef ][ 'content' ] ) )
                     );
 
-                    $usesClassRef = $this->findClassRefUsageInClosure($phpcsFile, ($usesClassRef + 1), $scopeEnd);
+                    $usesClassRef = $this->findClassRefUsageInClosure( $phpcsFile, ( $usesClassRef + 1 ), $scopeEnd );
 
-                } while ($usesClassRef !== false);
+                } while ( $usesClassRef !== false );
             }
         }
 
         /*
          * Check for correct usage.
          */
-        if ($this->supportsAbove('5.4') && $usesThis !== false) {
+        if ( $this->supportsAbove( '5.4' ) && $usesThis !== false ) {
 
             $thisFound = $usesThis;
 
@@ -129,7 +129,7 @@ 
                 /*
                  * Closures only have access to $this if not declared as static.
                  */
-                if ($isStatic === true) {
+                if ( $isStatic === true ) {
                     $phpcsFile->addError(
                         'Closures / anonymous functions declared as static do not have access to $this',
                         $thisFound,
@@ -140,7 +140,7 @@ 
                 /*
                  * Closures only have access to $this if used within a class context.
                  */
-                elseif ($this->inClassScope($phpcsFile, $stackPtr, false) === false) {
+                elseif ( $this->inClassScope( $phpcsFile, $stackPtr, false ) === false ) {
                     $phpcsFile->addWarning(
                         'Closures / anonymous functions only have access to $this if used within a class or when bound to an object using bindTo(). Please verify.',
                         $thisFound,
@@ -148,9 +148,9 @@ 
                     );
                 }
 
-                $thisFound = $this->findThisUsageInClosure($phpcsFile, ($thisFound + 1), $scopeEnd);
+                $thisFound = $this->findThisUsageInClosure( $phpcsFile, ( $thisFound + 1 ), $scopeEnd );
 
-            } while ($thisFound !== false);
+            } while ( $thisFound !== false );
         }
 
         // Prevent double reporting for nested closures.
@@ -167,12 +167,12 @@ 
      *
      * @return bool
      */
-    protected function isClosureStatic(File $phpcsFile, $stackPtr)
+    protected function isClosureStatic( File $phpcsFile, $stackPtr )
     {
         $tokens    = $phpcsFile->getTokens();
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+        $prevToken = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
 
-        return ($prevToken !== false && $tokens[$prevToken]['code'] === \T_STATIC);
+        return ( $prevToken !== false && $tokens[ $prevToken ][ 'code' ] === \T_STATIC );
     }
 
 
@@ -186,10 +186,10 @@ 
      * @return int|false The stackPtr to the first $this usage if found or false if
      *                   $this is not used.
      */
-    protected function findThisUsageInClosure(File $phpcsFile, $startToken, $endToken)
+    protected function findThisUsageInClosure( File $phpcsFile, $startToken, $endToken )
     {
         // Make sure the $startToken is valid.
-        if ($startToken >= $endToken) {
+        if ( $startToken >= $endToken ) {
             return false;
         }
 
@@ -212,23 +212,23 @@ 
      * @return int|false The stackPtr to the first classRef usage if found or false if
      *                   they are not used.
      */
-    protected function findClassRefUsageInClosure(File $phpcsFile, $startToken, $endToken)
+    protected function findClassRefUsageInClosure( File $phpcsFile, $startToken, $endToken )
     {
         // Make sure the $startToken is valid.
-        if ($startToken >= $endToken) {
+        if ( $startToken >= $endToken ) {
             return false;
         }
 
         $tokens   = $phpcsFile->getTokens();
-        $classRef = $phpcsFile->findNext(array(\T_SELF, \T_PARENT, \T_STATIC), $startToken, $endToken);
+        $classRef = $phpcsFile->findNext( array( \T_SELF, \T_PARENT, \T_STATIC ), $startToken, $endToken );
 
-        if ($classRef === false || $tokens[$classRef]['code'] !== \T_STATIC) {
+        if ( $classRef === false || $tokens[ $classRef ][ 'code' ] !== \T_STATIC ) {
             return $classRef;
         }
 
         // T_STATIC, make sure it is used as a class reference.
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($classRef + 1), $endToken, true);
-        if ($next === false || $tokens[$next]['code'] !== \T_DOUBLE_COLON) {
+        $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $classRef + 1 ), $endToken, true );
+        if ( $next === false || $tokens[ $next ][ 'code' ] !== \T_DOUBLE_COLON ) {
             return false;
         }
 

Braces +6 added lines, -12 removed lines

@@ -26,15 +26,13 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim@cu.be>
  */
-class NewClosureSniff extends Sniff
-{
+class NewClosureSniff extends Sniff {
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_CLOSURE);
     }
 
@@ -47,8 +45,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.2')) {
             $phpcsFile->addError(
                 'Closures / anonymous functions are not available in PHP 5.2 or earlier',
@@ -167,8 +164,7 @@ 
      *
      * @return bool
      */
-    protected function isClosureStatic(File $phpcsFile, $stackPtr)
-    {
+    protected function isClosureStatic(File $phpcsFile, $stackPtr) {
         $tokens    = $phpcsFile->getTokens();
         $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
 
@@ -186,8 +182,7 @@ 
      * @return int|false The stackPtr to the first $this usage if found or false if
      *                   $this is not used.
      */
-    protected function findThisUsageInClosure(File $phpcsFile, $startToken, $endToken)
-    {
+    protected function findThisUsageInClosure(File $phpcsFile, $startToken, $endToken) {
         // Make sure the $startToken is valid.
         if ($startToken >= $endToken) {
             return false;
@@ -212,8 +207,7 @@ 
      * @return int|false The stackPtr to the first classRef usage if found or false if
      *                   they are not used.
      */
-    protected function findClassRefUsageInClosure(File $phpcsFile, $startToken, $endToken)
-    {
+    protected function findClassRefUsageInClosure(File $phpcsFile, $startToken, $endToken) {
         // Make sure the $startToken is valid.
         if ($startToken >= $endToken) {
             return false;