Merge branch '7.3' into 7.4

* 7.3: [WebProfilerBundle] Upgrade mermaid to v11.12.0 Simplify ConsoleFormatterTest [Security] Fix preload warning in `AuthorizationChecker`

Author: fabpot

src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php

@@ -11,51 +11,17 @@
 
 namespace Symfony\Bridge\Monolog\Tests\Formatter;
 
-use Monolog\Logger;
-use Monolog\LogRecord;
-use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
 use Symfony\Bridge\Monolog\Tests\RecordFactory;
 
 class ConsoleFormatterTest extends TestCase
 {
- #[DataProvider('providerFormatTests')]
- public function testFormat(array|LogRecord $record, $expectedMessage)
+ public function testFormat()
  {
+ $record = RecordFactory::create(datetime: new \DateTimeImmutable('2013-01-13 12:34:56 Europe/Berlin'));
  $formatter = new ConsoleFormatter();
- self::assertSame($expectedMessage, $formatter->format($record));
- }
-
- public static function providerFormatTests(): array
- {
- $currentDateTime = new \DateTimeImmutable();
-
- $tests = [
- 'record with DateTime object in datetime field' => [
- 'record' => RecordFactory::create(datetime: $currentDateTime),
- 'expectedMessage' => \sprintf(
- "%s <fg=cyan>WARNING </> <comment>[test]</> test\n",
- $currentDateTime->format(ConsoleFormatter::SIMPLE_DATE)
- ),
- ],
- ];
-
- if (Logger::API < 3) {
- $tests['record with string in datetime field'] = [
- 'record' => [
- 'message' => 'test',
- 'context' => [],
- 'level' => Level::Warning,
- 'level_name' => Logger::getLevelName(Level::Warning),
- 'channel' => 'test',
- 'datetime' => '2019-01-01T00:42:00+00:00',
- 'extra' => [],
- ],
- 'expectedMessage' => "2019-01-01T00:42:00+00:00 <fg=cyan>WARNING </> <comment>[test]</> test\n",
- ];
- }
 
- return $tests;
+ self::assertSame("12:34:56 <fg=cyan>WARNING </> <comment>[test]</> test\n", $formatter->format($record));
  }
 }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Script/Mermaid/Makefile

@@ -1,31 +1,32 @@
 define diagram-orchestration
-import { diagram as flowchartV2 } from '../diagrams/flowchart/flowDiagram-v2.js';
+import flowchartV2 from '../diagrams/flowchart/flowDetector-v2.js';
 import { registerDiagram } from './diagramAPI.js';
 
 let hasLoadedDiagrams = false;
-export const addDiagrams = () => {
+export const addDiagrams = async () => {
  if (hasLoadedDiagrams) {
  return;
  }
  hasLoadedDiagrams = true;
- registerDiagram('flowchart-v2', flowchartV2, () => true);
+ const {id, diagram} = await flowchartV2.loader();
+ registerDiagram(id, diagram, () => true);
 };
 endef
 
-override tag := v10.9.0
+override tag := 11.12.0
 
 .PHONY: mermaid-flowchart-v2.min.js
 mermaid-flowchart-v2.min.js: | repo-$(tag)/node_modules
 $(file >repo-$(tag)/packages/mermaid/src/diagram-api/diagram-orchestration.ts,$(diagram-orchestration))
-pnpm -C repo-$(tag) run build
-cp repo-$(tag)/packages/mermaid/dist/mermaid.min.js $@
+pnpm -C repo-$(tag) run build:mermaid
+cp repo-$(tag)/packages/tiny/dist/mermaid.tiny.js $@
 
 repo-$(tag)/node_modules: | repo-$(tag)
 pnpm -C $(@D) install --ignore-scripts
 
 .SECONDARY: repo-$(tag)
 repo-$(tag):
-curl -fL https://github.com/mermaid-js/mermaid/archive/refs/tags/$(tag).tar.gz | tar -xz --strip-components=1 --one-top-level=$@
+curl -fL https://github.com/mermaid-js/mermaid/archive/refs/tags/mermaid@$(tag).tar.gz | tar -xz --strip-components=1 --one-top-level=$@
 
 .PHONY: clean
 clean:

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Script/Mermaid/mermaid-flowchart-v2.min.js

@@ -17,6 +17,10 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
+// Help opcache.preload discover always-needed symbols
+class_exists(AbstractToken::class);
+class_exists(OfflineTokenInterface::class);
+
 /**
  * AuthorizationChecker is the main authorization point of the Security component.
  *