refactor: update MermaidDumper to accept direction as a parameter in dump method

damienfern · damienfern · commit 96d1fdaeae5d · 2025-07-18T18:01:05.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SecurityRoleHierarchyDumpCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SecurityRoleHierarchyDumpCommand.php
@@ -76,8 +76,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return Command::FAILURE;
         }
 
-        $dumper = new MermaidDumper(MermaidDirectionEnum::from($direction));
-        $mermaidOutput = $dumper->dump($this->roleHierarchy);
+        $dumper = new MermaidDumper();
+        $mermaidOutput = $dumper->dump($this->roleHierarchy, MermaidDirectionEnum::from($direction));
 
         $output->writeln($mermaidOutput);
 
diff --git a/src/Symfony/Component/Security/Core/Dumper/MermaidDumper.php b/src/Symfony/Component/Security/Core/Dumper/MermaidDumper.php
@@ -21,25 +21,21 @@
  */
 class MermaidDumper
 {
-    public function __construct(
-        private readonly MermaidDirectionEnum $direction = MermaidDirectionEnum::TOP_TO_BOTTOM,
-    ) {
-    }
-
     /**
      * Dumps the role hierarchy as a Mermaid flowchart.
      *
      * @param RoleHierarchyInterface $roleHierarchy The role hierarchy to dump
+     * @param MermaidDirectionEnum   $direction     The direction of the flowchart
      */
-    public function dump(RoleHierarchyInterface $roleHierarchy): string
+    public function dump(RoleHierarchyInterface $roleHierarchy, MermaidDirectionEnum $direction = MermaidDirectionEnum::TOP_TO_BOTTOM): string
     {
         $hierarchy = $this->extractHierarchy($roleHierarchy);
 
         if (!$hierarchy) {
-            return "graph {$this->direction->value}\n    classDef default fill:#e1f5fe;";
+            return "graph {$direction->value}\n    classDef default fill:#e1f5fe;";
         }
 
-        $output = ["graph {$this->direction->value}"];
+        $output = ["graph {$direction->value}"];
         $allRoles = $this->getAllRoles($hierarchy);
 
         foreach ($allRoles as $role) {
diff --git a/src/Symfony/Component/Security/Core/Tests/Dumper/MermaidDumperTest.php b/src/Symfony/Component/Security/Core/Tests/Dumper/MermaidDumperTest.php
@@ -45,8 +45,8 @@ public function testDumpWithDirection()
         ];
 
         $roleHierarchy = new RoleHierarchy($hierarchy);
-        $dumper = new MermaidDumper(MermaidDirectionEnum::LEFT_TO_RIGHT);
-        $output = $dumper->dump($roleHierarchy);
+        $dumper = new MermaidDumper();
+        $output = $dumper->dump($roleHierarchy, MermaidDirectionEnum::LEFT_TO_RIGHT);
 
         $this->assertStringContainsString('graph LR', $output);
     }
@@ -92,7 +92,8 @@ public function testInvalidDirection()
     {
         $this->expectException(\TypeError::class);
 
-        new MermaidDumper('INVALID');
+        $dumper = new MermaidDumper();
+        $dumper->dump(new RoleHierarchy([]), 'INVALID');
     }
 
     /**
@@ -101,7 +102,8 @@ public function testInvalidDirection()
     public function testValidDirections(MermaidDirectionEnum $direction)
     {
         $this->expectNotToPerformAssertions();
-        new MermaidDumper($direction);
+        $dumper = new MermaidDumper();
+        $dumper->dump(new RoleHierarchy([]), $direction);
     }
 
     public static function dataProviderValidDirection()

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`76`	`76`	`return Command::FAILURE;`
`77`	`77`	`}`
`78`	`78`
`79`		`- $dumper = new MermaidDumper(MermaidDirectionEnum::from($direction));`
`80`		`- $mermaidOutput = $dumper->dump($this->roleHierarchy);`
	`79`	`+ $dumper = new MermaidDumper();`
	`80`	`+ $mermaidOutput = $dumper->dump($this->roleHierarchy, MermaidDirectionEnum::from($direction));`
`81`	`81`
`82`	`82`	`$output->writeln($mermaidOutput);`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public function testDumpWithDirection()`
`45`	`45`	`];`
`46`	`46`
`47`	`47`	`$roleHierarchy = new RoleHierarchy($hierarchy);`
`48`		`- $dumper = new MermaidDumper(MermaidDirectionEnum::LEFT_TO_RIGHT);`
`49`		`- $output = $dumper->dump($roleHierarchy);`
	`48`	`+ $dumper = new MermaidDumper();`
	`49`	`+ $output = $dumper->dump($roleHierarchy, MermaidDirectionEnum::LEFT_TO_RIGHT);`
`50`	`50`
`51`	`51`	`$this->assertStringContainsString('graph LR', $output);`
`52`	`52`	`}`
`@@ -92,7 +92,8 @@ public function testInvalidDirection()`
`92`	`92`	`{`
`93`	`93`	`$this->expectException(\TypeError::class);`
`94`	`94`
`95`		`- new MermaidDumper('INVALID');`
	`95`	`+ $dumper = new MermaidDumper();`
	`96`	`+ $dumper->dump(new RoleHierarchy([]), 'INVALID');`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`/**`
`@@ -101,7 +102,8 @@ public function testInvalidDirection()`
`101`	`102`	`public function testValidDirections(MermaidDirectionEnum $direction)`
`102`	`103`	`{`
`103`	`104`	`$this->expectNotToPerformAssertions();`
`104`		`- new MermaidDumper($direction);`
	`105`	`+ $dumper = new MermaidDumper();`
	`106`	`+ $dumper->dump(new RoleHierarchy([]), $direction);`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`public static function dataProviderValidDirection()`