From 78a041a8ec5064c3f83016356202a8b5b7759964 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 21 Nov 2019 08:41:32 +0100
Subject: - update Console_Getopt to 1.4.3 - drop patches merged upstream

---
 4.patch | 66 -----------------------------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 4.patch

(limited to '4.patch')

diff --git a/4.patch b/4.patch
deleted file mode 100644
index c8a8a31..0000000
--- a/4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From f37ba4a4f42a1f1173fe7de28fb9b71a54c2ff63 Mon Sep 17 00:00:00 2001
-From: Jack Cherng <jfcherng@gmail.com>
-Date: Wed, 7 Aug 2019 07:32:38 +0800
-Subject: [PATCH] Fix PHP 7.4 deprecation: array/string curly braces access
-
-Signed-off-by: Jack Cherng <jfcherng@gmail.com>
----
- Console/Getopt.php | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Console/Getopt.php b/Console/Getopt.php
-index f8df71c..29f86bb 100644
---- a/Console/Getopt.php
-+++ b/Console/Getopt.php
-@@ -138,10 +138,10 @@ public static function doGetopt($version, $args, $short_options, $long_options =
-                 break;
-             }
- 
--            if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
-+            if ($arg[0] != '-' || (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) {
-                 $non_opts = array_merge($non_opts, array_slice($args, $i));
-                 break;
--            } elseif (strlen($arg) > 1 && $arg{1} == '-') {
-+            } elseif (strlen($arg) > 1 && $arg[1] == '-') {
-                 $error = Console_Getopt::_parseLongOption(substr($arg, 2),
-                                                           $long_options,
-                                                           $opts,
-@@ -186,11 +186,11 @@ public static function doGetopt($version, $args, $short_options, $long_options =
-     protected static function _parseShortOption($arg, $short_options, &$opts, &$argIdx, $args, $skip_unknown)
-     {
-         for ($i = 0; $i < strlen($arg); $i++) {
--            $opt     = $arg{$i};
-+            $opt     = $arg[$i];
-             $opt_arg = null;
- 
-             /* Try to find the short option in the specifier string. */
--            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':') {
-+            if (($spec = strstr($short_options, $opt)) === false || $arg[$i] == ':') {
-                 if ($skip_unknown === true) {
-                     break;
-                 }
-@@ -199,8 +199,8 @@ protected static function _parseShortOption($arg, $short_options, &$opts, &$argI
-                 return PEAR::raiseError($msg);
-             }
- 
--            if (strlen($spec) > 1 && $spec{1} == ':') {
--                if (strlen($spec) > 2 && $spec{2} == ':') {
-+            if (strlen($spec) > 1 && $spec[1] == ':') {
-+                if (strlen($spec) > 2 && $spec[2] == ':') {
-                     if ($i + 1 < strlen($arg)) {
-                         /* Option takes an optional argument. Use the remainder of
-                            the arg string if there is anything left. */
-@@ -296,11 +296,11 @@ protected static function _parseLongOption($arg, $long_options, &$opts, &$argIdx
-                 $next_option_rest = '';
-             }
- 
--            if ($opt_rest != '' && $opt{0} != '=' &&
-+            if ($opt_rest != '' && $opt[0] != '=' &&
-                 $i + 1 < count($long_options) &&
-                 $opt == substr($long_options[$i+1], 0, $opt_len) &&
-                 $next_option_rest != '' &&
--                $next_option_rest{0} != '=') {
-+                $next_option_rest[0] != '=') {
- 
-                 $msg = "Console_Getopt: option --$opt is ambiguous";
-                 return PEAR::raiseError($msg);
-- 
cgit