From 6c97c7850a9b7ea2460848a4c49ec0230f51a566 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 28 Oct 2020 07:43:11 +0100 Subject: update to 1.26.0 drop patch merged upstream --- Autoload-xdebug3.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 Autoload-xdebug3.patch (limited to 'Autoload-xdebug3.patch') diff --git a/Autoload-xdebug3.patch b/Autoload-xdebug3.patch deleted file mode 100644 index 0034c90..0000000 --- a/Autoload-xdebug3.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cd91e690190551adb068ba0e968ca9673daf419b Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 27 Oct 2020 07:32:44 +0100 -Subject: [PATCH] fix for xdebug v3 - ---- - src/CLI.php | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/CLI.php b/src/CLI.php -index 3c78ce8..5c87b3b 100644 ---- a/src/CLI.php -+++ b/src/CLI.php -@@ -591,7 +591,9 @@ private function preBootstrap() { - ini_set('xdebug.scream', 0); - ini_set('xdebug.max_nesting_level', 8192); - ini_set('xdebug.show_exception_trace', 0); -- xdebug_disable(); -+ if (function_exists('xdebug_disable')) { // Xdebug v2 -+ xdebug_disable(); -+ } - } - - } -- cgit