[Finder] Glob wildcard while using double-star without ending slash #22239
Conversation
| $car = $strictLeadingDot ? '/(?:(?=[^\.])[^/]++/)*' : '/(?:[^/]++/)*'; | ||
| $i += 3; | ||
| } elseif (isset($glob[$i + 2]) && '**' === $glob[$i + 1].$glob[$i + 2]) { | ||
| $car = '/.*'; |
There was a problem hiding this comment.
This should match only at the end of the line - not the case right now.
This should account for hidden "dot-dirs", as done by the regexp L65.
There was a problem hiding this comment.
Agree with the hidden "dot-dirs". But should it actually match only at the end of the line? I think it'd be better if it can actually match inside the line, don't you think?
There was a problem hiding this comment.
it already matches inside the line: that's the first case of the "if"
see https://github.com/symfony/symfony/pull/22239/files#r109962164
d5b703b to
94fe26a
Compare
|
@nicolas-grekas updated the PR and added this comment. |
| $car = $strictLeadingDot ? '/(?:(?=[^\.])[^/]++/)*' : '/(?:[^/]++/)*'; | ||
| $i += 3; | ||
| } elseif (isset($glob[$i + 2]) && '**' === $glob[$i + 1].$glob[$i + 2]) { | ||
| $car = $strictLeadingDot ? '/(?=[^\.]).*' : '/.*'; |
There was a problem hiding this comment.
to me, the rx here should be the same as before, meaning the patch could have just one line:
if ($firstByte && $strictWildcardSlash && isset($glob[$i + 2]) && '**' === $glob[$i + 1].$glob[$i + 2] && (!isset($glob[$i + 3]) || '/' === $glob[$i + 3])) {
There was a problem hiding this comment.
It won't work because of the ending slash in the existing regex.
| $i += 3; | ||
| } elseif (isset($glob[$i + 2]) && '**' === $glob[$i + 1].$glob[$i + 2]) { | ||
| $car = $strictLeadingDot ? '/(?=[^\.]).*' : '/.*'; | ||
| $i += 2; |
There was a problem hiding this comment.
well, two: $i += 2 + isset($glob[$i + 3]);
|
@nicolas-grekas unfortunately your two-line change wasn't an option because of the |
| $car = $strictLeadingDot ? '/(?:(?=[^\.])[^/]++/)*' : '/(?:[^/]++/)*'; | ||
| $i += 3; | ||
| if ($firstByte && $strictWildcardSlash && isset($glob[$i + 2]) && '**' === $glob[$i + 1].$glob[$i + 2] && (!isset($glob[$i + 3]) || '/' === $glob[$i + 3])) { | ||
| $car = '[^/]++/'; |
There was a problem hiding this comment.
would that work?
$car = $strictLeadingDot ? '(?:/(?=[^\.])[^/]*+)+' : '(?:/[^/]*+)+'
There was a problem hiding this comment.
Nup, it's not. I tried to make it working with a one-liner like that but all my attempts were either not matching "deep children" (level + 1) or matching the folder without its slash (like foo for foo/**)
There was a problem hiding this comment.
I think this $car creation is also more readable.
|
The built errored on Travis, could someone with super-powers could restart it? :) |
|
Amend your commit and then force push (with the branch name) and should restart Travis 👍 |
9c63d42 to
2c3ef42
Compare
|
All green 👍 |
|
Can you add a note in the CHANGELOG? |
|
@fabpot don't you think that @nicolas-grekas' one already for 3.3.0 is enough? |
|
Thank you @sroze. |
This PR allows to use the
Glob::toRegexmethod to dump a glob that will match "everything after" while using the double-star without leading slash./foo/**will therefore match/foo/aor/foo/a/b/cor even/foo/a/b/c/d.e.The use-case for this change is an application allowing its users to match a list of files/folders from such glob pattern.
Happy to add a line in the CHANGELOG and documentation if you feel that would make sense.