InjectExtension::getInjectMethods() added test

Author: dg

src/DI/Extensions/InjectExtension.php

@@ -40,7 +40,7 @@ private function updateDefinition($def)
 			$injects[] = new DI\Statement('$' . $property, ['@\\' . ltrim($type, '\\')]);
 		}
 
-		foreach (self::getInjectMethods($def->getClass()) as $method) {
+		foreach (array_reverse(self::getInjectMethods($def->getClass())) as $method) {
 			$injects[] = new DI\Statement($method);
 		}
 
@@ -65,9 +65,9 @@ private function updateDefinition($def)
 	 */
 	public static function getInjectMethods($class)
 	{
-		return array_values(array_filter(get_class_methods($class), function ($name) {
+		return array_reverse(array_values(array_filter(get_class_methods($class), function ($name) {
 			return substr($name, 0, 6) === 'inject';
-		}));
+		})));
 	}
 
 
@@ -103,7 +103,7 @@ public static function callInjects(DI\Container $container, $service)
 			throw new Nette\InvalidArgumentException(sprintf('Service must be object, %s given.', gettype($service)));
 		}
 
-		foreach (array_reverse(self::getInjectMethods($service)) as $method) {
+		foreach (self::getInjectMethods($service) as $method) {
 			$container->callMethod([$service, $method]);
 		}
 

tests/DI/InjectExtension.getInjectMethods().phpt

@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Test: Nette\DI\Extensions\InjectExtension::getInjectMethods()
+ */
+
+use Nette\DI\Extensions\InjectExtension;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+trait Trait1
+{
+	function injectT1()
+	{}
+}
+
+trait Trait2
+{
+	function injectT2()
+	{}
+}
+
+class Class1
+{
+	function inject1()
+	{}
+}
+
+class Class2 extends Class1
+{
+	use Trait1;
+
+	function inject2()
+	{}
+}
+
+class Class3 extends Class2
+{
+	use Trait2;
+
+	function inject3()
+	{}
+}
+
+Assert::same([
+	'inject1',
+], InjectExtension::getInjectMethods('Class1'));
+
+Assert::same([
+	'injectT1',
+	'inject1',
+	'inject2',
+], InjectExtension::getInjectMethods('Class2'));
+
+Assert::same([
+	'injectT2',
+	'injectT1',
+	'inject1',
+	'inject2',
+	'inject3',
+], InjectExtension::getInjectMethods('Class3'));