8000 Merge branch '6.4' into 7.1 · symfony/error-handler@f4d1fd1 · GitHub
[go: up one dir, main page]
Skip to content

Commit f4d1fd1

Browse files
xabbuhxabbuh
committed
Merge branch '6.4' into 7.1
* 6.4: (23 commits) add translations for the Slug constraint [Messenger] Fix `TransportMessageIdStamp` not always added [DoctrineBridge] Fix compatibility to Doctrine persistence 2.5 in Doctrine Bridge 6.4 to avoid Projects stuck on 6.3 [PropertyInfo] Fix add missing composer conflict [ErrorHandler] Don't trigger "internal" deprecations for anonymous LazyClosure instances [VarDumper] Fix displaying closure's "this" from anonymous classes [Doctrine][Messenger] Prevents multiple TransportMessageIdStamp being stored in envelope [HttpKernel] Don't override existing LoggerInterface autowiring alias in LoggerPass reject inline notations followed by invalid content [Security] Fix triggering session tracking from ContextListener [AssetMapper] add leading slash to public prefix fix: modify Exception message parameter order [Yaml] Fix parsing of unquoted strings in Parser::lexUnquotedString() to ignore spaces Update exception.css Bump Symfony version to 6.4.18 Update VERSION for 6.4.17 Update CONTRIBUTORS for 6.4.17 Update CHANGELOG for 6.4.17 Fix exception thrown by YamlEncoder [AssetMapper] Fix JavaScript compiler create self-referencing imports ...
2 parents 12cada0 + e8d3b5b commit f4d1fd1

File tree

3 files changed

+11
-27
lines changed

3 files changed

+11
-27
lines changed

‎DebugClassLoader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use PHPUnit\Framework\MockObject\MockObject;
2121
use Prophecy\Prophecy\ProphecySubjectInterface;
2222
use ProxyManager\Proxy\ProxyInterface;
23+
use Symfony\Component\DependencyInjection\Argument\LazyClosure;
2324
use Symfony\Component\ErrorHandler\Internal\TentativeTypes;
2425
use Symfony\Component\VarExporter\LazyObjectInterface;
2526

@@ -263,6 +264,7 @@ public static function checkClasses(): bool
263264
&& !is_subclass_of($symbols[$i], LegacyProxy::class)
264265
&& !is_subclass_of($symbols[$i], MockInterface::class)
265266
&& !is_subclass_of($symbols[$i], IMock::class)
267+
&& !(is_subclass_of($symbols[$i], LazyClosure::class) && str_contains($symbols[$i], "@anonymous\0"))
266268
) {
267269
$loader->checkClass($symbols[$i]);
268270
}

‎Resources/assets/css/exception.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
--page-background: #36393e;
5858
--color-text: #e0e0e0;
5959
--color-muted: #777;
60-
--color-error: #d43934;
60+
--color-error: #f76864;
6161
--tab-background: #404040;
6262
--tab-border-color: #737373;
6363
--tab-active-border-color: #171717;
@@ -80,7 +80,7 @@
8080
--metric-unit-color: #999;
8181
--metric-label-background: #777;
8282
--metric-label-color: #e0e0e0;
83-
--trace-selected-background: #71663acc;
83+
--trace-selected-background: #5d5227cc;
8484
--table-border: #444;
8585
--table-background: #333;
8686
--table-header: #555;
@@ -92,7 +92,7 @@
9292
--background-error: #b0413e;
9393
--highlight-comment: #dedede;
9494
--highlight-default: var(--base-6);
95-
--highlight-keyword: #ff413c;
95+
--highlight-keyword: #de8986;
9696
--highlight-string: #70a6fd;
9797
--base-0: #2e3136;
9898
--base-1: #444;

‎Resources/assets/js/exception.js

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,17 @@
145145
}
146146

147147
addEventListener(toggles[i], 'click', function(e) {
148-
e.preventDefault();
148+
var toggle = e.currentTarget;
149149

150-
if ('' !== window.getSelection().toString()) {
151-
/* Don't do anything on text selection */
150+
if (e.target.closest('a, span[data-clipboard-text], .sf-toggle') !== toggle) {
152151
return;
153152
}
154153

155-
var toggle = e.target || e.srcElement;
154+
e.preventDefault();
156155

157-
/* needed because when the toggle contains HTML contents, user can click */
158-
/* on any of those elements instead of their parent '.sf-toggle' element */
159-
while (!hasClass(toggle, 'sf-toggle')) {
160-
toggle = toggle.parentNode;
156+
if ('' !== window.getSelection().toString()) {
157+
/* Don't do anything on text selection */
158+
return;
161159
}
162160

163161
var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
@@ -182,22 +180,6 @@
182180
toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
183181
});
184182

185-
/* Prevents from disallowing clicks on links inside toggles */
186-
var toggleLinks = toggles[i].querySelectorAll('a');
187-
for (var j = 0; j < toggleLinks.length; j++) {
188-
addEventListener(toggleLinks[j], 'click', function(e) {
189-
e.stopPropagation();
190-
});
191-
}
192-
193-
/* Prevents from disallowing clicks on "copy to clipboard" elements inside toggles */
194-
var copyToClipboardElements = toggles[i].querySelectorAll('span[data-clipboard-text]');
195-
for (var k = 0; k < copyToClipboardElements.length; k++) {
196-
addEventListener(copyToClipboardElements[k], 'click', function(e) {
197-
e.stopPropagation();
198-
});
199-
}
200-
201183
toggles[i].setAttribute('data-processed', 'true');
202184
}
203185
})();

0 commit comments

Comments
 (0)
0