Merge remote-tracking branch 'remotes/upstream/1.2' into 5.0

Simonas Šerlinskas · Simonas Šerlinskas · commit 109276775137 · 2017-03-16T16:53:28.000+02:00
# Conflicts:
#	Tests/Functional/Result/DocumentIteratorTest.php
#	Tests/Functional/Service/ManagerTest.php
diff --git a/Mapping/DocumentParser.php b/Mapping/DocumentParser.php
@@ -305,7 +305,7 @@ private function getAliases(\ReflectionClass $reflectionClass, array &$metaField
                         [
                             'type' => $this->getObjectMapping($type->class)['type'],
                             'multiple' => $type->multiple,
-                            'aliases' => $this->getAliases($child),
+                            'aliases' => $this->getAliases($child, $metaFields),
                             'namespace' => $child->getName(),
                         ]
                     );
diff --git a/Resources/views/Profiler/profiler.html.twig b/Resources/views/Profiler/profiler.html.twig
@@ -51,7 +51,7 @@
                     <h3>Route: <i>{{ i }}</i></h3>
                     <ul>
                         {% for q, query in route %}
-                            <li class="{{ cycle(['odd', 'even'], i) }}" data-extra-info="{{ query.time }}" data-target-id="{{ i ~ q }}">
+                            <li class="{{ cycle(['odd', 'even'], q) }}" data-extra-info="{{ query.time }}" data-target-id="{{ i ~ q }}">
                                 <div id="queryNo-{{ i ~ q }}">
                                     <div>
                                             <span>

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ private function getAliases(\ReflectionClass $reflectionClass, array &$metaField`
`305`	`305`	`[`
`306`	`306`	`'type' => $this->getObjectMapping($type->class)['type'],`
`307`	`307`	`'multiple' => $type->multiple,`
`308`		`- 'aliases' => $this->getAliases($child),`
	`308`	`+ 'aliases' => $this->getAliases($child, $metaFields),`
`309`	`309`	`'namespace' => $child->getName(),`
`310`	`310`	`]`
`311`	`311`	`);`