Fixing comments from the code review and regenerating expected test output

mamazu · mamazu · commit d5d400c7eef9 · 2025-04-16T12:36:54.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -59,21 +59,21 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
         $showAliases = $options['show_aliases'] ?? false;
 
         $tableRows = [];
-        $shouldShowSchema = false;
+        $shouldShowScheme = false;
         $shouldShowHost = false;
         foreach ($routes->all() as $name => $route) {
             $controller = $route->getDefault('_controller');
 
-            $schema = $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY';
-            $shouldShowSchema = $shouldShowSchema || 'ANY' !== $schema;
+            $scheme = $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY';
+            $shouldShowScheme = $shouldShowScheme || 'ANY' !== $scheme;
 
             $host = '' !== $route->getHost() ? $route->getHost() : 'ANY';
             $shouldShowHost = $shouldShowHost || 'ANY' !== $host;
 
             $row = [
                 'Name' => $name,
                 'Methods' => $this->formatMethods($route->getMethods()),
-                'Schema' => $schema,
+                'Scheme' => $scheme,
                 'Host' => $host,
                 'Path' => $route->getPath(),
                 'Controller' => $controller ? $this->formatControllerLink($controller, $this->formatCallable($controller), $options['container'] ?? null) : '',
@@ -88,20 +88,16 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
 
         $tableHeaders = ['Name', 'Method'];
 
-        if ($shouldShowSchema) {
-            $tableHeaders[] = 'Schema';
+        if ($shouldShowScheme) {
+            $tableHeaders[] = 'Scheme';
         } else {
-            array_walk($tableRows, function (&$row) {
-                unset($row['Schema']);
-            });
+            array_walk($tableRows, function (&$row) { unset($row['Scheme']); });
         }
 
         if ($shouldShowHost) {
             $tableHeaders[] = 'Host';
         } else {
-            array_walk($tableRows, function (&$row) {
-                unset($row['Host']);
-            });
+            array_walk($tableRows, function (&$row) { unset($row['Host']); });
         }
 
         $tableHeaders = array_merge($tableHeaders, ['Path', 'Controller']);
@@ -616,10 +612,7 @@ private function formatMethods(array $methods): string
             $methods = ['ANY'];
         }
 
-        return implode('|', array_map(
-            fn (string $method): string => '<fg='.self::VERB_COLORS[$method].'>'.$method.'</>',
-            $methods
-        ));
+        return implode('|', array_map(fn (string $method): string => '<fg='.self::VERB_COLORS[$method].'>'.$method.'</>', $methods));
     }
 
     private function formatControllerLink(mixed $controller, string $anchorText, ?callable $getContainer = null): string
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -44,8 +44,8 @@ public static function getRouteCollections()
             ['https'],
         ));
 
-        $routesWithGenericSchema = new RouteCollection();
-        $routesWithGenericSchema->add('some_route_with_host', new RouteStub(
+        $routesWithGenericScheme = new RouteCollection();
+        $routesWithGenericScheme->add('some_route_with_host', new RouteStub(
             '/some-route',
             ['_controller' => 'strpos'],
             [],
@@ -58,7 +58,7 @@ public static function getRouteCollections()
             'empty_route_collection' => new RouteCollection(),
             'route_collection_1' => $collection1,
             'route_with_generic_host' => $routesWithGenericHost,
-            'route_with_generic_schema' => $routesWithGenericSchema,
+            'route_with_generic_scheme' => $routesWithGenericScheme,
         ];
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/empty_route_collection.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/empty_route_collection.json
@@ -1 +1,2 @@
-[]
+[]
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/empty_route_collection.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/empty_route_collection.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<routes/>
+<routes/>
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
@@ -36,4 +36,5 @@
         },
         "condition": "context.getMethod() in ['GET', 'HEAD', 'POST']"
     }
-}
+}
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt
@@ -1,5 +1,5 @@
  --------- ---------- ------------ ----------- --------------- ------------ 
- [32m Name    [39m [32m Method   [39m [32m Schema     [39m [32m Host      [39m [32m Path          [39m [32m Controller [39m 
+ [32m Name    [39m [32m Method   [39m [32m Scheme     [39m [32m Host      [39m [32m Path          [39m [32m Controller [39m 
  --------- ---------- ------------ ----------- --------------- ------------ 
   route_1   [34mGET[39m|[35mHEAD[39m   http|https   localhost   /hello/{name}               
   route_2   [33mPUT[39m|[32mPOST[39m   http|https   localhost   /name/add                   
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml
@@ -33,4 +33,5 @@
     </options>
     <condition>context.getMethod() in ['GET', 'HEAD', 'POST']</condition>
   </route>
-</routes>
+</routes>
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_2.txt
@@ -2,6 +2,6 @@
  [32m Name    [39m [32m Method   [39m [32m Scheme     [39m [32m Host      [39m [32m Path          [39m [32m Controller [39m 
  --------- ---------- ------------ ----------- --------------- ------------ 
   route_1   [34mGET[39m|[35mHEAD[39m   http|https   localhost   /hello/{name}               
-  route_3   ANY        http|https   localhost   /other/route                
+  route_3   [39mANY[39m        http|https   localhost   /other/route                
  --------- ---------- ------------ ----------- --------------- ------------ 
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_3.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_3.txt
@@ -1,6 +1,6 @@
- --------- ---------- ------------ ----------- ----------- 
- [32m Name    [39m [32m Method   [39m [32m Scheme     [39m [32m Host      [39m [32m Path      [39m 
- --------- ---------- ------------ ----------- ----------- 
-  route_2   [33mPUT[39m|[32mPOST[39m   http|https   localhost   /name/add  
- --------- ---------- ------------ ----------- ----------- 
+ --------- ---------- ------------ ----------- ----------- ------------ 
+ [32m Name    [39m [32m Method   [39m [32m Scheme     [39m [32m Host      [39m [32m Path      [39m [32m Controller [39m 
+ --------- ---------- ------------ ----------- ----------- ------------ 
+  route_2   [33mPUT[39m|[32mPOST[39m   http|https   localhost   /name/add               
+ --------- ---------- ------------ ----------- ----------- ------------ 
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_host.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_host.txt
@@ -1,5 +1,5 @@
  ------------ -------- -------- ------------- -------------- 
- [32m Name       [39m [32m Method [39m [32m Schema [39m [32m Path        [39m [32m Controller   [39m 
+ [32m Name       [39m [32m Method [39m [32m Scheme [39m [32m Path        [39m [32m Controller   [39m 
  ------------ -------- -------- ------------- -------------- 
   some_route   [39mANY[39m      https    /some-route   Controller()  
  ------------ -------- -------- ------------- -------------- 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_host.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_host.xml
@@ -10,4 +10,5 @@
       <option key="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
     </options>
   </route>
-</routes>
+</routes>
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.json
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.md
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.txt
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_scheme.xml

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,5 @@`
`36`	`36`	`},`
`37`	`37`	`"condition": "context.getMethod() in ['GET', 'HEAD', 'POST']"`
`38`	`38`	`}`
`39`		`-}`
	`39`	`+}`
	`40`	`+`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
  --------- ---------- ------------ ----------- --------------- ------------
 - [32m Name    [39m [32m Method   [39m [32m Schema     [39m [32m Host      [39m [32m Path          [39m [32m Controller [39m
 + [32m Name    [39m [32m Method   [39m [32m Scheme     [39m [32m Host      [39m [32m Path          [39m [32m Controller [39m
  --------- ---------- ------------ ----------- --------------- ------------
   route_1   [34mGET[39m|[35mHEAD[39m   http|https   localhost   /hello/{name}
   route_2   [33mPUT[39m|[32mPOST[39m   http|https   localhost   /name/add