summaryrefslogtreecommitdiffstats
path: root/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-17 15:53:04 +0200
committerRemi Collet <remi@remirepo.net>2019-06-17 15:53:04 +0200
commitaa692687734dcab79bddd7fb2145cb8824cdf000 (patch)
treea5cd4220ee264da2a86cd5b105472f442b43c3db /ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch
parent860bc555f6f7774ea302cfbd73d370ce398e0a31 (diff)
v6.0.8 from Fedora
Diffstat (limited to 'ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch')
-rw-r--r--ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch b/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch
deleted file mode 100644
index ea6649d..0000000
--- a/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-For PHP 7.2, adapted for version 5.4.3 from
-
-From ecab701e7de49f160d83be6a42d6c5aa9a8df76b Mon Sep 17 00:00:00 2001
-From: Matthieu Napoli <matthieu@mnapoli.fr>
-Date: Sun, 4 Jun 2017 17:11:16 +0200
-Subject: [PATCH] Fix the build on PHP 7.2
-
----
- src/Container.php | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/Container.php b/src/Container.php
-index d7e87585..b445aa89 100644
---- a/src/DI/Container.php
-+++ b/src/DI/Container.php
-@@ -211,6 +211,10 @@ public function has($name)
- */
- public function injectOn($instance)
- {
-+ if (!$instance) {
-+ return $instance;
-+ }
-+
- $objectDefinition = $this->definitionSource->getDefinition(get_class($instance));
- if (! $objectDefinition instanceof ObjectDefinition) {
- return $instance;