Skip to content

Commit a7ff362

Browse files
committed
Update nette/di
1 parent ba848a8 commit a7ff362

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"hoa/regex": "1.17.01.13",
1717
"jetbrains/phpstorm-stubs": "dev-master#8ea3bf44722f76a3a32c89fe769b6144c253f8a6",
1818
"nette/bootstrap": "^3.0",
19-
"nette/di": "^3.1.4",
19+
"nette/di": "3.1.10",
2020
"nette/finder": "^2.5",
2121
"nette/neon": "^3.3.1",
2222
"nette/schema": "^1.2.2",

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DependencyInjection/ContainerFactory.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ public function create(
147147
$configurator->setAllConfigFiles($allConfigFiles);
148148

149149
$container = $configurator->createContainer()->getByType(Container::class);
150+
151+
// initialize parameters that contain dynamic parameters
152+
$container->getParameter('sysGetTempDir');
153+
$container->getParameter('pro');
154+
$container->getParameter('fixerTmpDir');
155+
150156
$this->validateParameters($container->getParameters(), $projectConfig['parametersSchema']);
151157
self::postInitializeContainer($container);
152158

src/DependencyInjection/NeonAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class NeonAdapter implements Adapter
3030
{
3131

32-
public const CACHE_KEY = 'v23-pro-tmp-dir';
32+
public const CACHE_KEY = 'v24-update-nette-di';
3333

3434
private const PREVENT_MERGING_SUFFIX = '!';
3535

src/DependencyInjection/Nette/NetteContainer.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PHPStan\DependencyInjection\Nette;
44

5+
use Nette\InvalidStateException;
56
use PHPStan\DependencyInjection\Container;
67
use PHPStan\DependencyInjection\ParameterNotFoundException;
78
use function array_key_exists;
@@ -78,6 +79,11 @@ public function hasParameter(string $parameterName): bool
7879
public function getParameter(string $parameterName)
7980
{
8081
if (!$this->hasParameter($parameterName)) {
82+
try {
83+
return $this->container->getParameter($parameterName);
84+
} catch (InvalidStateException) {
85+
// pass
86+
}
8187
throw new ParameterNotFoundException($parameterName);
8288
}
8389

0 commit comments

Comments
 (0)