Skip to content

Commit

Permalink
Merge branch '7.1' into 7.2
Browse files Browse the repository at this point in the history
* 7.1: (27 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
  Remove outdated guard from security xsd schema
  Bump Symfony version to 7.1.11
  Update VERSION for 7.1.10
  Update CHANGELOG for 7.1.10
  Bump Symfony version to 6.4.18
  Update VERSION for 6.4.17
  ...
  • Loading branch information
xabbuh committed Jan 7, 2025
2 parents 6150b89 + f4d1fd1 commit 959a74d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 27 deletions.
2 changes: 2 additions & 0 deletions DebugClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Prophecy\ProphecySubjectInterface;
use ProxyManager\Proxy\ProxyInterface;
use Symfony\Component\DependencyInjection\Argument\LazyClosure;
use Symfony\Component\ErrorHandler\Internal\TentativeTypes;
use Symfony\Component\VarExporter\LazyObjectInterface;

Expand Down Expand Up @@ -263,6 +264,7 @@ public static function checkClasses(): bool
&& !is_subclass_of($symbols[$i], LegacyProxy::class)
&& !is_subclass_of($symbols[$i], MockInterface::class)
&& !is_subclass_of($symbols[$i], IMock::class)
&& !(is_subclass_of($symbols[$i], LazyClosure::class) && str_contains($symbols[$i], "@anonymous\0"))
) {
$loader->checkClass($symbols[$i]);
}
Expand Down
6 changes: 3 additions & 3 deletions Resources/assets/css/exception.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
--page-background: #36393e;
--color-text: #e0e0e0;
--color-muted: #777;
--color-error: #d43934;
--color-error: #f76864;
--tab-background: #404040;
--tab-border-color: #737373;
--tab-active-border-color: #171717;
Expand All @@ -80,7 +80,7 @@
--metric-unit-color: #999;
--metric-label-background: #777;
--metric-label-color: #e0e0e0;
--trace-selected-background: #71663acc;
--trace-selected-background: #5d5227cc;
--table-border: #444;
--table-background: #333;
--table-header: #555;
Expand All @@ -92,7 +92,7 @@
--background-error: #b0413e;
--highlight-comment: #dedede;
--highlight-default: var(--base-6);
--highlight-keyword: #ff413c;
--highlight-keyword: #de8986;
--highlight-string: #70a6fd;
--base-0: #2e3136;
--base-1: #444;
Expand Down
30 changes: 6 additions & 24 deletions Resources/assets/js/exception.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,17 @@
}

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

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

var toggle = e.target || e.srcElement;
e.preventDefault();

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

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

/* Prevents from disallowing clicks on links inside toggles */
var toggleLinks = toggles[i].querySelectorAll('a');
for (var j = 0; j < toggleLinks.length; j++) {
addEventListener(toggleLinks[j], 'click', function(e) {
e.stopPropagation();
});
}

/* Prevents from disallowing clicks on "copy to clipboard" elements inside toggles */
var copyToClipboardElements = toggles[i].querySelectorAll('span[data-clipboard-text]');
for (var k = 0; k < copyToClipboardElements.length; k++) {
addEventListener(copyToClipboardElements[k], 'click', function(e) {
e.stopPropagation();
});
}

toggles[i].setAttribute('data-processed', 'true');
}
})();
Expand Down

0 comments on commit 959a74d

Please sign in to comment.