From e90753502e9f6465cbfd4f6d94e513e5cc7f4392 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sat, 29 Jun 2019 18:43:59 +0200
Subject: [PATCH 1/3] Annotated correct return type for
 getInEdges()/getOutEdges().

---
 Compiler/ServiceReferenceGraphNode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Compiler/ServiceReferenceGraphNode.php b/Compiler/ServiceReferenceGraphNode.php
index 6abd6c86a..50140b5ff 100644
--- a/Compiler/ServiceReferenceGraphNode.php
+++ b/Compiler/ServiceReferenceGraphNode.php
@@ -81,7 +81,7 @@ public function getId()
     /**
      * Returns the in edges.
      *
-     * @return array The in ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getInEdges()
     {
@@ -91,7 +91,7 @@ public function getInEdges()
     /**
      * Returns the out edges.
      *
-     * @return array The out ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getOutEdges()
     {

From d58ec4a7e3804e311ed5d29df70af002f91b91ca Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 1 Jul 2019 14:42:30 +0200
Subject: [PATCH 2/3] Removed unused field.

---
 Compiler/AnalyzeServiceReferencesPass.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/Compiler/AnalyzeServiceReferencesPass.php
index 2dafb5378..87bb14780 100644
--- a/Compiler/AnalyzeServiceReferencesPass.php
+++ b/Compiler/AnalyzeServiceReferencesPass.php
@@ -34,7 +34,6 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
     private $onlyConstructorArguments;
     private $hasProxyDumper;
     private $lazy;
-    private $expressionLanguage;
     private $byConstructor;
     private $definitions;
     private $aliases;

From 65bc9f1020f7effcb803758dca284d0d3bf18de0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 4 Jul 2019 11:24:58 +0200
Subject: [PATCH 3/3] [DI] fix processing of regular parameter bags by
 MergeExtensionConfigurationPass

---
 Compiler/MergeExtensionConfigurationPass.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Compiler/MergeExtensionConfigurationPass.php b/Compiler/MergeExtensionConfigurationPass.php
index 63f8013c3..caa1fd225 100644
--- a/Compiler/MergeExtensionConfigurationPass.php
+++ b/Compiler/MergeExtensionConfigurationPass.php
@@ -186,6 +186,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
         $bag = $this->getParameterBag();
         $value = $bag->resolveValue($value);
 
+        if (!$bag instanceof EnvPlaceholderParameterBag) {
+            return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
+        }
+
         foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
             if (false === strpos($env, ':')) {
                 continue;