Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 49d00f66d544 · 2023-12-10T00:47:47.000+01:00
* 7.0:
  fix tests
  [FrameworkBundle] Fix profiling commands without router
  [FrameworkBundle] Fix profiling command in web context
  [WebProfilerBundle] Fix Copy as Curl
  [SecurityBundle] Fix redeclaration of `InternalSecurity` class when opcache preload is active
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/ConsoleProfilerListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/ConsoleProfilerListener.php
@@ -42,7 +42,8 @@ public function __construct(
         private readonly Profiler $profiler,
         private readonly RequestStack $requestStack,
         private readonly Stopwatch $stopwatch,
-        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly bool $cliMode,
+        private readonly ?UrlGeneratorInterface $urlGenerator = null,
     ) {
         $this->profiles = new \SplObjectStorage();
         $this->parents = new \SplObjectStorage();
@@ -59,6 +60,10 @@ public static function getSubscribedEvents(): array
 
     public function initialize(ConsoleCommandEvent $event): void
     {
+        if (!$this->cliMode) {
+            return;
+        }
+
         $input = $event->getInput();
         if (!$input->hasOption('profile') || !$input->getOption('profile')) {
             $this->profiler->disable();
@@ -78,12 +83,16 @@ public function initialize(ConsoleCommandEvent $event): void
 
     public function catch(ConsoleErrorEvent $event): void
     {
+        if (!$this->cliMode) {
+            return;
+        }
+
         $this->error = $event->getError();
     }
 
     public function profile(ConsoleTerminateEvent $event): void
     {
-        if (!$this->profiler->isEnabled()) {
+        if (!$this->cliMode || !$this->profiler->isEnabled()) {
             return;
         }
 
@@ -131,12 +140,14 @@ public function profile(ConsoleTerminateEvent $event): void
             $p = $this->profiles[$r];
             $this->profiler->saveProfile($p);
 
-            $token = $p->getToken();
-            $output?->writeln(sprintf(
-                'See profile <href=%s>%s</>',
-                $this->urlGenerator->generate('_profiler', ['token' => $token], UrlGeneratorInterface::ABSOLUTE_URL),
-                $token
-            ));
+            if ($this->urlGenerator && $output) {
+                $token = $p->getToken();
+                $output->writeln(sprintf(
+                    'See profile <href=%s>%s</>',
+                    $this->urlGenerator->generate('_profiler', ['token' => $token], UrlGeneratorInterface::ABSOLUTE_URL),
+                    $token
+                ));
+            }
         }
 
         $this->profiles = new \SplObjectStorage();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php
@@ -43,7 +43,8 @@
                 service('profiler'),
                 service('.virtual_request_stack'),
                 service('debug.stopwatch'),
-                service('router'),
+                param('kernel.runtime_mode.cli'),
+                service('router')->nullOnInvalid(),
             ])
             ->tag('kernel.event_subscriber')
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -13,6 +13,7 @@
         constructor() {
             this.#createTabs();
             this.#createToggles();
+            this.#createCopyToClipboard();
             this.#convertDateTimesToUserTimezone();
         }
 
@@ -161,18 +162,41 @@
                     });
                 });
 
-                /* Prevents from disallowing clicks on "copy to clipboard" elements inside toggles */
-                const copyToClipboardElements = toggle.querySelectorAll('span[data-clipboard-text]');
-                copyToClipboardElements.forEach((copyToClipboardElement) => {
-                    copyToClipboardElement.addEventListener('click', (e) => {
-                        e.stopPropagation();
-                    });
-                });
-
                 toggle.setAttribute('data-processed', 'true');
             });
         }
 
+        #createCopyToClipboard() {
+            if (!navigator.clipboard) {
+                return;
+            }
+
+            const copyToClipboardElements = document.querySelectorAll('[data-clipboard-text]');
+
+            copyToClipboardElements.forEach((copyToClipboardElement) => {
+                copyToClipboardElement.classList.remove('hidden');
+
+                copyToClipboardElement.addEventListener('click', (e) => {
+                    /* Prevents from disallowing clicks on "copy to clipboard" elements inside toggles */
+                    e.stopPropagation();
+
+                    navigator.clipboard.writeText(copyToClipboardElement.getAttribute('data-clipboard-text'));
+
+                    let oldContent = copyToClipboardElement.textContent;
+
+                    copyToClipboardElement.textContent = `✅ Copied!`;
+                    copyToClipboardElement.disabled = true;
+                    copyToClipboardElement.classList.add('status-success');
+
+                    setTimeout(() => {
+                        copyToClipboardElement.textContent = oldContent;
+                        copyToClipboardElement.disabled = false;
+                        copyToClipboardElement.classList.remove('status-success');
+                    }, 7000);
+                });
+            });
+        }
+
         #convertDateTimesToUserTimezone() {
             const userTimezoneName = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -50,33 +50,6 @@
                 };
             }
 
-            if (navigator.clipboard) {
-                document.addEventListener('readystatechange', () => {
-                    if (document.readyState !== 'complete') {
-                        return;
-                    }
-
-                    document.querySelectorAll('[data-clipboard-text]').forEach(function (element) {
-                        removeClass(element, 'hidden');
-                        element.addEventListener('click', function () {
-                            navigator.clipboard.writeText(element.getAttribute('data-clipboard-text'));
-
-                            if (element.classList.contains("label")) {
-                                let oldContent = element.textContent;
-
-                                element.textContent = "✅ Copied!";
-                                element.classList.add("status-success");
-
-                                setTimeout(() => {
-                                    element.textContent = oldContent;
-                                    element.classList.remove("status-success");
-                                }, 7000);
-                            }
-                        });
-                    });
-                });
-            }
-
             var request = function(url, onSuccess, onError, payload, options, tries) {
                 var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
                 options = options || {};
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\PropertyAccess\Exception\InvalidTypeException;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
