Merge branch '3.3' into 3.4

* 3.3: Random fixes Docblock fixes [HttpKernel] Enhance deprecation message [SecurityBundle] Fix the datacollector to properly support decision.object being null
symfony · Nov 7, 2017 · bfcdc0e · bfcdc0e
2 parents 7a397ea + f406161
commit bfcdc0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -471,9 +471,9 @@ private function addServiceInstance($id, Definition $definition, $isSimpleInstan
      *
      * @return bool
      */
-    private function isSimpleInstance($id, Definition $definition)
+    private function isSimpleInstance($id, Definition $definition, array $inlinedDefinitions)
     {
-        foreach (array_merge(array($definition), $this->getInlinedDefinitions($definition)) as $sDefinition) {
+        foreach (array_merge(array($definition), $inlinedDefinitions) as $sDefinition) {
             if ($definition !== $sDefinition && !$this->hasReference($id, $sDefinition->getMethodCalls())) {
                 continue;
             }

diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -705,7 +705,7 @@ private function loadFromExtensions(\DOMDocument $xml)
     }
 
     /**
-     * Converts a \DomElement object to a PHP array.
+     * Converts a \DOMElement object to a PHP array.
      *
      * The following rules applies during the conversion:
      *
@@ -719,7 +719,7 @@ private function loadFromExtensions(\DOMDocument $xml)
      *
      *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
      *
-     * @param \DomElement $element A \DomElement instance
+     * @param \DOMElement $element A \DOMElement instance
      *
      * @return array A PHP array
      */