Compiler: added configuration option 'type' as replacement for 'class'

Author: dg

src/DI/Compiler.php

@@ -318,16 +318,16 @@ public static function loadDefinition(ServiceDefinition $definition, $config, st
 			return;
 
 		} elseif (is_string($config) && interface_exists($config)) {
-			$config = ['class' => null, 'implement' => $config];
+			$config = ['implement' => $config];
 
 		} elseif ($config instanceof Statement && is_string($config->getEntity()) && interface_exists($config->getEntity())) {
-			$config = ['class' => null, 'implement' => $config->getEntity(), 'factory' => array_shift($config->arguments)];
+			$config = ['implement' => $config->getEntity(), 'factory' => array_shift($config->arguments)];
 
 		} elseif (!is_array($config) || isset($config[0], $config[1])) {
-			$config = ['class' => null, 'factory' => $config];
+			$config = ['factory' => $config];
 		}
 
-		$known = ['class', 'factory', 'arguments', 'setup', 'autowired', 'dynamic', 'inject', 'parameters', 'implement', 'run', 'tags', 'alteration'];
+		$known = ['type', 'class', 'factory', 'arguments', 'setup', 'autowired', 'dynamic', 'inject', 'parameters', 'implement', 'run', 'tags', 'alteration'];
 		if ($error = array_diff(array_keys($config), $known)) {
 			$hints = array_filter(array_map(function ($error) use ($known) {
 				return Nette\Utils\ObjectMixin::getSuggestion($known, $error);
@@ -343,6 +343,14 @@ public static function loadDefinition(ServiceDefinition $definition, $config, st
 			$definition->setFactory(null);
 		}
 
+		if (array_key_exists('type', $config)) {
+			Validators::assertField($config, 'type', 'string|null');
+			$definition->setClass($config['type']);
+			if (array_key_exists('class', $config)) {
+				throw new Nette\InvalidStateException("Unexpected 'class' when 'type' is used.");
+			}
+		}
+
 		if (array_key_exists('class', $config)) {
 			Validators::assertField($config, 'class', 'string|Nette\DI\Statement|null');
 			if ($config['class'] instanceof Statement) {

src/DI/ContainerBuilder.php

@@ -289,7 +289,7 @@ public function prepareClassList()
 
 			if ($def->isDynamic()) {
 				if (!$def->getClass()) {
-					throw new ServiceCreationException("Class is missing in definition of service '$name'.");
+					throw new ServiceCreationException("Type is missing in definition of service '$name'.");
 				}
 				$def->setFactory(null);
 				continue;
@@ -298,7 +298,7 @@ public function prepareClassList()
 			// complete class-factory pairs
 			if (!$def->getEntity()) {
 				if (!$def->getClass()) {
-					throw new ServiceCreationException("Class and factory are missing in definition of service '$name'.");
+					throw new ServiceCreationException("Factory and type are missing in definition of service '$name'.");
 				}
 				$def->setFactory($def->getClass(), ($factory = $def->getFactory()) ? $factory->arguments : []);
 			}

tests/DI/Compiler.configOverride.phpt

@@ -26,13 +26,13 @@ $compiler = new DI\Compiler;
 $compiler->addConfig([
 	'services' => [
 		's1' => 'Ipsum',
-		's2' => ['class' => 'Ipsum'],
+		's2' => ['type' => 'Ipsum'],
 	],
 ]);
 $compiler->addConfig([
 	'services' => [
 		's1' => ['arguments' => [2]],
-		's2' => ['class' => 'Ipsum', 'alteration' => true],
+		's2' => ['type' => 'Ipsum', 'alteration' => true],
 	],
 ]);
 
@@ -52,7 +52,7 @@ Assert::same([
 
 $compiler->addConfig([
 	'services' => [
-		's3' => ['class' => 'Ipsum', 'alteration' => true],
+		's3' => ['type' => 'Ipsum', 'alteration' => true],
 	],
 ]);
 

tests/DI/Compiler.extension.defaultServices.phpt

@@ -92,7 +92,7 @@ services:
 	two: Bar
 	three: Factory::createLorem()
 	four:
-		class: Ipsum
+		type: Ipsum
 		implement: IIpsumFactory
 ');
 

tests/DI/Compiler.services.dynamic.phpt

@@ -21,7 +21,7 @@ class Service
 $container = createContainer(new DI\Compiler, '
 services:
 	one:
-		class: Service
+		type: Service
 		dynamic: true
 ');
 

tests/DI/Compiler.services.nonshared.phpt

@@ -31,7 +31,7 @@ services:
 		factory: Ipsum
 
 	lorem:
-		class: Lorem
+		type: Lorem
 		parameters: [Ipsum foo, bar: %false%]
 		setup:
 			- test(%foo%, %bar%)

tests/DI/ContainerBuilder.autowiring.chaining.phpt

@@ -77,7 +77,7 @@ $compiler = new DI\Compiler;
 $container = createContainer($compiler, '
 services:
 	baz:
-		class: Baz
+		type: Baz
 		factory: Foo::createUnknown()::foo()
 ');
 Assert::true($container->hasService('baz'));

tests/DI/NeonAdapter.phpt

@@ -108,7 +108,7 @@ Assert::match(<<<'EOD'
 # generated by Nette
 
 parameters:
-	class: Ipsum
+	type: Ipsum
 
 services:
 	referencedService: @one
@@ -123,15 +123,15 @@ services:
 	calledServiceAsParam: Ipsum(@one())
 	calledServiceWithArgsAsParam: Ipsum(@one(1))
 	one:
-		class: %class%
+		type: %class%
 		arguments:
 			- 1
 
 	two:
 		factory: %class%(1)
 
 	three:
-		class: Lorem
+		type: Lorem
 		factory: Factory::createLorem
 		arguments:
 			- 1

tests/DI/files/compiler.generatedFactory.neon

@@ -23,7 +23,7 @@ services:
 		parameters: [Baz baz = null]
 
 	fooFactory3:
-		class: Foo
+		type: Foo
 		implement: IFooFactory
 
 	fooFactory4: IFooFactory

tests/DI/files/compiler.services.factory.neon

@@ -16,14 +16,14 @@ services:
 	calledServiceWithArgsAsParam: Ipsum(@one(1))
 
 	one:
-		class: %class%
+		type: %class%
 		arguments: [1]
 
 	two:
 		factory: %class%(1)
 
 	three:
-		class: Lorem
+		type: Lorem
 		factory: Factory::createLorem
 		arguments: [arg: 5, 1, 2]