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

Commit98ff750

Browse files
committed
[HttpKernel] deprecated the Kernel name
1 parent7cb823a commit98ff750

File tree

17 files changed

+61
-40
lines changed

17 files changed

+61
-40
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
367367
}else {
368368
$seed ='_'.$container->getParameter('kernel.root_dir');
369369
}
370-
$seed .='.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');
370+
$seed .='.'.$container->getParameter('kernel.container_class').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');
371371
$namespace ='sf_'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.ContainerBuilder::hash($seed);
372372

373373
$cacheDriver['namespace'] =$namespace;

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ protected function createContainer(array $data = array())
271271
'kernel.cache_dir' =>__DIR__,
272272
'kernel.debug' =>false,
273273
'kernel.environment' =>'test',
274-
'kernel.name' =>'kernel',
274+
'kernel.container_class' =>'kernel',
275275
'kernel.root_dir' =>__DIR__,
276276
),$data)));
277277
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
7171
array('<info>Kernel</>'),
7272
newTableSeparator(),
7373
array('Type',\get_class($kernel)),
74-
array('Name',$kernel->getName()),
7574
array('Environment',$kernel->getEnvironment()),
7675
array('Debug',$kernel->isDebug() ?'true' :'false'),
7776
array('Charset',$kernel->getCharset()),

‎src/Symfony/Bundle/FrameworkBundle/Console/Application.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function all($namespace = null)
148148
*/
149149
publicfunctiongetLongVersion()
150150
{
151-
returnparent::getLongVersion().sprintf(' (kernel: <comment>%s</>,env: <comment>%s</>, debug: <comment>%s</>)',$this->kernel->getName(),$this->kernel->getEnvironment(),$this->kernel->isDebug() ?'true' :'false');
151+
returnparent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)',$this->kernel->getEnvironment(),$this->kernel->isDebug() ?'true' :'false');
152152
}
153153

154154
publicfunctionadd(Command$command)

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testPoolRefsAreWeak()
3030
{
3131
$container =newContainerBuilder();
3232
$container->setParameter('kernel.debug',false);
33-
$container->setParameter('kernel.name','app');
33+
$container->setParameter('kernel.container_class','app');
3434
$container->setParameter('kernel.environment','prod');
3535
$container->setParameter('kernel.root_dir','foo');
3636

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testNamespaceArgumentIsReplaced()
3535
{
3636
$container =newContainerBuilder();
3737
$container->setParameter('kernel.debug',false);
38-
$container->setParameter('kernel.name','app');
38+
$container->setParameter('kernel.container_class','app');
3939
$container->setParameter('kernel.environment','prod');
4040
$container->setParameter('kernel.root_dir','foo');
4141
$adapter =newDefinition();
@@ -57,7 +57,7 @@ public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
5757
{
5858
$container =newContainerBuilder();
5959
$container->setParameter('kernel.environment','prod');
60-
$container->setParameter('kernel.name','app');
60+
$container->setParameter('kernel.container_class','app');
6161
$container->setParameter('kernel.root_dir','foo');
6262

6363
$container->register('cache.adapter.array', ArrayAdapter::class)->addArgument(0);
@@ -75,7 +75,7 @@ public function testArgsAreReplaced()
7575
{
7676
$container =newContainerBuilder();
7777
$container->setParameter('kernel.debug',false);
78-
$container->setParameter('kernel.name','app');
78+
$container->setParameter('kernel.container_class','app');
7979
$container->setParameter('kernel.environment','prod');
8080
$container->setParameter('cache.prefix.seed','foo');
8181
$cachePool =newDefinition();
@@ -100,7 +100,7 @@ public function testWithNameAttribute()
100100
{
101101
$container =newContainerBuilder();
102102
$container->setParameter('kernel.debug',false);
103-
$container->setParameter('kernel.name','app');
103+
$container->setParameter('kernel.container_class','app');
104104
$container->setParameter('kernel.environment','prod');
105105
$container->setParameter('cache.prefix.seed','foo');
106106
$cachePool =newDefinition();
@@ -126,7 +126,7 @@ public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
126126
{
127127
$container =newContainerBuilder();
128128
$container->setParameter('kernel.debug',false);
129-
$container->setParameter('kernel.name','app');
129+
$container->setParameter('kernel.container_class','app');
130130
$container->setParameter('kernel.environment','prod');
131131
$container->setParameter('kernel.root_dir','foo');
132132
$adapter =newDefinition();

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,9 @@ public function __construct($varDir, $testCase, $rootConfig, $environment, $debu
4646
/**
4747
* {@inheritdoc}
4848
*/
49-
publicfunctiongetName()
49+
publicfunctiongetContainerClass()
5050
{
51-
if (null ===$this->name) {
52-
$this->name =parent::getName().substr(md5($this->rootConfig), -16);
53-
}
54-
55-
return$this->name;
51+
returnparent::getContainerClass().substr(md5($this->rootConfig), -16);
5652
}
5753

5854
publicfunctionregisterBundles()

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@
5050
</span>
5151
</div>
5252

53-
{%if'n/a'is notsame as(collector.appname) %}
54-
<divclass="sf-toolbar-info-piece">
55-
<b>Kernel name</b>
56-
<span>{{collector.appname }}</span>
57-
</div>
58-
{%endif %}
59-
6053
{%if'n/a'is notsame as(collector.env) %}
6154
<divclass="sf-toolbar-info-piece">
6255
<b>Environment</b>

‎src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function process(ContainerBuilder $container)
5252
}else {
5353
$seed ='_'.$container->getParameter('kernel.root_dir');
5454
}
55-
$seed .='.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment');
55+
$seed .='.'.$container->getParameter('kernel.container_class').'.'.$container->getParameter('kernel.environment');
5656

5757
$pools =array();
5858
$clearers =array();

‎src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolClearerPassTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testPoolRefsAreWeak()
2727
{
2828
$container =newContainerBuilder();
2929
$container->setParameter('kernel.debug',false);
30-
$container->setParameter('kernel.name','app');
30+
$container->setParameter('kernel.container_class','app');
3131
$container->setParameter('kernel.environment','prod');
3232
$container->setParameter('kernel.root_dir','foo');
3333

0 commit comments

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