Skip to content

Commit 623d688

Browse files
mamazumamazu
committed
Fixing some of the tests
1 parent f76a265 commit 623d688

File tree

7 files changed

+12
-17
lines changed

7 files changed

+12
-17
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8282
if ($this->fileLinkFormatter) {
8383
$container = fn () => $this->getContainerBuilder($this->getApplication()->getKernel());
8484
}
85-
if ($input->getOption('show-controllers')){
85+
if ($input->getOption('show-controllers')) {
8686
trigger_deprecation('symfony/console', '7.3', 'Using --show-controllers is deprecated. They are shown by default now.');
8787
}
8888

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTestCase.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ private static function getContainerBuilderDescriptionTestData(array $objects):
307307
'public' => ['show_hidden' => false],
308308
'tag1' => ['show_hidden' => true, 'tag' => 'tag1'],
309309
'tags' => ['group_by' => 'tags', 'show_hidden' => true],
310-
'arguments' => ['show_hidden' => false],
311310
];
312311

313312
$data = [];

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
1313

14-
use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
1514
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum;
1615
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Suit;
1716
use Symfony\Component\DependencyInjection\Alias;
@@ -48,7 +47,7 @@ public static function getRouteCollections()
4847
$routesWithGenericSchema = new RouteCollection();
4948
$routesWithGenericSchema->add('some_route_with_host', new RouteStub(
5049
'/some-route',
51-
['_controller' => [RedirectController::class, 'redirectAction']],
50+
['_controller' => 'strpos'],
5251
[],
5352
[],
5453
'symfony.com',

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_schema.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"method": "ANY",
99
"class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\RouteStub",
1010
"defaults": {
11-
"_controller": [
12-
"Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController",
13-
"redirectAction"
14-
]
11+
"_controller": "strpos"
1512
},
1613
"requirements": "NO CUSTOM",
1714
"options": {

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_schema.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ some_route_with_host
88
- Scheme: ANY
99
- Method: ANY
1010
- Class: Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub
11-
- Defaults:
12-
- `_controller`: array (0 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController',1 => 'redirectAction',)
11+
- Defaults:
12+
- `_controller`: strpos
1313
- Requirements: NO CUSTOM
14-
- Options:
14+
- Options:
1515
- `compiler_class`: Symfony\Component\Routing\RouteCompiler

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_schema.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
---------------------- -------- ------------- ------------- --------------------------------------------------------------------------------
2-
 Name   Method   Host   Path   Controller 
3-
---------------------- -------- ------------- ------------- --------------------------------------------------------------------------------
4-
some_route_with_host ANY symfony.com /some-route ]8;;myeditor://open?file=/home/mamazu/packages/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php&line=53\Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction()]8;;\
5-
---------------------- -------- ------------- ------------- --------------------------------------------------------------------------------
1+
---------------------- -------- ------------- ------------- ------------
2+
 Name   Method   Host   Path   Controller 
3+
---------------------- -------- ------------- ------------- ------------
4+
some_route_with_host ANY symfony.com /some-route ]8;;myeditor://open?file=&line=0\strpos()]8;;\
5+
---------------------- -------- ------------- ------------- ------------
66

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_with_generic_schema.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<path regex="#PATH_REGEX#">/some-route</path>
55
<host regex="#HOST_REGEX#">symfony.com</host>
66
<defaults>
7-
<default key="_controller">array (0 =&gt; 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController',1 =&gt; 'redirectAction',)</default>
7+
<default key="_controller">strpos</default>
88
</defaults>
99
<options>
1010
<option key="compiler_class">Symfony\Component\Routing\RouteCompiler</option>

0 commit comments

Comments
 (0)