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

Jump to bottom

Pass delimiter char to preg_quote #2047

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Pass delimiter char to preg_quote #2047

merged 1 commit into from
Jun 9, 2022

Conversation

MarcinNowakWebdeveloper
Copy link
Contributor

@MarcinNowakWebdeveloper MarcinNowakWebdeveloper commented Apr 20, 2022 •
edited by sreichel
Loading

Description (*)

The most common used delimiters in PHP are /@#~,
which are not escaped by default
(by default preg_quote escapes .+*?[^]$(){}=!<>|:-).

This avoids hard to detect issues when the content passed to regex contains char being used as a delimiter.

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)
  • Add yourself to contributors list

@github-actions github-actions bot added Component: Api2 Relates to Mage_Api2 Component: Catalog Relates to Mage_Catalog Component: Core Relates to Mage_Core Component: Dataflow Relates to Mage_Dataflow Component: lib/Zend Component: lib/* Relates to lib/* labels Apr 20, 2022
@MarcinNowakWebdeveloper MarcinNowakWebdeveloper force-pushed the pass_delimiter_char_to_preg_quote branch from 5bf2aa9 to 3869cc4 Compare April 20, 2022 13:52
@Sdfendor Sdfendor mentioned this pull request Apr 20, 2022
Closed
@tmotyl
Pass delimiter char to preg_quote
9c980b1 
The most common used delimiters in PHP are /@#~,
which are not escaped by default
(by default preg_quote escapes .\+*?[^]$(){}=!<>|:-).
@tmotyl tmotyl force-pushed the pass_delimiter_char_to_preg_quote branch from 3869cc4 to 9c980b1 Compare April 28, 2022 13:31
@tmotyl
Copy link
Contributor

tmotyl commented Apr 28, 2022

rebased

@fballiano fballiano merged commit fb65022 into OpenMage:1.9.4.x Jun 9, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Jun 9, 2022

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  5 ✔️ ±0  2 💤 ±0  0 ❌ ±0 

Results for commit fb65022. ± Comparison against base commit c85fdef.

@sreichel sreichel mentioned this pull request Dec 6, 2022
Closed
@sreichel
Copy link
Contributor

sreichel commented Dec 22, 2022 •
edited
Loading

Change made to lib/Zend/Db/Statement.php does nothing?

This files is overridden by app/code/core/Zend/Db/Statement.php (that should be reviewed at all)

@sreichel sreichel mentioned this pull request Dec 22, 2022
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fballiano fballiano fballiano approved these changes

@colinmollenhour colinmollenhour colinmollenhour approved these changes

@sreichel sreichel Awaiting requested review from sreichel

Assignees
No one assigned
Labels
Component: Api2 Relates to Mage_Api2 Component: Catalog Relates to Mage_Catalog Component: Core Relates to Mage_Core Component: Dataflow Relates to Mage_Dataflow Component: lib/* Relates to lib/*
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MarcinNowakWebdeveloper @tmotyl @sreichel @colinmollenhour @fballiano