Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #70574: Move files to proper locale dir

18 files changed, 4 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 211d625f16..0428e1710c 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP                                                                        NEWS
   . Fixed bug #79934 (CRLF-only line in heredoc causes parsing error).
     (Pieter van den Ham)
 
+- Gettext:
+  . Fixed bug #70574 (Tests fail due to relying on Linux fallback behavior for
+    gettext()). (Florian Engelhardt)
+
 - LDAP:
   . Fixed memory leaks. (ptomulik)
 
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.mo
index 255e1e937a..255e1e937a 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.mo
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.po
index 159a90ffeb..159a90ffeb 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.po
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.mo
index c2ab696a3e..c2ab696a3e 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.mo
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.po
index b56d1890e0..b56d1890e0 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.po
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switched.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switched.po
index d6f6ea2369..d6f6ea2369 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switched.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switched.po
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.mo
index e9c63ef95f..e9c63ef95f 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.mo
diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.po
index 863e83cfd9..863e83cfd9 100644
--- a/ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.po
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.mo
index 255e1e937a..255e1e937a 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.mo
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.po
index 159a90ffeb..159a90ffeb 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.po
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.mo
index c2ab696a3e..c2ab696a3e 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.mo
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.po
index b56d1890e0..b56d1890e0 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.po
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.mo
index 255e1e937a..255e1e937a 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.mo
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.po
index 159a90ffeb..159a90ffeb 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.po
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/messages.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.mo
index 335cbdde46..335cbdde46 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/messages.mo
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.mo
diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/messages.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.po
index 2faf01fc0f..2faf01fc0f 100644
--- a/ext/gettext/tests/locale/en/LC_MESSAGES/messages.po
+++ b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.po
diff --git a/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo b/ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.mo
index 55f4d1a341..55f4d1a341 100644
--- a/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo
+++ b/ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.mo
diff --git a/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po b/ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.po
index 3505156f74..3505156f74 100644
--- a/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po
+++ b/ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.po