tests: improvements

Author: dg

tests/DI/Helpers.autowireArguments.errors.phpt

@@ -42,3 +42,8 @@ Assert::exception(function () use ($container) {
 Assert::exception(function () use ($container) {
 	Helpers::autowireArguments(new ReflectionFunction(function ($x) {}), [], $container);
 }, Nette\DI\ServiceCreationException::class, 'Parameter $x in {closure}() has no class type hint or default value, so its value must be specified.');
+
+
+Assert::exception(function () use ($container) {
+	Helpers::autowireArguments(new ReflectionFunction(function (int $x) {}), [], $container);
+}, Nette\DI\ServiceCreationException::class, 'Parameter $x in {closure}() has no class type hint or default value, so its value must be specified.');

tests/DI/Helpers.autowireArguments.phpt

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Test: Nette\DI\Config\Helpers::autowireArguments()
+ */
+
+use Nette\DI\Helpers;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Container
+{
+	function getByType($type)
+	{
+		return $type === 'Test' ? new Test : NULL;
+	}
+}
+
+class Test
+{
+	function method(Test $class, Undefined $nullable1 = NULL, int $nullable2 = NULL)
+	{}
+}
+
+$container = new Container;
+
+Assert::equal(
+	[new Test],
+	Helpers::autowireArguments(new ReflectionMethod('Test', 'method'), [], $container)
+);

tests/DI/PhpReflection.getReturnType.php7.phpt

@@ -2,7 +2,7 @@
 
 /**
  * Test: Nette\DI\PhpReflection::getReturnType
- * @phpversion >= 7
+ * @phpversion 7
  */
 
 namespace NS
@@ -14,22 +14,34 @@ namespace NS
 		function noType()
 		{}
 
+		function classType(): B
+		{}
+
+		function nativeType(): string
+		{}
+
+		function selfType(): self
+		{}
+
 		/** @return B */
-		function annotationSingle()
+		function annotationClassType()
 		{}
 
 		/** @return B|string */
-		function annotationComplex()
+		function annotationUnionType()
 		{}
 
-		function nativeType(): string
+		/** @return String */
+		function annotationNativeType()
 		{}
 
-		function selfType(): self
+		/** @return self */
+		function annotationSelfType()
 		{}
 	}
 
-	function classType(): B
+	/** @return B */
+	function annotationClassType()
 	{}
 }
 
@@ -44,14 +56,20 @@ namespace
 
 	Assert::null(PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'noType')));
 
-	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationSingle')));
-
-	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationComplex')));
+	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'classType')));
 
 	Assert::same('string', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'nativeType')));
 
 	Assert::same('NS\A', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'selfType')));
 
+	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationClassType')));
+
+	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationUnionType')));
+
+	Assert::same('string', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationNativeType')));
+
+	Assert::same('NS\A', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationSelfType')));
+
 	// class name expanding is NOT supported for global functions
-	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionFunction(NS\classType::class)));
+	Assert::same('B', PhpReflection::getReturnType(new \ReflectionFunction('NS\annotationClassType')));
 }

tests/DI/PhpReflection.getReturnType.phpt

@@ -14,20 +14,24 @@ namespace NS
 		{}
 
 		/** @return B */
-		function annotationSingle()
+		function annotationClassType()
 		{}
 
 		/** @return B|string */
-		function annotationComplex()
+		function annotationUnionType()
 		{}
 
 		/** @return String */
-		function nativeType()
+		function annotationNativeType()
+		{}
+
+		/** @return self */
+		function annotationSelfType()
 		{}
 	}
 
 	/** @return B */
-	function classType()
+	function annotationClassType()
 	{}
 }
 
@@ -42,12 +46,14 @@ namespace
 
 	Assert::null(PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'noType')));
 
-	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationSingle')));
+	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationClassType')));
+
+	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationUnionType')));
 
-	Assert::same('Test\B', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationComplex')));
+	Assert::same('string', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationNativeType')));
 
-	Assert::same('string', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'nativeType')));
+	Assert::same('NS\A', PhpReflection::getReturnType(new \ReflectionMethod(NS\A::class, 'annotationSelfType')));
 
 	// class name expanding is NOT supported for global functions
-	Assert::same('B', PhpReflection::getReturnType(new \ReflectionFunction(NS\classType::class)));
+	Assert::same('B', PhpReflection::getReturnType(new \ReflectionFunction('NS\annotationClassType')));
 }