Merge pull request #41 from moufmouf/fields_order

moufmouf · web-flow · commit b3fad94f62d4 · 2019-04-10T13:30:55.000+02:00
Working on fields order in inheritance
diff --git a/src/Types/TypeAnnotatedObjectType.php b/src/Types/TypeAnnotatedObjectType.php
@@ -43,8 +43,11 @@ public static function createFromAnnotatedClass(string $typeName, string $classN
                     $fields = $fieldProvider->getSelfFields($className);
                 }
                 if ($parentType !== null) {
-                    // Note: with +=, the keys already present are not overloaded
-                    $fields += $parentType->getFields();
+                    $finalFields = $parentType->getFields();
+                    foreach ($fields as $name => $field) {
+                        $finalFields[$name] = $field;
+                    }
+                    return $finalFields;
                 }
                 return $fields;
             },

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,11 @@ public static function createFromAnnotatedClass(string $typeName, string $classN`
`43`	`43`	`$fields = $fieldProvider->getSelfFields($className);`
`44`	`44`	`}`
`45`	`45`	`if ($parentType !== null) {`
`46`		`- // Note: with +=, the keys already present are not overloaded`
`47`		`- $fields += $parentType->getFields();`
	`46`	`+ $finalFields = $parentType->getFields();`
	`47`	`+ foreach ($fields as $name => $field) {`
	`48`	`+ $finalFields[$name] = $field;`
	`49`	`+ }`
	`50`	`+ return $finalFields;`
`48`	`51`	`}`
`49`	`52`	`return $fields;`
`50`	`53`	`},`