Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1fc3311

Browse files
committed
[FrameworkBundle] Fixlint:container --resolve-env-vars
1 parent7398289 commit1fc3311

File tree

6 files changed

+57
-12
lines changed

6 files changed

+57
-12
lines changed

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
useSymfony\Component\DependencyInjection\Compiler\CheckTypeDeclarationsPass;
2525
useSymfony\Component\DependencyInjection\Compiler\PassConfig;
2626
useSymfony\Component\DependencyInjection\Compiler\ResolveFactoryClassPass;
27+
useSymfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
2728
useSymfony\Component\DependencyInjection\Container;
2829
useSymfony\Component\DependencyInjection\ContainerBuilder;
2930
useSymfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -49,8 +50,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
4950
$io =newSymfonyStyle($input,$output);
5051
$errorIo =$io->getErrorStyle();
5152

53+
$resolveEnvVars = (bool)$input->getOption('resolve-env-vars');
54+
5255
try {
53-
$container =$this->getContainerBuilder();
56+
$container =$this->getContainerBuilder($resolveEnvVars);
5457
}catch (RuntimeException$e) {
5558
$errorIo->error($e->getMessage());
5659

@@ -60,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
6063
$container->setParameter('container.build_time',time());
6164

6265
try {
63-
$container->compile((bool)$input->getOption('resolve-env-vars'));
66+
$container->compile($resolveEnvVars);
6467
}catch (InvalidArgumentException$e) {
6568
$errorIo->error($e->getMessage());
6669

@@ -72,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7275
return0;
7376
}
7477

75-
privatefunctiongetContainerBuilder():ContainerBuilder
78+
privatefunctiongetContainerBuilder(bool$resolveEnvVars):ContainerBuilder
7679
{
7780
if (isset($this->container)) {
7881
return$this->container;
@@ -99,16 +102,22 @@ private function getContainerBuilder(): ContainerBuilder
99102

100103
(newXmlFileLoader($container =newContainerBuilder($parameterBag =newEnvPlaceholderParameterBag()),newFileLocator()))->load($kernelContainer->getParameter('debug.container.dump'));
101104

102-
$refl =new \ReflectionProperty($parameterBag,'resolved');
103-
$refl->setValue($parameterBag,true);
105+
if ($resolveEnvVars) {
106+
$container->getCompilerPassConfig()->setOptimizationPasses([newResolveParameterPlaceHoldersPass(),newResolveFactoryClassPass()]);
107+
}else {
108+
$refl =new \ReflectionProperty($parameterBag,'resolved');
109+
$refl->setValue($parameterBag,true);
110+
111+
$container->getCompilerPassConfig()->setOptimizationPasses([newResolveFactoryClassPass()]);
112+
}
104113

105114
$container->getCompilerPassConfig()->setBeforeOptimizationPasses([]);
106-
$container->getCompilerPassConfig()->setOptimizationPasses([newResolveFactoryClassPass()]);
107115
$container->getCompilerPassConfig()->setBeforeRemovingPasses([]);
108116
}
109117

110118
$container->setParameter('container.build_hash','lint_container');
111119
$container->setParameter('container.build_id','lint_container');
120+
$container->setParameter('container.runtime_mode','web=0');
112121

113122
$container->addCompilerPass(newCheckAliasValidityPass(), PassConfig::TYPE_BEFORE_REMOVING, -100);
114123
$container->addCompilerPass(newCheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerLintCommandTest.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,30 @@ class ContainerLintCommandTest extends AbstractWebTestCase
2424
/**
2525
* @dataProvider containerLintProvider
2626
*/
27-
publicfunctiontestLintContainer(string$configFile,string$expectedOutput)
27+
publicfunctiontestLintContainer(string$configFile,bool$resolveEnvVars,int$expectedExitCode,string$expectedOutput)
2828
{
2929
$kernel =static::createKernel([
30-
'test_case' =>'ContainerDebug',
30+
'test_case' =>'ContainerLint',
3131
'root_config' =>$configFile,
3232
'debug' =>true,
3333
]);
3434
$this->application =newApplication($kernel);
3535

3636
$tester =$this->createCommandTester();
37-
$exitCode =$tester->execute([]);
37+
$exitCode =$tester->execute(['--resolve-env-vars' =>$resolveEnvVars]);
3838

39-
$this->assertSame(0,$exitCode);
39+
$this->assertSame($expectedExitCode,$exitCode);
4040
$this->assertStringContainsString($expectedOutput,$tester->getDisplay());
4141
}
4242

4343
publicstaticfunctioncontainerLintProvider():array
4444
{
4545
return [
46-
'default container' => ['config.yml','The container was linted successfully'],
47-
'missing dump file' => ['no_dump.yml','The container was linted successfully'],
46+
['escaped_percent.yml',false,0,'The container was linted successfully'],
47+
['missing_env_var.yml',false,0,'The container was linted successfully'],
48+
['missing_env_var.yml',true,1,'Environment variable not found: "BAR"'],
49+
['runtime_mode.yml',false,0,'The container was linted successfully'],
50+
['runtime_mode.yml',true,0,'The container was linted successfully'],
4851
];
4952
}
5053

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
useSymfony\Bundle\FrameworkBundle\FrameworkBundle;
13+
useSymfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
14+
15+
return [
16+
newFrameworkBundle(),
17+
newTestBundle(),
18+
];
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
imports:
2+
-{ resource: ../config/default.yml }
3+
4+
parameters:
5+
percent:'%%foo%%'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
imports:
2+
-{ resource: ../config/default.yml }
3+
4+
parameters:
5+
foo:'%env(BAR)%'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
imports:
2+
-{ resource: ../config/default.yml }
3+
4+
parameters:
5+
web:'%kernel.runtime_mode.web%'

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp