InjectExtension::getInjectMethods() correct order of methods in traits

Author: dg

src/DI/Extensions/InjectExtension.php

@@ -65,9 +65,18 @@ private function updateDefinition($def)
 	 */
 	public static function getInjectMethods($class)
 	{
-		return array_reverse(array_values(array_filter(get_class_methods($class), function ($name) {
-			return substr($name, 0, 6) === 'inject';
-		})));
+		$res = [];
+		foreach (get_class_methods($class) as $name) {
+			if (substr($name, 0, 6) === 'inject') {
+				$res[$name] = (new \ReflectionMethod($class, $name))->getDeclaringClass()->getName();
+			}
+		}
+		uksort($res, function ($a, $b) use ($res) {
+			return $res[$a] === $res[$b]
+				? strcmp($a, $b)
+				: (is_a($res[$a], $res[$b], TRUE) ? 1 : -1);
+		});
+		return array_keys($res);
 	}
 
 

tests/DI/Container.inject.methods.phpt

@@ -57,4 +57,4 @@ $container = createContainer($builder);
 
 $test = new Test2;
 $container->callInjects($test);
-Assert::same(['Test1::injectOptional', 'Test1::injectA', 'Test1::inject', 'Test2::injectC'], $test->injects);
+Assert::same(['Test1::inject', 'Test1::injectA', 'Test1::injectOptional', 'Test2::injectC'], $test->injects);

tests/DI/InjectExtension.basic.phpt

@@ -73,28 +73,28 @@ services:
 $builder = $compiler->getContainerBuilder();
 
 Assert::equal([
-	new Statement(['@last.one', 'injectB']),
 	new Statement(['@last.one', 'injectA']),
-	new Statement(['@last.one', 'injectD']),
+	new Statement(['@last.one', 'injectB']),
 	new Statement(['@last.one', 'injectC']),
+	new Statement(['@last.one', 'injectD']),
 	new Statement(['@last.one', '$c'], ['@1_stdClass']),
 	new Statement(['@last.one', '$a'], ['@1_stdClass']),
 ], $builder->getDefinition('last.one')->getSetup());
 
 Assert::equal([
-	new Statement(['@ext.one', 'injectB']),
 	new Statement(['@ext.one', 'injectA']),
-	new Statement(['@ext.one', 'injectD']),
+	new Statement(['@ext.one', 'injectB']),
 	new Statement(['@ext.one', 'injectC']),
+	new Statement(['@ext.one', 'injectD']),
 	new Statement(['@ext.one', '$c'], ['@1_stdClass']),
 	new Statement(['@ext.one', '$a'], ['@1_stdClass']),
 ], $builder->getDefinition('ext.one')->getSetup());
 
 Assert::equal([
-	new Statement(['@two', 'injectB'], [1]),
 	new Statement(['@two', 'injectA']),
-	new Statement(['@two', 'injectD']),
+	new Statement(['@two', 'injectB'], [1]),
 	new Statement(['@two', 'injectC']),
+	new Statement(['@two', 'injectD']),
 	new Statement(['@two', '$c'], ['@1_stdClass']),
 	new Statement(['@two', '$a'], ['@1_stdClass']),
 ], $builder->getDefinition('two')->getSetup());

tests/DI/InjectExtension.getInjectMethods().phpt

@@ -49,15 +49,15 @@ Assert::same([
 ], InjectExtension::getInjectMethods('Class1'));
 
 Assert::same([
-	'injectT1',
 	'inject1',
 	'inject2',
+	'injectT1',
 ], InjectExtension::getInjectMethods('Class2'));
 
 Assert::same([
-	'injectT2',
-	'injectT1',
 	'inject1',
 	'inject2',
+	'injectT1',
 	'inject3',
+	'injectT2',
 ], InjectExtension::getInjectMethods('Class3'));