Update nette/di

build/PHPStan/Build/ServiceLocatorDynamicReturnTypeExtension.php

@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
@@ -34,10 +33,14 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 
 		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();
 
-		if ($methodReflection->getName() === 'getByType' && count($methodCall->getArgs()) >= 2) {
-			$argType = $scope->getType($methodCall->getArgs()[1]->value);
-			if ($argType->isTrue()->yes()) {
-				$returnType = TypeCombinator::addNull($returnType);
+		if ($methodReflection->getName() === 'getByType') {
+			if (count($methodCall->getArgs()) < 2) {
+				$returnType = TypeCombinator::removeNull($returnType);
+			} else {
+				$argType = $scope->getType($methodCall->getArgs()[1]->value);
+				if ($argType->isTrue()->yes()) {
+					$returnType = TypeCombinator::removeNull($returnType);
+				}
 			}
 		}
 

compiler/build/scoper.inc.php

@@ -65,7 +65,7 @@ function (string $filePath, string $prefix, string $content): string {
 			return str_replace('|Nette\\\\DI\\\\Statement', sprintf('|\\\\%s\\\\Nette\\\\DI\\\\Statement', $prefix), $content);
 		},
 		function (string $filePath, string $prefix, string $content): string {
-			if ($filePath !== 'vendor/nette/di/src/DI/Config/DefinitionSchema.php') {
+			if ($filePath !== 'vendor/nette/di/src/DI/Extensions/DefinitionSchema.php') {
 				return $content;
 			}
 			$content = str_replace(

src/DependencyInjection/Configurator.php

@@ -3,10 +3,15 @@
 namespace PHPStan\DependencyInjection;
 
 use Nette\DI\Config\Loader;
+use Nette\DI\Container as OriginalNetteContainer;
 use Nette\DI\ContainerLoader;
 use PHPStan\File\FileReader;
 use function array_keys;
+use function error_reporting;
+use function restore_error_handler;
+use function set_error_handler;
 use function sha1;
+use const E_USER_DEPRECATED;
 use const PHP_RELEASE_VERSION;
 use const PHP_VERSION_ID;
 
@@ -60,6 +65,26 @@ public function loadContainer(): string
 		);
 	}
 
+	public function createContainer(bool $initialize = true): OriginalNetteContainer
+	{
+		set_error_handler(static function (int $errno): bool {
+			if ((error_reporting() & $errno) === 0) {
+				// silence @ operator
+				return true;
+			}
+
+			return $errno === E_USER_DEPRECATED;
+		});
+
+		try {
+			$container = parent::createContainer($initialize);
+		} finally {
+			restore_error_handler();
+		}
+
+		return $container;
+	}
+
 	/**
 	 * @return string[]
 	 */

src/DependencyInjection/ContainerFactory.php

@@ -2,10 +2,10 @@
 
 namespace PHPStan\DependencyInjection;
 
+use Nette\Bootstrap\Extensions\PhpExtension;
 use Nette\DI\Config\Adapters\PhpAdapter;
 use Nette\DI\Definitions\Statement;
 use Nette\DI\Extensions\ExtensionsExtension;
-use Nette\DI\Extensions\PhpExtension;
 use Nette\DI\Helpers;
 use Nette\Schema\Context as SchemaContext;
 use Nette\Schema\Elements\AnyOf;