[WebProfilerBundle] Fix regexp #14217
Closed
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
|
@romqin thanks a lot for fixing this annoying issue! |
|
👍 indeed I wonder how to make it work with absolute URL ? |
|
@aitboudad what if I add this : + var path = url.substr({{ app.request.basePath|length }});
- if (url.substr(0, 1) === '/' && !url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
+ if (path.substr(0, 1) === '/' && !path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { |
- var path = url.substr({{ app.request.basePath|length }});
+ var path = url.replace('{{ app.request.schemeAndHttpHost }}', ''); |
|
Or this, but maybe it's overkill : var path = url;
if (url.substr(0, 1) === '/') {
if (0 === url.indexOf('{{ app.request.getBasePath }}')) {
path = url.substr({{ app.request.basePath|length }});
}
}
else if (0 === url.indexOf('{{ app.request.getSchemeAndHttpHost() ~ app.request.getBasePath }}')) {
path = url.substr({{ (app.request.getSchemeAndHttpHost() ~ app.request.basePath)|length }});
}
if (!path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { |
|
look good but I'd prefer to use var path = (url.substr(0, 1) === '/') ? url.replace('{{ app.request.basePath }}', ''):url.replace('{{ app.request.schemeAndHttpHost ~ app.request.basePath }}', '');
if (path.substr(0, 1) === '/' && !path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { |
|
👍 |
|
@aitboudad the issue with |
|
@stof no it will replace only the first occurrence. |
|
@aitboudad but what if the path is not found at the beginning, but is found later in the string ? |
|
@stof got it - ? url.replace('{{ app.request.basePath }}', '')
- : url.replace('{{ app.request.schemeAndHttpHost ~ app.request.basePath }}', '');
+ ? url.replace(/^({{ app.request.basePath|e('js') }})/, '')
+ : url.replace(/^({{ (app.request.schemeAndHttpHost ~ app.request.basePath)|e('js') }})/, '');is that ok ? |
|
@aitboudad no. you need to escape the path for a usage into a regex (especially given that |
|
@romqin this looks like the right solution (except the escaping needed to output the value as a JS string) |
|
Like this ? var path = url;
if (url.substr(0, 1) === '/') {
if (0 === url.indexOf('{{ app.request.basePath|e('js') }}')) {
path = url.substr({{ app.request.basePath|length }});
}
}
else if (0 === url.indexOf('{{ (app.request.schemeAndHttpHost ~ app.request.basePath)|e('js') }}')) {
path = url.substr({{ (app.request.schemeAndHttpHost ~ app.request.basePath)|length }});
}
if (!path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { |
|
@romqin now it work for all url, you need check if (path.substr(0, 1) === '/' && !path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { |
|
Would be great to have this fix in 2.7 beta1 |
|
Thank you @romqin. |
fabpot
added a commit
that referenced
this pull request
May 16, 2015
This PR was squashed before being merged into the 2.6 branch (closes #14217). Discussion ---------- [WebProfilerBundle] Fix regexp | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12122 | License | MIT | Doc PR | Old PR #12124 Commits ------- 091b37e [WebProfilerBundle] Fix regexp
|
@fabpot this PR broke Silex-WebProfiler ~2.0@dev, see silexphp/Silex-WebProfiler#64 |
|
We should not use the |
fabpot
added a commit
that referenced
this pull request
May 29, 2015
…tes (stof) This PR was merged into the 2.6 branch. Discussion ---------- Avoid using the app global variable in the profiler templates | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | small one for people overwriting the WebDebugToolbarListener methods | Deprecations? | no | Tests pass? | yes | Fixed tickets | silexphp/Silex-WebProfiler#64 | License | MIT | Doc PR | n/a #14217 introduced a usage of the ``app`` global variables in profiler templates, while we previously removed all such usages to avoid the dependency on TwigBundle in these templates. This keeps them usable outside the fullstack framework (for instance in Silex). I had to do a small BC break to be able to pass the request in the place where we were not yet injecting the Request in the template. Commits ------- 415c79e Avoid using the app global variable in the profiler templates
ostrolucky
pushed a commit
to ostrolucky/symfony
that referenced
this pull request
Mar 25, 2018
This PR was squashed before being merged into the 2.6 branch (closes symfony#14217). Discussion ---------- [WebProfilerBundle] Fix regexp | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#12122 | License | MIT | Doc PR | Old PR symfony#12124 Commits ------- 091b37e [WebProfilerBundle] Fix regexp
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.
Old PR #12124