Container: removed $types

It was used only for imported services, which is now solved by typehint
nette · Apr 28, 2024 · b4ef1fa · b4ef1fa
1 parent f1274cf
commit b4ef1fa
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 23 deletions.
diff --git a/src/Bridges/DITracy/ContainerPanel.php b/src/Bridges/DITracy/ContainerPanel.php
@@ -55,7 +55,7 @@ public function getPanel(): string
 		foreach ($rc->getMethods() as $method) {
 			if (preg_match('#^createService.#', $method->getName())) {
 				$name = lcfirst(str_replace('__', '.', substr($method->getName(), 13)));
-				$services[$name] = $this->container->getServiceType($name);
+				$services[$name] = (string) $method->getReturnType();
 			}
 		}
 		ksort($services, SORT_NATURAL);

diff --git a/src/DI/Container.php b/src/DI/Container.php
@@ -23,9 +23,6 @@ class Container
 	 */
 	public $parameters = [];
 
-	/** @var string[]  service name => type */
-	protected array $types = [];
-
 	/** @var string[]  alias => service name */
 	protected array $aliases = [];
 
@@ -171,9 +168,6 @@ public function getServiceType(string $name): string
 		if (isset($this->aliases[$name])) {
 			return $this->getServiceType($this->aliases[$name]);
 
-		} elseif (isset($this->types[$name])) {
-			return $this->types[$name];
-
 		} elseif (isset($this->methods[$method])) {
 			return (string) (new \ReflectionMethod($this, $method))->getReturnType();
 

diff --git a/src/DI/ContainerBuilder.php b/src/DI/ContainerBuilder.php
@@ -353,10 +353,6 @@ public function exportMeta(): array
 		$defs = $this->definitions;
 		ksort($defs);
 		foreach ($defs as $name => $def) {
-			if ($def instanceof Definitions\ImportedDefinition) {
-				$meta['types'][$name] = $def->getType();
-			}
-
 			foreach ($def->getTags() as $tag => $value) {
 				$meta['tags'][$tag][$name] = $value;
 			}

diff --git a/src/DI/Definitions/ImportedDefinition.php b/src/DI/Definitions/ImportedDefinition.php
@@ -36,10 +36,9 @@ public function complete(Nette\DI\Resolver $resolver): void
 
 	public function generateMethod(Nette\PhpGenerator\Method $method, PhpGenerator $generator): void
 	{
-		$method->setReturnType('void')
-			->setBody(
-				'throw new Nette\\DI\\ServiceCreationException(?);',
-				["Unable to create imported service '{$this->getName()}', it must be added using addService()"],
-			);
+		$method->setBody(
+			'throw new Nette\\DI\\ServiceCreationException(?);',
+			["Unable to create imported service '{$this->getName()}', it must be added using addService()"],
+		);
 	}
 }
diff --git a/tests/DI/ContainerBuilder.metadata.phpt b/tests/DI/ContainerBuilder.metadata.phpt
@@ -41,11 +41,6 @@ Assert::same(
 	getPropertyValue($container, 'wiring'),
 );
 
-Assert::same(
-	['container' => Nette\DI\Container::class],
-	getPropertyValue($container, 'types'),
-);
-
 Assert::same(
 	[
 		'a' => ['lorem' => true],

diff --git a/tests/DI/Definitions.ImportedDefinition.phpt b/tests/DI/Definitions.ImportedDefinition.phpt
@@ -42,7 +42,7 @@ test('', function () {
 
 	Assert::match(
 		<<<'XX'
-			public function createServiceAbc(): void
+			public function createServiceAbc(): stdClass
 			{
 				throw new Nette\DI\ServiceCreationException('Unable to create imported service \'abc\', it must be added using addService()');
 			}

diff --git a/tests/DI/expected/compiler.code.php b/tests/DI/expected/compiler.code.php
@@ -6,7 +6,6 @@
 
 class Container extends Nette\DI\Container
 {
-	protected array $types = ['container' => 'Nette\DI\Container'];
 	protected array $aliases = [];
 	protected array $wiring = ['Nette\DI\Container' => [['container']], 'stdClass' => [['01', 'name']]];