Merge remote-tracking branch 'origin/1.10.x' into 1.11.x

phpstan · Feb 6, 2024 · 6320e1d · 6320e1d
2 parents 51ba944 + a7ff362
commit 6320e1d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
 		"hoa/regex": "1.17.01.13",
 		"jetbrains/phpstorm-stubs": "dev-master#8ea3bf44722f76a3a32c89fe769b6144c253f8a6",
 		"nette/bootstrap": "^3.0",
-		"nette/di": "^3.1.4",
+		"nette/di": "3.1.10",
 		"nette/finder": "^2.5",
 		"nette/neon": "^3.3.1",
 		"nette/schema": "^1.2.2",

diff --git a/composer.lock b/composer.lock
diff --git a/src/DependencyInjection/ContainerFactory.php b/src/DependencyInjection/ContainerFactory.php
@@ -147,6 +147,12 @@ public function create(
 		$configurator->setAllConfigFiles($allConfigFiles);
 
 		$container = $configurator->createContainer()->getByType(Container::class);
+
+		// initialize parameters that contain dynamic parameters
+		$container->getParameter('sysGetTempDir');
+		$container->getParameter('pro');
+		$container->getParameter('fixerTmpDir');
+
 		$this->validateParameters($container->getParameters(), $projectConfig['parametersSchema']);
 		self::postInitializeContainer($container);
 

diff --git a/src/DependencyInjection/NeonAdapter.php b/src/DependencyInjection/NeonAdapter.php
@@ -29,7 +29,7 @@
 class NeonAdapter implements Adapter
 {
 
-	public const CACHE_KEY = 'v23-pro-tmp-dir';
+	public const CACHE_KEY = 'v24-update-nette-di';
 
 	private const PREVENT_MERGING_SUFFIX = '!';
 

diff --git a/src/DependencyInjection/Nette/NetteContainer.php b/src/DependencyInjection/Nette/NetteContainer.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\DependencyInjection\Nette;
 
+use Nette\InvalidStateException;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\ParameterNotFoundException;
 use function array_key_exists;
@@ -78,6 +79,11 @@ public function hasParameter(string $parameterName): bool
 	public function getParameter(string $parameterName)
 	{
 		if (!$this->hasParameter($parameterName)) {
+			try {
+				return $this->container->getParameter($parameterName);
+			} catch (InvalidStateException) {
+				// pass
+			}
 			throw new ParameterNotFoundException($parameterName);
 		}