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

Commitba17d16

Browse files
committed
removed some internal usage of kernel.root_dir
1 parent61d336b commitba17d16

File tree

18 files changed

+41
-33
lines changed

18 files changed

+41
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
365365
if ($container->hasParameter('cache.prefix.seed')) {
366366
$seed ='.'.$container->getParameterBag()->resolveValue($container->getParameter('cache.prefix.seed'));
367367
}else {
368-
$seed ='_'.$container->getParameter('kernel.root_dir');
368+
$seed ='_'.$container->getParameter('kernel.project_dir');
369369
}
370370
$seed .='.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');
371371
$namespace ='sf_'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.ContainerBuilder::hash($seed);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ protected function createContainer(array $data = array())
272272
'kernel.debug' =>false,
273273
'kernel.environment' =>'test',
274274
'kernel.name' =>'kernel',
275-
'kernel.root_dir' =>__DIR__,
275+
'kernel.project_dir' =>__DIR__,
276276
),$data)));
277277
}
278278
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
7575
array('Environment',$kernel->getEnvironment()),
7676
array('Debug',$kernel->isDebug() ?'true' :'false'),
7777
array('Charset',$kernel->getCharset()),
78-
array('Root directory',self::formatPath($kernel->getRootDir(),$kernel->getProjectDir())),
7978
array('Cache directory',self::formatPath($kernel->getCacheDir(),$kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getCacheDir()).'</>)'),
8079
array('Log directory',self::formatPath($kernel->getLogDir(),$kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getLogDir()).'</>)'),
8180
newTableSeparator(),

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,29 @@
1616

1717
/**
1818
* @author Fabien Potencier <fabien@symfony.com>
19+
*
20+
* @internal
1921
*/
2022
class CodeHelperextends Helper
2123
{
2224
protected$fileLinkFormat;
25+
/**
26+
* @deprecated since Symfony 4.2
27+
*/
2328
protected$rootDir;
29+
protected$projectDir;
2430
protected$charset;
2531

2632
/**
2733
* @param string|FileLinkFormatter $fileLinkFormat The format for links to source files
28-
* @param string $rootDir The project root directory
34+
* @param string $projectDir The project root directory
2935
* @param string $charset The charset
3036
*/
31-
publicfunction__construct($fileLinkFormat,string$rootDir,string$charset)
37+
publicfunction__construct($fileLinkFormat,string$projectDir,string$charset)
3238
{
3339
$this->fileLinkFormat =$fileLinkFormat ?:ini_get('xdebug.file_link_format') ?:get_cfg_var('xdebug.file_link_format');
34-
$this->rootDir =str_replace('\\','/',$rootDir).'/';
40+
$this->projectDir =str_replace('\\','/',$projectDir).'/';
41+
$this->rootDir =$this->projectDir;
3542
$this->charset =$charset;
3643
}
3744

@@ -156,10 +163,10 @@ public function formatFile($file, $line, $text = null)
156163
if (null ===$text) {
157164
$file =trim($file);
158165
$fileStr =$file;
159-
if (0 ===strpos($fileStr,$this->rootDir)) {
160-
$fileStr =str_replace(array('\\',$this->rootDir),array('/',''),$fileStr);
166+
if (0 ===strpos($fileStr,$this->projectDir)) {
167+
$fileStr =str_replace(array('\\',$this->projectDir),array('/',''),$fileStr);
161168
$fileStr =htmlspecialchars($fileStr,$flags,$this->charset);
162-
$fileStr =sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s',htmlspecialchars($this->rootDir,$flags,$this->charset),$fileStr);
169+
$fileStr =sprintf('<abbr title="%s">kernel.project_dir</abbr>/%s',htmlspecialchars($this->projectDir,$flags,$this->charset),$fileStr);
163170
}
164171

165172
$text =sprintf('%s at line %d',$fileStr,$line);

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ class CacheClearCommandTest extends TestCase
2727
private$kernel;
2828
/** @var Filesystem */
2929
private$fs;
30-
private$rootDir;
30+
private$projectDir;
3131

3232
protectedfunctionsetUp()
3333
{
3434
$this->fs =newFilesystem();
3535
$this->kernel =newTestAppKernel('test',true);
36-
$this->rootDir =sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf2_cache_',true);
37-
$this->kernel->setRootDir($this->rootDir);
38-
$this->fs->mkdir($this->rootDir);
36+
$this->projectDir =sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf2_cache_',true);
37+
$this->kernel->setProjectDir($this->projectDir);
38+
$this->fs->mkdir($this->projectDir);
3939
}
4040

4141
protectedfunctiontearDown()
4242
{
43-
$this->fs->remove($this->rootDir);
43+
$this->fs->remove($this->projectDir);
4444
}
4545

4646
publicfunctiontestCacheIsFreshAfterCacheClearedWithWarmup()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public function registerBundles()
2626
);
2727
}
2828

29-
publicfunctionsetRootDir($rootDir)
29+
publicfunctionsetProjectDir($projectDir)
3030
{
31-
$this->rootDir =$rootDir;
31+
$this->projectDir =$projectDir;
3232
}
3333

3434
publicfunctionregisterContainerConfiguration(LoaderInterface$loader)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testPoolRefsAreWeak()
3232
$container->setParameter('kernel.debug',false);
3333
$container->setParameter('kernel.name','app');
3434
$container->setParameter('kernel.environment','prod');
35-
$container->setParameter('kernel.root_dir','foo');
35+
$container->setParameter('kernel.project_dir','foo');
3636

3737
$globalClearer =newDefinition(Psr6CacheClearer::class);
3838
$container->setDefinition('cache.global_clearer',$globalClearer);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testNamespaceArgumentIsReplaced()
3737
$container->setParameter('kernel.debug',false);
3838
$container->setParameter('kernel.name','app');
3939
$container->setParameter('kernel.environment','prod');
40-
$container->setParameter('kernel.root_dir','foo');
40+
$container->setParameter('kernel.project_dir','foo');
4141
$adapter =newDefinition();
4242
$adapter->setAbstract(true);
4343
$adapter->addTag('cache.pool');
@@ -58,7 +58,7 @@ public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
5858
$container =newContainerBuilder();
5959
$container->setParameter('kernel.environment','prod');
6060
$container->setParameter('kernel.name','app');
61-
$container->setParameter('kernel.root_dir','foo');
61+
$container->setParameter('kernel.project_dir','foo');
6262

6363
$container->register('cache.adapter.array', ArrayAdapter::class)->addArgument(0);
6464

@@ -128,7 +128,7 @@ public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
128128
$container->setParameter('kernel.debug',false);
129129
$container->setParameter('kernel.name','app');
130130
$container->setParameter('kernel.environment','prod');
131-
$container->setParameter('kernel.root_dir','foo');
131+
$container->setParameter('kernel.project_dir','foo');
132132
$adapter =newDefinition();
133133
$adapter->setAbstract(true);
134134
$adapter->addTag('cache.pool');

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public function __construct($varDir, $testCase, $rootConfig, $environment, $debu
4747

4848
publicfunctionregisterBundles()
4949
{
50-
if (!file_exists($filename =$this->getRootDir().'/'.$this->testCase.'/bundles.php')) {
50+
if (!file_exists($filename =$this->getProjectDir().'/'.$this->testCase.'/bundles.php')) {
5151
thrownew \RuntimeException(sprintf('The bundles file "%s" does not exist.',$filename));
5252
}
5353

5454
returninclude$filename;
5555
}
5656

57-
publicfunctiongetRootDir()
57+
publicfunctiongetProjectDir()
5858
{
5959
return__DIR__;
6060
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/config/framework.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
framework:
22
secret:test
3-
router:{ resource: "%kernel.root_dir%/%kernel.test_case%/routing.yml" }
3+
router:{ resource: "%kernel.project_dir%/%kernel.test_case%/routing.yml" }
44
validation:{ enabled: true, enable_annotations: true }
55
csrf_protection:true
66
form:true

0 commit comments

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