Helpers::getReturnType() ignores 'object' and 'mixed'

nette · Mar 14, 2017 · b3fe855 · b3fe855
1 parent cd4ad17
commit b3fe855
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/src/DI/Helpers.php b/src/DI/Helpers.php
@@ -225,9 +225,10 @@ public static function getReturnType(\ReflectionFunctionAbstract $func)
 		if ($type = Reflection::getReturnType($func)) {
 			return $type;
 		} elseif ($type = preg_replace('#[|\s].*#', '', (string) self::parseAnnotation($func, 'return'))) {
-			if ($func instanceof \ReflectionMethod) {
-				$lower = strtolower($type);
-				return $lower === 'static' || $lower === '$this'
+			if ($type === 'object' || $type === 'mixed') {
+				return NULL;
+			} elseif ($func instanceof \ReflectionMethod) {
+				return $type === 'static' || $type === '$this'
 					? $func->getDeclaringClass()->getName()
 					: Reflection::expandClassName($type, $func->getDeclaringClass());
 			} else {

diff --git a/tests/DI/ContainerBuilder.factory.resolveBuiltinTypes.php7.phpt b/tests/DI/ContainerBuilder.factory.resolveBuiltinTypes.php7.phpt
@@ -31,6 +31,17 @@ namespace A
 		{
 			return 0.0;
 		}
+
+		/** @return object */
+		function createObject()
+		{
+			return (object) NULL;
+		}
+
+		/** @return mixed */
+		function createMixed()
+		{
+		}
 	}
 
 }
@@ -80,4 +91,22 @@ namespace
 		$container = createContainer($builder);
 	}, Nette\DI\ServiceCreationException::class, "Class or interface 'float' not found. Is return type of A\\Factory::createFloat() used in service 'f' correct?");
 
+	Assert::exception(function () {
+		$builder = new DI\ContainerBuilder;
+		$builder->addDefinition('factory')
+			->setClass('A\Factory');
+		$builder->addDefinition('f')
+			->setFactory('@factory::createObject');
+		$container = createContainer($builder);
+	}, Nette\DI\ServiceCreationException::class, "Unknown type of service 'f', declare return type of factory method (for PHP 5 use annotation @return)");
+
+	Assert::exception(function () {
+		$builder = new DI\ContainerBuilder;
+		$builder->addDefinition('factory')
+			->setClass('A\Factory');
+		$builder->addDefinition('f')
+			->setFactory('@factory::createMixed');
+		$container = createContainer($builder);
+	}, Nette\DI\ServiceCreationException::class, "Unknown type of service 'f', declare return type of factory method (for PHP 5 use annotation @return)");
+
 }