TemplateProcessor cloneBlock wrongly clones images #1763
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… part after the #number and fixing Process call to array instead of string
3 tasks
Amerlander
reviewed
Mar 12, 2020
| @@ -1085,7 +1085,7 @@ protected function indexClonedVariables($count, $xmlBlock) | |||
| { | |||
| $results = array(); | |||
| for ($i = 1; $i <= $count; $i++) { | |||
| $results[] = preg_replace('/\$\{(.*?)\}/', '\${\\1#' . $i . '}', $xmlBlock); | |||
| $results[] = preg_replace('/\$\{([^:]*?)(:.*?)?\}/', '\${\1#' . $i . '\2}', $xmlBlock); | |||
There was a problem hiding this comment.
I was just wondering why you're only using one \ compared to the old regex and to my changes in #1829:
$results[] = preg_replace('/\$\{(.*?)(:([^}])*)?\}/', '\${\\1#' . $i . '\\2}', $xmlBlock);
I'm not that much into this regex at the moment, so I don't know how they differ.
btw, this pr will also fix #1624
There was a problem hiding this comment.
@Amerlander that's because in a single quoted string you don't have to double the
https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single
There was a problem hiding this comment.
Thank you for explanation and for the merge! :)
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I was met with the issue reported in #1750 and fixed it.
The problem was that the regexp to clone and add number did include the size attributes in the tag before the number. So I added a second capture group so that image attributes are properly placed after the tag with it's added number.
I also fixed the call to Process to use an array as it otherwise cause hundred of errors as it now expects an array instead of a string.
All tests are passed and code coverage is unchanged.
Fixes #1750 #1624
Checklist:
composer run-script check --timeout=0and no errors were reported