Replace most strpos() !== FALSE or === FALSE with str_contains()

The Needs Review Queue Bot → tested this issue. It either no longer applies to Drupal core, or fails the Drupal core commit checks. Therefore, this issue status is now "Needs work".

Apart from a re-roll or rebase, this issue may need more work to address feedback in the issue or MR comments. To progress an issue, incorporate this feedback as part of the process of updating the issue. This helps other contributors to know what is outstanding.

Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.

The Needs Review Queue Bot → tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".

Apart from a re-roll or rebase, this issue may need more work to address feedback in the issue or MR comments. To progress an issue, incorporate this feedback as part of the process of updating the issue. This helps other contributors to know what is outstanding.

Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.

The Needs Review Queue Bot → tested this issue. It fails the Drupal core commit checks. Therefore, this issue status is now "Needs work".

Apart from a re-roll or rebase, this issue may need more work to address feedback in the issue or MR comments. To progress an issue, incorporate this feedback as part of the process of updating the issue. This helps other contributors to know what is outstanding.

Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.

While I'll look into it

There was a merge conflict due to 📌 Replace most strpos() !== FALSE or === FALSE with str_contains() Fixed moving a line we're changing to a different file. Addressed with the latest merge.

Been avoiding this ticket a week haha

Finally got around to reviewing, searching for strpos( and reviewing each found a few files

PathProcessorImageStyles (few instances)
BookJavascriptTest (not sure if tests are included)
UserNameConstraintValidator

Hi,

I added the cases mentioned by @smustgrave and others that I found.

I'm only taking into account the following patterns as suggested in the description:

• strpos($a, $b) !== FALSE
• strpos($a, $b) === FALSE

I was not including:

• ($pos = strpos($input, '@', $pos)) !== false
• ($start = strpos($message, '{')) !== FALSE
• strpos($value, $condition['value']) === 0

Thank you!

I think not including is correct. Think that would make the scope of this too large IMO. This looks good!

There are at least two changes to str_starts_with(), which isn't the scope defined in #16. All the in-scope changes look fine, but let's please limit the MR to those, makes it a lot harder to scan the hundreds of lines of diff if there are multiple patterns dealt with at once.

Note to self: got down to AliasPathProcessor

Reverted the 2 cases that were not strpos replacements.

Thanks @catch for the review.

I'm getting a phpstan error trying to commit this locally, which I don't think is the patch but I sometimes see weird failures from phpstan when it runs on particular files.

I've committed this with --no-verify, and if I'm wrong, well mea culpa.

Committed b3fac4a and pushed to 10.1.x. Thanks!

Automatically closed - issue fixed for 2 weeks with no activity.