Skip to content

Commit 07c271b

Browse files
committed
fix: use parameter placeholders in configuration
1 parent 686e2bc commit 07c271b

File tree

5 files changed

+7
-41
lines changed

5 files changed

+7
-41
lines changed

src/DependencyInjection/Configuration.php

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,8 @@ final class Configuration implements ConfigurationInterface
2424
public const SectionConsole = 'console';
2525
public const SectionController = 'controller';
2626

27-
/** @var string */
28-
private $alias;
29-
30-
/** @var string */
31-
private $kernelProjectDir;
32-
33-
/** @var string */
34-
private $kernelLogsDir;
35-
36-
/** @var string */
37-
private $kernelCacheDir;
38-
39-
public function __construct(string $alias, string $kernelProjectDir, string $kernelLogsDir, string $kernelCacheDir)
27+
public function __construct(private readonly string $alias)
4028
{
41-
$this->alias = $alias;
42-
$this->kernelProjectDir = $kernelProjectDir;
43-
$this->kernelLogsDir = $kernelLogsDir;
44-
$this->kernelCacheDir = $kernelCacheDir;
4529
}
4630

4731
/** @return TreeBuilder<'array'> */
@@ -81,7 +65,7 @@ public function getConfigTreeBuilder(): TreeBuilder
8165
TracyLogger::class,
8266
),
8367
)
84-
->defaultValue($this->kernelLogsDir)
68+
->defaultValue('%kernel.logs_dir%')
8569
->end()
8670
->scalarNode(self::ParameterConsoleBrowser)
8771
->info(
@@ -106,8 +90,8 @@ public function getConfigTreeBuilder(): TreeBuilder
10690
->prototype('scalar')
10791
->end()
10892
->defaultValue([
109-
$this->kernelProjectDir . '/bootstrap.php.cache',
110-
$this->kernelCacheDir,
93+
'%kernel.project_dir%/bootstrap.php.cache',
94+
'%kernel.cache_dir%',
11195
])
11296
->end()
11397
->end()

src/DependencyInjection/TracyBlueScreenExtension.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,7 @@ public function loadInternal(array $mergedConfig, ContainerBuilder $container):
8080
/** @param mixed[] $config */
8181
public function getConfiguration(array $config, ContainerBuilder $container): Configuration
8282
{
83-
$kernelProjectDir = $container->getParameter('kernel.project_dir');
84-
$kernelLogsDir = $container->getParameter('kernel.logs_dir');
85-
$kernelCacheDir = $container->getParameter('kernel.cache_dir');
86-
assert(is_string($kernelProjectDir));
87-
assert(is_string($kernelLogsDir));
88-
assert(is_string($kernelCacheDir));
89-
90-
return new Configuration(
91-
$this->getAlias(),
92-
$kernelProjectDir,
93-
$kernelLogsDir,
94-
$kernelCacheDir,
95-
);
83+
return new Configuration($this->getAlias());
9684
}
9785

9886
private function isEnabled(bool|null $configOption, string $environment, bool $debug): bool

tests/DependencyInjection/TracyBlueScreenExtensionConsoleTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public function setUp(): void
1515
{
1616
parent::setUp();
1717

18-
$this->setParameter('kernel.project_dir', __DIR__);
19-
$this->setParameter('kernel.logs_dir', __DIR__ . '/tests-logs-dir');
20-
$this->setParameter('kernel.cache_dir', __DIR__ . '/tests-cache-dir');
2118
$this->setParameter('kernel.environment', 'dev');
2219
$this->setParameter('kernel.debug', true);
2320
}
@@ -85,7 +82,7 @@ public function testDefaultLogsDirIsKernelLogsDir(): void
8582

8683
$this->assertContainerBuilderHasParameter(
8784
TracyBlueScreenExtension::ContainerParameterConsoleLogDirectory,
88-
__DIR__ . '/tests-logs-dir',
85+
'%kernel.logs_dir%',
8986
);
9087
}
9188

tests/DependencyInjection/TracyBlueScreenExtensionControllerTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public function setUp(): void
1515
{
1616
parent::setUp();
1717

18-
$this->setParameter('kernel.project_dir', __DIR__);
19-
$this->setParameter('kernel.logs_dir', __DIR__);
20-
$this->setParameter('kernel.cache_dir', __DIR__ . '/tests-cache-dir');
2118
$this->setParameter('kernel.environment', 'dev');
2219
$this->setParameter('kernel.debug', true);
2320
}

tests/DependencyInjection/TracyBlueScreenExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function testCollapseCacheDirsByDefault(): void
102102
$collapsePaths = $this->container->getParameter('cdn77.tracy_blue_screen.blue_screen.collapse_paths');
103103

104104
$this->assertArrayContainsStringPart('/bootstrap.php.cache', $collapsePaths);
105-
$this->assertArrayContainsStringPart('/tests-cache-dir', $collapsePaths);
105+
$this->assertArrayContainsStringPart('%kernel.cache_dir%', $collapsePaths);
106106
}
107107

108108
public function testSetCollapseDirs(): void

0 commit comments

Comments
 (0)