From 28882f52cbe8fc086d6ed32beff6290ee997793c 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/4] Annotated correct return type for
 getInEdges()/getOutEdges().

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

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
index 6abd6c86af..50140b5fff 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -81,7 +81,7 @@ class ServiceReferenceGraphNode
     /**
      * Returns the in edges.
      *
-     * @return array The in ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getInEdges()
     {
@@ -91,7 +91,7 @@ class ServiceReferenceGraphNode
     /**
      * Returns the out edges.
      *
-     * @return array The out ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getOutEdges()
     {

From c986c86d1c015f611f1683e5db35135abecbef98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Mon, 1 Jul 2019 09:18:49 +0200
Subject: [PATCH 2/4] =?UTF-8?q?[Lock]=C2=A0Stores=20must=20implement=20`pu?=
 =?UTF-8?q?tOffExpiration`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Symfony/Component/Lock/Store/ZookeeperStore.php | 2 +-
 src/Symfony/Component/Lock/StoreInterface.php       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
index 4f8b4ee374..0302899921 100644
--- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php
+++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -91,7 +91,7 @@ class ZookeeperStore implements StoreInterface
      */
     public function putOffExpiration(Key $key, $ttl)
     {
-        throw new NotSupportedException();
+        // do nothing, zookeeper locks forever.
     }
 
     /**
diff --git a/src/Symfony/Component/Lock/StoreInterface.php b/src/Symfony/Component/Lock/StoreInterface.php
index 519c3e4731..e5a1dfa588 100644
--- a/src/Symfony/Component/Lock/StoreInterface.php
+++ b/src/Symfony/Component/Lock/StoreInterface.php
@@ -49,7 +49,6 @@ interface StoreInterface
      * @param float $ttl amount of seconds to keep the lock in the store
      *
      * @throws LockConflictedException
-     * @throws NotSupportedException
      */
     public function putOffExpiration(Key $key, $ttl);
 

From 58651409b47e86ece0473f22b08b9e63c067c8eb 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 3/4] Removed unused field.

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

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
index 2dafb53789..87bb14780d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/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 1f8927a9a64dc80124389fe482ba9ccc40ed8689 Mon Sep 17 00:00:00 2001
From: misterx <216417+misterx@users.noreply.github.com>
Date: Wed, 26 Jun 2019 14:51:54 +0300
Subject: [PATCH 4/4] Fixes windows error

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index c0f4b782b6..3f5d14574d 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -95,7 +95,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     // --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
-    $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
+    $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {
         exit($exit);