WordPress/WordPress-Coding-Standards
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress-Coding-Standards.git synced 2025-08-30 03:11:24 +08:00
Code Issues Projects Packages Wiki Activity Actions 1

Merge pull request #832 from WordPress-Coding-Standards/feature/efficiency-use-numTokens-property

Browse source 
Efficiency: Defer to the PHPCS native `$numTokens` property for the token count
This commit is contained in:
J.D. Grimes 2017-02-01 09:49:02 -05:00 • committed by GitHub
commit fdcc2b75fe
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WordPress/Sniff.php
View file

@ -866,7 +866,7 @@ abstract class WordPress_Sniff implements PHP_CodeSniffer_Sniff {
// If this is inside an isset(), check after it as well, all the way to the
// end of the scope.
if ( $in_isset ) {
$end = ( 0 === $start ) ? count( $tokens ) : $tokens[ $start ]['scope_closer'];
$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ]['scope_closer'];
}
// Check if we've looked here before.

2
WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php
View file

@ -112,7 +112,7 @@ class WordPress_Sniffs_Arrays_ArrayDeclarationSpacingSniff extends Squiz_Sniffs_
static $current_loop = array();
if ( ! isset( $current_loop[ $phpcsFile->fixer->loops ] ) ) {
$current_loop[ $phpcsFile->fixer->loops ] = array_fill( 0, count( $tokens ), false );
$current_loop[ $phpcsFile->fixer->loops ] = array_fill( 0, $phpcsFile->numTokens, false );
}
if ( false === $current_loop[ $phpcsFile->fixer->loops ][ $arrayStart ] ) {

3
WordPress/Sniffs/VIP/DirectDatabaseQuerySniff.php
View file

@ -161,8 +161,7 @@ class WordPress_Sniffs_VIP_DirectDatabaseQuerySniff implements PHP_CodeSniffer_S
$endOfStatement = $phpcsFile->findNext( array( T_SEMICOLON ), ( $stackPtr + 1 ), null, false, null, true );
$endOfLineComment = '';
$tokenCount = count( $tokens );
for ( $i = ( $endOfStatement + 1 ); $i < $tokenCount; $i++ ) {
for ( $i = ( $endOfStatement + 1 ); $i < $phpcsFile->numTokens; $i++ ) {
if ( $tokens[ $i ]['line'] !== $tokens[ $endOfStatement ]['line'] ) {
break;

2
WordPress/Sniffs/Variables/GlobalVariablesSniff.php
View file

@ -350,7 +350,7 @@ class WordPress_Sniffs_Variables_GlobalVariablesSniff extends WordPress_Sniff {
// Only search from the end of the "global ...;" statement onwards.
$start = ( $phpcsFile->findEndOfStatement( $stackPtr ) + 1 );
$end = count( $this->tokens );
$end = $phpcsFile->numTokens;
$global_scope = true;
// Is the global statement within a function call or closure ?