93 lines
3.1 KiB
Diff
93 lines
3.1 KiB
Diff
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/3] 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/3] 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
|
|
|
|
From 15dec68549d91fd9129fa3b09f212af1cd7807aa Mon Sep 17 00:00:00 2001
|
|
From: Remi Collet <remi@remirepo.net>
|
|
Date: Thu, 10 Oct 2019 16:37:26 +0200
|
|
Subject: [PATCH 3/3] CS
|
|
|
|
---
|
|
src/Translations.php | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Translations.php b/src/Translations.php
|
|
index 05d6a3e..1fa38c8 100644
|
|
--- a/src/Translations.php
|
|
+++ b/src/Translations.php
|
|
@@ -436,7 +436,7 @@ public function find($context, $original = '')
|
|
public function countTranslated()
|
|
{
|
|
$c = 0;
|
|
- foreach($this as $v) {
|
|
+ foreach ($this as $v) {
|
|
if ($v->hasTranslation()) {
|
|
$c++;
|
|
}
|
|
|