From 07bb346164bfd6ccf68b8feccc6635dbeb685edd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 10 Oct 2019 16:35:04 +0200
Subject: - update to 4.7.0 - use range dependencies - add patch for PHP 7.4
 from   https://github.com/oscarotero/Gettext/pull/230

---
 230.patch | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 230.patch

(limited to '230.patch')

diff --git a/230.patch b/230.patch
new file mode 100644
index 0000000..7de523b
--- /dev/null
+++ b/230.patch
@@ -0,0 +1,69 @@
+From 03a36641bd9b13b1084ffa9dc330d7ebd2700ed1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 10 Oct 2019 16:25:20 +0200
+Subject: [PATCH 1/2] Fix TypeError with 7.4
+
+TypeError: Argument 1 passed to Gettext\Translations::Gettext\{closure}() must be an instance of Gettext\Translation, array given
+
+From UPGRADINGS
+  . Calling get_object_vars() on an ArrayObject instance will now always return
+    the properties of the ArrayObject itself (or a subclass). Previously it
+    returned the values of the wrapped array/object unless the STD_PROP_LIST
+    flag was specified.
+---
+ src/Translations.php | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/Translations.php b/src/Translations.php
+index 083b4ad..05d6a3e 100644
+--- a/src/Translations.php
++++ b/src/Translations.php
+@@ -435,11 +435,13 @@ public function find($context, $original = '')
+      */
+     public function countTranslated()
+     {
+-        $callback = function (Translation $v) {
+-            return ($v->hasTranslation()) ? $v->getTranslation() : null;
+-        };
+-
+-        return count(array_filter(get_object_vars($this), $callback));
++        $c = 0;
++		foreach($this as $v) {
++            if ($v->hasTranslation()) {
++                $c++;
++            }
++        }
++        return $c;
+     }
+ 
+     /**
+
+From bfc9a85db55107ed58ce8e9ca84be077e03eec41 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 10 Oct 2019 16:28:19 +0200
+Subject: [PATCH 2/2] Fix Invalid characters passed for attempted conversion
+ (7.4)
+
+---
+ src/Extractors/PhpCode.php | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Extractors/PhpCode.php b/src/Extractors/PhpCode.php
+index ef31449..34243b9 100644
+--- a/src/Extractors/PhpCode.php
++++ b/src/Extractors/PhpCode.php
+@@ -122,11 +122,11 @@ function ($match) {
+                     case '\\':
+                         return '\\';
+                     case 'x':
+-                        return chr(hexdec(substr($match[0], 1)));
++                        return chr(hexdec(substr($match[1], 1)));
+                     case 'u':
+-                        return self::unicodeChar(hexdec(substr($match[0], 1)));
++                        return self::unicodeChar(hexdec(substr($match[1], 1)));
+                     default:
+-                        return chr(octdec($match[0]));
++                        return chr(octdec($match[1]));
+                 }
+             },
+             $value
-- 
cgit