Compiler::loadDefinitions: allow to get to existing service by class [C…

…loses #145]

src/DI/Compiler.php

@@ -284,14 +284,16 @@ public static function loadDefinitions(ContainerBuilder $builder, array $service
 					throw new ServiceCreationException("Circular reference detected for service '$name'.");
 				}
 			}
-			$depths[$name] = count($path);
+			$depths[$name] = count($path) + preg_match('#^@[\w\\\\]+\z#', $name);
 		}
 		array_multisort($depths, $services);
 
 		foreach ($services as $name => $def) {
-			if ((string) (int) $name === (string) $name) {
+			if (is_int($name)) {
 				$postfix = $def instanceof Statement && is_string($def->getEntity()) ? '.' . $def->getEntity() : (is_scalar($def) ? ".$def" : '');
 				$name = (count($builder->getDefinitions()) + 1) . preg_replace('#\W+#', '_', $postfix);
+			} elseif (preg_match('#^@[\w\\\\]+\z#', $name)) {
+				$name = $builder->getByType(substr($name, 1), TRUE);
 			} elseif ($namespace) {
 				$name = $namespace . '.' . $name;
 			}

tests/DI/Compiler.services.byClass.phpt

@@ -20,6 +20,15 @@ class Lorem
 
 class Ipsum
 {
+	public $value;
+
+
+	public function __construct($value)
+	{
+		$this->value = $value;
+	}
+
+
 	static function foo()
 	{
 	}
@@ -34,16 +43,20 @@ services:
 		class: Lorem(@\Ipsum)
 
 	two:
-		class: Ipsum
+		class: Ipsum(1)
 		setup:
 			- @\Ipsum::foo()
 
 	four: @\Lorem
+
+	@\Ipsum:
+		arguments: [2]
 ');
 
 
 Assert::type(Lorem::class, $container->getService('one'));
 Assert::type(Ipsum::class, $container->getService('two'));
+Assert::same(2, $container->getService('two')->value);
 Assert::type(Lorem::class, $container->getService('three'));
 Assert::same($container->getService('one'), $container->getService('three'));
 Assert::type(Lorem::class, $container->getService('four'));