Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Functions/DynamicCalls: various bug fixes and improvements #592

Merged
merged 12 commits into from
Nov 23, 2020
+92 −128
Merged

Functions/DynamicCalls: various bug fixes and improvements #592

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
af82f36
Functions/DynamicCalls: annotate the unit tests
jrfnl Oct 23, 2020
d8f958d
Functions/DynamicCalls: remove redundant conditions [1]
jrfnl Oct 23, 2020
0f55b11
Functions/DynamicCalls: remove redundant conditions [2]
jrfnl Oct 23, 2020
db13572
Functions/DynamicCalls: improve code readability
jrfnl Oct 23, 2020
b6ebf86
Functions/DynamicCalls: minor simplification
jrfnl Oct 23, 2020
df8c596
Functions/DynamicCalls: bug fix - ignore comments [1]
jrfnl Oct 23, 2020
8e63627
Functions/DynamicCalls: bug fix - don't blindly use the next text string
jrfnl Oct 23, 2020
e607fb0
Functions/DynamicCalls: bug fix - allow for double quotes
jrfnl Oct 23, 2020
b093d62
Functions/DynamicCalls: bug fix - fix memory + performance issue
jrfnl Oct 23, 2020
6b4a43d
Functions/DynamicCalls: rename private property
jrfnl Oct 23, 2020
3118358
Functions/DynamicCalls: bug fix - ignore comments [2]
jrfnl Oct 23, 2020
1d1a977
Functions/DynamicCalls: error message tweak
jrfnl Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions WordPressVIPMinimum/Sniffs/Functions/DynamicCallsSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,6 @@ public function process_token( $stackPtr ) {
* @return void
*/
private function collect_variables() {
/*
* Make sure we are working with a variable,
* get its value if so.
*/

if (
$this->tokens[ $this->stackPtr ]['type'] !==
'T_VARIABLE'
) {
return;
}

$current_var_name = $this->tokens[ $this->stackPtr ]['content'];

Expand All @@ -131,10 +120,6 @@ private function collect_variables() {
return;
}

if ( $this->tokens[ $t_item_key ]['length'] !== 1 ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious - what tokens are == and ===?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • == => T_IS_EQUAL
  • === => T_IS_IDENTICAL

Ref: https://www.php.net/manual/en/tokens.php

return;
}

/*
* Find encapsulated string ( "" )
*/
Expand Down Expand Up @@ -181,17 +166,6 @@ private function find_dynamic_calls() {
return;
}

/*
* Make sure we do have a variable to work with.
*/

if (
$this->tokens[ $this->stackPtr ]['type'] !==
'T_VARIABLE'
) {
return;
}

/*
* If variable is not found in our registry of
* variables, do nothing, as we cannot be
Expand Down
4 changes: 2 additions & 2 deletions WordPressVIPMinimum/Tests/Functions/DynamicCallsUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ function my_test() {


$my_notokay_func = 'extract';
$my_notokay_func();
$my_notokay_func(); // Bad.

$my_okay_func = 'my_test';
$my_okay_func();
$my_okay_func(); // OK.