diff options
author | Remi Collet <remi@remirepo.net> | 2017-10-31 14:31:57 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2017-10-31 14:31:57 +0100 |
commit | 55d5049d933ae890b888c9344037e825469f39ce (patch) | |
tree | 83ab0f0f88a961dfbb6c76d7b310c5b6cb4e09b7 /ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch | |
parent | 17dca360f08cad3beb7a73685272fdcf995d6bba (diff) |
fix FTBFS from Koschei, add upstream patch for PHP 7.2
Diffstat (limited to 'ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch')
-rw-r--r-- | ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch b/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch new file mode 100644 index 0000000..ea6649d --- /dev/null +++ b/ecab701e7de49f160d83be6a42d6c5aa9a8df76b.patch @@ -0,0 +1,26 @@ +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; |