PhpGenerator: some formating logic moved to Resolver

Author: dg

src/DI/Definitions/ServiceDefinition.php

@@ -230,7 +230,8 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 
 		if (
 			$this->getSetup()
-			&& !$entity instanceof Reference && $type !== $entity
+			&& $type !== $entity
+			&& !(is_array($entity) && $entity[0] instanceof Reference && $entity[0]->getValue() === Nette\DI\ContainerBuilder::THIS_CONTAINER)
 			&& !(is_string($entity) && preg_match('#^[\w\\\\]+\z#', $entity) && is_subclass_of($entity, $type))
 		) {
 			$code .= PhpHelpers::formatArgs("if (!\$service instanceof $type) {\n"

src/DI/PhpGenerator.php

@@ -100,15 +100,9 @@ public function formatStatement(Statement $statement): string
 			case is_string($entity) && Strings::contains($entity, '?'): // PHP literal
 				return $this->formatPhp($entity, $arguments);
 
-			case $entity === 'not':
-				return $this->formatPhp('!?', [$arguments[0]]);
-
 			case is_string($entity): // create class
 				return $this->formatPhp("new $entity" . ($arguments ? '(...?)' : ''), $arguments ? [$arguments] : []);
 
-			case $entity instanceof Reference:
-				return $this->formatPhp('$this->?(...?)', [Container::getMethodName($entity->getValue()), $arguments]);
-
 			case is_array($entity):
 				switch (true) {
 					case $entity[1][0] === '$': // property getter, setter or appender

src/DI/Resolver.php

@@ -167,7 +167,10 @@ public function completeStatement(Statement $statement, bool $currentServiceAllo
 
 		switch (true) {
 			case is_string($entity) && Strings::contains($entity, '?'): // PHP literal
+				break;
+
 			case $entity === 'not':
+				$entity = ['', '!'];
 				break;
 
 			case is_string($entity): // create class
@@ -186,6 +189,7 @@ public function completeStatement(Statement $statement, bool $currentServiceAllo
 				break;
 
 			case $entity instanceof Reference:
+				$entity = [new Reference(ContainerBuilder::THIS_CONTAINER), Container::getMethodName($entity->getValue())];
 				break;
 
 			case is_array($entity):