diff -Nru phpmyadmin-motranslator-5.3.0/CHANGELOG.md phpmyadmin-motranslator-5.3.1/CHANGELOG.md --- phpmyadmin-motranslator-5.3.0/CHANGELOG.md 2022-04-26 11:24:50.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/CHANGELOG.md 2023-08-23 18:32:07.000000000 +0000 @@ -1,5 +1,9 @@ # Change Log +## [5.3.1] - 2023-08-23 + +* Add function guards to the global functions (#44) + ## [5.3.0] - 2022-04-26 * Add support for Symfony 6 diff -Nru phpmyadmin-motranslator-5.3.0/debian/changelog phpmyadmin-motranslator-5.3.1/debian/changelog --- phpmyadmin-motranslator-5.3.0/debian/changelog 2022-12-17 05:14:58.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/debian/changelog 2024-04-19 22:53:44.000000000 +0000 @@ -1,8 +1,18 @@ -phpmyadmin-motranslator (5.3.0-1+jammy1) jammy; urgency=medium +phpmyadmin-motranslator (5.3.1-1+jammy1) jammy; urgency=medium - * All changes for 5.3.0-1 + * No changes from 5.3.1-1 - -- William Desportes Sat, 17 Dec 2022 06:14:58 +0100 + -- William Desportes Sat, 20 Apr 2024 00:53:44 +0200 + +phpmyadmin-motranslator (5.3.1-1) unstable; urgency=medium + + * Remove Felipe from Uploaders + * New upstream version 5.3.1 + * Bump Standards-Version to 4.6.2 + * Add a patch for phpunit 10 + * Simplify symfony/expression-language constraints for dh_phpcomposer + + -- William Desportes Mon, 11 Sep 2023 12:04:54 +0200 phpmyadmin-motranslator (5.3.0-1) unstable; urgency=medium diff -Nru phpmyadmin-motranslator-5.3.0/debian/control phpmyadmin-motranslator-5.3.1/debian/control --- phpmyadmin-motranslator-5.3.0/debian/control 2022-12-17 05:14:25.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/debian/control 2024-04-19 22:52:13.000000000 +0000 @@ -1,7 +1,6 @@ Source: phpmyadmin-motranslator Maintainer: phpMyAdmin Team -Uploaders: Felipe Sateler , - William Desportes +Uploaders: William Desportes Section: php Priority: optional Build-Depends: debhelper-compat (= 13), @@ -10,7 +9,7 @@ phpab, phpunit, pkg-php-tools (>= 1.41~) -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/phpmyadmin-team/motranslator Vcs-Git: https://salsa.debian.org/phpmyadmin-team/motranslator.git -b debian/latest Homepage: https://github.com/phpmyadmin/motranslator diff -Nru phpmyadmin-motranslator-5.3.0/debian/patches/Make-data-providers-static-for-phpunit-10.patch phpmyadmin-motranslator-5.3.1/debian/patches/Make-data-providers-static-for-phpunit-10.patch --- phpmyadmin-motranslator-5.3.0/debian/patches/Make-data-providers-static-for-phpunit-10.patch 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/debian/patches/Make-data-providers-static-for-phpunit-10.patch 2024-04-19 22:52:13.000000000 +0000 @@ -0,0 +1,124 @@ +From: William Desportes +Date: Mon, 11 Sep 2023 11:50:53 +0200 +Subject: Make data providers static for phpunit 10 + +Origin: vendor +Forwarded: not-needed +--- + tests/LoaderTest.php | 4 ++-- + tests/MoFilesTest.php | 14 +++++++------- + tests/PluralFormulaTest.php | 6 +++--- + tests/PluralTest.php | 2 +- + 4 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/tests/LoaderTest.php b/tests/LoaderTest.php +index c9ee6d3..f8ff148 100644 +--- a/tests/LoaderTest.php ++++ b/tests/LoaderTest.php +@@ -35,7 +35,7 @@ class LoaderTest extends TestCase + /** + * @return array[] + */ +- public function localeList(): array ++ public static function localeList(): array + { + return [ + [ +@@ -175,7 +175,7 @@ class LoaderTest extends TestCase + /** + * @return array[] + */ +- public function translatorData(): array ++ public static function translatorData(): array + { + return [ + [ +diff --git a/tests/MoFilesTest.php b/tests/MoFilesTest.php +index b75bf75..a36f057 100644 +--- a/tests/MoFilesTest.php ++++ b/tests/MoFilesTest.php +@@ -136,25 +136,25 @@ class MoFilesTest extends TestCase + /** + * @return array[] + */ +- public function provideMoFiles(): array ++ public static function provideMoFiles(): array + { +- return $this->getFiles('./tests/data/*.mo'); ++ return self::getFiles('./tests/data/*.mo'); + } + + /** + * @return array[] + */ +- public function provideErrorMoFiles(): array ++ public static function provideErrorMoFiles(): array + { +- return $this->getFiles('./tests/data/error/*.mo'); ++ return self::getFiles('./tests/data/error/*.mo'); + } + + /** + * @return array[] + */ +- public function provideNotTranslatedFiles(): array ++ public static function provideNotTranslatedFiles(): array + { +- return $this->getFiles('./tests/data/not-translated/*.mo'); ++ return self::getFiles('./tests/data/not-translated/*.mo'); + } + + /** +@@ -208,7 +208,7 @@ class MoFilesTest extends TestCase + * + * @return array[] + */ +- private function getFiles(string $pattern): array ++ private static function getFiles(string $pattern): array + { + $files = glob($pattern); + if ($files === false) { +diff --git a/tests/PluralFormulaTest.php b/tests/PluralFormulaTest.php +index 769f121..541caa4 100644 +--- a/tests/PluralFormulaTest.php ++++ b/tests/PluralFormulaTest.php +@@ -28,7 +28,7 @@ class PluralFormulaTest extends TestCase + /** + * @return array[] + */ +- public function pluralExtractionData(): array ++ public static function pluralExtractionData(): array + { + return [ + // It defaults to a "Western-style" plural header. +@@ -72,7 +72,7 @@ class PluralFormulaTest extends TestCase + /** + * @return array[] + */ +- public function pluralCounts(): array ++ public static function pluralCounts(): array + { + return [ + [ +@@ -116,7 +116,7 @@ class PluralFormulaTest extends TestCase + /** + * @return array[] + */ +- public function pluralExpressions(): array ++ public static function pluralExpressions(): array + { + return [ + [ +diff --git a/tests/PluralTest.php b/tests/PluralTest.php +index 28da262..fe4afb6 100644 +--- a/tests/PluralTest.php ++++ b/tests/PluralTest.php +@@ -66,7 +66,7 @@ class PluralTest extends TestCase + /** + * @return array[] + */ +- public function dataProviderPluralForms(): array ++ public static function dataProviderPluralForms(): array + { + return [ + ['Plural-Forms: nplurals=2; plural=n != 1;'], diff -Nru phpmyadmin-motranslator-5.3.0/debian/patches/Simplify-symfony-expression-language-constraints-for-dh_p.patch phpmyadmin-motranslator-5.3.1/debian/patches/Simplify-symfony-expression-language-constraints-for-dh_p.patch --- phpmyadmin-motranslator-5.3.0/debian/patches/Simplify-symfony-expression-language-constraints-for-dh_p.patch 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/debian/patches/Simplify-symfony-expression-language-constraints-for-dh_p.patch 2024-04-19 22:52:13.000000000 +0000 @@ -0,0 +1,23 @@ +From: William Desportes +Date: Mon, 11 Sep 2023 12:01:41 +0200 +Subject: Simplify symfony/expression-language constraints for dh_phpcomposer + +Origin: vendor +Forwarded: not-needed +--- + composer.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/composer.json b/composer.json +index 2536f58..799d403 100644 +--- a/composer.json ++++ b/composer.json +@@ -28,7 +28,7 @@ + }, + "require": { + "php": "^7.1 || ^8.0", +- "symfony/expression-language": "^4.0 || ^5.0 || ^6.0" ++ "symfony/expression-language": ">3.0 <7.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.4 || ^8 || ^9", diff -Nru phpmyadmin-motranslator-5.3.0/debian/patches/series phpmyadmin-motranslator-5.3.1/debian/patches/series --- phpmyadmin-motranslator-5.3.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/debian/patches/series 2024-04-19 22:52:13.000000000 +0000 @@ -0,0 +1,2 @@ +Make-data-providers-static-for-phpunit-10.patch +Simplify-symfony-expression-language-constraints-for-dh_p.patch diff -Nru phpmyadmin-motranslator-5.3.0/src/functions.php phpmyadmin-motranslator-5.3.1/src/functions.php --- phpmyadmin-motranslator-5.3.0/src/functions.php 2022-04-26 11:24:50.000000000 +0000 +++ phpmyadmin-motranslator-5.3.1/src/functions.php 2023-08-23 18:32:07.000000000 +0000 @@ -26,175 +26,201 @@ use PhpMyAdmin\MoTranslator\Loader; -/** - * Sets a requested locale. - * - * @param int $category Locale category, ignored - * @param string $locale Locale name - * - * @return string Set or current locale - */ -function _setlocale(int $category, string $locale): string -{ - return Loader::getInstance()->setlocale($locale); -} - -/** - * Sets the path for a domain. - * - * @param string $domain Domain name - * @param string $path Path where to find locales - */ -function _bindtextdomain(string $domain, string $path): void -{ - Loader::getInstance()->bindtextdomain($domain, $path); -} - -/** - * Dummy compatibility function, MoTranslator assumes - * everything is using same character set on input and - * output. - * - * Generally it is wise to output in UTF-8 and have - * mo files in UTF-8. - * - * @param string $domain Domain where to set character set - * @param string $codeset Character set to set - */ -function _bind_textdomain_codeset($domain, $codeset): void -{ -} - -/** - * Sets the default domain. - * - * @param string $domain Domain name - */ -function _textdomain(string $domain): void -{ - Loader::getInstance()->textdomain($domain); -} - -/** - * Translates a string. - * - * @param string $msgid String to be translated - * - * @return string translated string (or original, if not found) - */ -function _gettext(string $msgid): string -{ - return Loader::getInstance()->getTranslator()->gettext($msgid); -} - -/** - * Translates a string, alias for _gettext. - * - * @param string $msgid String to be translated - * - * @return string translated string (or original, if not found) - */ -function __(string $msgid): string -{ - return Loader::getInstance()->getTranslator()->gettext($msgid); -} - -/** - * Plural version of gettext. - * - * @param string $msgid Single form - * @param string $msgidPlural Plural form - * @param int $number Number of objects - * - * @return string translated plural form - */ -function _ngettext(string $msgid, string $msgidPlural, int $number): string -{ - return Loader::getInstance()->getTranslator()->ngettext($msgid, $msgidPlural, $number); -} - -/** - * Translate with context. - * - * @param string $msgctxt Context - * @param string $msgid String to be translated - * - * @return string translated plural form - */ -function _pgettext(string $msgctxt, string $msgid): string -{ - return Loader::getInstance()->getTranslator()->pgettext($msgctxt, $msgid); -} - -/** - * Plural version of pgettext. - * - * @param string $msgctxt Context - * @param string $msgid Single form - * @param string $msgidPlural Plural form - * @param int $number Number of objects - * - * @return string translated plural form - */ -function _npgettext(string $msgctxt, string $msgid, string $msgidPlural, int $number): string -{ - return Loader::getInstance()->getTranslator()->npgettext($msgctxt, $msgid, $msgidPlural, $number); -} - -/** - * Translates a string. - * - * @param string $domain Domain to use - * @param string $msgid String to be translated - * - * @return string translated string (or original, if not found) - */ -function _dgettext(string $domain, string $msgid): string -{ - return Loader::getInstance()->getTranslator($domain)->gettext($msgid); -} - -/** - * Plural version of gettext. - * - * @param string $domain Domain to use - * @param string $msgid Single form - * @param string $msgidPlural Plural form - * @param int $number Number of objects - * - * @return string translated plural form - */ -function _dngettext(string $domain, string $msgid, string $msgidPlural, int $number): string -{ - return Loader::getInstance()->getTranslator($domain)->ngettext($msgid, $msgidPlural, $number); -} - -/** - * Translate with context. - * - * @param string $domain Domain to use - * @param string $msgctxt Context - * @param string $msgid String to be translated - * - * @return string translated plural form - */ -function _dpgettext(string $domain, string $msgctxt, string $msgid): string -{ - return Loader::getInstance()->getTranslator($domain)->pgettext($msgctxt, $msgid); -} - -/** - * Plural version of pgettext. - * - * @param string $domain Domain to use - * @param string $msgctxt Context - * @param string $msgid Single form - * @param string $msgidPlural Plural form - * @param int $number Number of objects - * - * @return string translated plural form - */ -function _dnpgettext(string $domain, string $msgctxt, string $msgid, string $msgidPlural, int $number): string -{ - return Loader::getInstance()->getTranslator($domain)->npgettext($msgctxt, $msgid, $msgidPlural, $number); +if (! function_exists('_setlocale')) { + /** + * Sets a requested locale. + * + * @param int $category Locale category, ignored + * @param string $locale Locale name + * + * @return string Set or current locale + */ + function _setlocale(int $category, string $locale): string + { + return Loader::getInstance()->setlocale($locale); + } +} + +if (! function_exists('_bindtextdomain')) { + /** + * Sets the path for a domain. + * + * @param string $domain Domain name + * @param string $path Path where to find locales + */ + function _bindtextdomain(string $domain, string $path): void + { + Loader::getInstance()->bindtextdomain($domain, $path); + } +} + +if (! function_exists('_bind_textdomain_codeset')) { + /** + * Dummy compatibility function, MoTranslator assumes + * everything is using same character set on input and + * output. + * + * Generally it is wise to output in UTF-8 and have + * mo files in UTF-8. + * + * @param string $domain Domain where to set character set + * @param string $codeset Character set to set + */ + function _bind_textdomain_codeset($domain, $codeset): void + { + } +} + +if (! function_exists('_textdomain')) { + /** + * Sets the default domain. + * + * @param string $domain Domain name + */ + function _textdomain(string $domain): void + { + Loader::getInstance()->textdomain($domain); + } +} + +if (! function_exists('_gettext')) { + /** + * Translates a string. + * + * @param string $msgid String to be translated + * + * @return string translated string (or original, if not found) + */ + function _gettext(string $msgid): string + { + return Loader::getInstance()->getTranslator()->gettext($msgid); + } +} + +if (! function_exists('__')) { + /** + * Translates a string, alias for _gettext. + * + * @param string $msgid String to be translated + * + * @return string translated string (or original, if not found) + */ + function __(string $msgid): string + { + return Loader::getInstance()->getTranslator()->gettext($msgid); + } +} + +if (! function_exists('_ngettext')) { + /** + * Plural version of gettext. + * + * @param string $msgid Single form + * @param string $msgidPlural Plural form + * @param int $number Number of objects + * + * @return string translated plural form + */ + function _ngettext(string $msgid, string $msgidPlural, int $number): string + { + return Loader::getInstance()->getTranslator()->ngettext($msgid, $msgidPlural, $number); + } +} + +if (! function_exists('_pgettext')) { + /** + * Translate with context. + * + * @param string $msgctxt Context + * @param string $msgid String to be translated + * + * @return string translated plural form + */ + function _pgettext(string $msgctxt, string $msgid): string + { + return Loader::getInstance()->getTranslator()->pgettext($msgctxt, $msgid); + } +} + +if (! function_exists('_npgettext')) { + /** + * Plural version of pgettext. + * + * @param string $msgctxt Context + * @param string $msgid Single form + * @param string $msgidPlural Plural form + * @param int $number Number of objects + * + * @return string translated plural form + */ + function _npgettext(string $msgctxt, string $msgid, string $msgidPlural, int $number): string + { + return Loader::getInstance()->getTranslator()->npgettext($msgctxt, $msgid, $msgidPlural, $number); + } +} + +if (! function_exists('_dgettext')) { + /** + * Translates a string. + * + * @param string $domain Domain to use + * @param string $msgid String to be translated + * + * @return string translated string (or original, if not found) + */ + function _dgettext(string $domain, string $msgid): string + { + return Loader::getInstance()->getTranslator($domain)->gettext($msgid); + } +} + +if (! function_exists('_dngettext')) { + /** + * Plural version of gettext. + * + * @param string $domain Domain to use + * @param string $msgid Single form + * @param string $msgidPlural Plural form + * @param int $number Number of objects + * + * @return string translated plural form + */ + function _dngettext(string $domain, string $msgid, string $msgidPlural, int $number): string + { + return Loader::getInstance()->getTranslator($domain)->ngettext($msgid, $msgidPlural, $number); + } +} + +if (! function_exists('_dpgettext')) { + /** + * Translate with context. + * + * @param string $domain Domain to use + * @param string $msgctxt Context + * @param string $msgid String to be translated + * + * @return string translated plural form + */ + function _dpgettext(string $domain, string $msgctxt, string $msgid): string + { + return Loader::getInstance()->getTranslator($domain)->pgettext($msgctxt, $msgid); + } +} + +if (! function_exists('_dnpgettext')) { + /** + * Plural version of pgettext. + * + * @param string $domain Domain to use + * @param string $msgctxt Context + * @param string $msgid Single form + * @param string $msgidPlural Plural form + * @param int $number Number of objects + * + * @return string translated plural form + */ + function _dnpgettext(string $domain, string $msgctxt, string $msgid, string $msgidPlural, int $number): string + { + return Loader::getInstance()->getTranslator($domain)->npgettext($msgctxt, $msgid, $msgidPlural, $number); + } }