Skip to content

Commit fa3c5af

Browse files
muhmemuhme
authored
Merge pull request #45732 from richard67/5.4-dev-upmerge-2025-07-15
[5.4] Upmerge 2025-07-15
2 parents 54ba53a + d19315d commit fa3c5af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+17172
-109
lines changed

‎.drone.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ steps:
3434
- name: phpstan
3535
image: joomlaprojects/docker-images:php8.2
3636
depends_on: [ phpcs ]
37-
failure: ignore
3837
commands:
3938
- ./libraries/vendor/bin/phpstan
4039

@@ -415,6 +414,6 @@ trigger:
415414

416415
---
417416
kind: signature
418-
hmac: 99da78521b10f37ddf6731e695fe52f85ee3db142bccac66901ae5372e332aae
417+
hmac: e7e97cddd98bd4db561056d6eb59c5eea2ae3fd55e20870bf800beaa773fbf6b
419418

420419
...

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
108108
- name: Run PHPstan
109109
run: |
110-
./libraries/vendor/bin/phpstan --error-format=github || :
110+
./libraries/vendor/bin/phpstan --error-format=github
111111
112112
tests-unit:
113113
name: Run Unit tests

‎build/build.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,9 @@ function capture_or_fail(string $command): string
453453
'cypress.config.dist.mjs',
454454
'package-lock.json',
455455
'package.json',
456-
'phpunit-pgsql.xml.dist',
456+
'phpstan-baseline.neon',
457457
'phpstan.neon',
458+
'phpunit-pgsql.xml.dist',
458459
'phpunit.xml.dist',
459460
'plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini',
460461
'plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.sys.ini',

‎installation/language/af-ZA/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Afrikaans (Suid-Afrika)</name>
4-
<version>5.3.2</version>
5-
<creationDate>2025-05</creationDate>
4+
<version>5.3.3</version>
5+
<creationDate>2025-07</creationDate>
66
<author>Afrikaans Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ar-AA/joomla.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ INSTL_WRITABLE="%s قابل للكتابة"
201201
INSTL_ZIP_SUPPORT_AVAILABLE="توفر ZIP خاصية فك الملفات المضغوطة"
202202
; Global strings
203203
JADMINISTRATOR="الإدارة"
204-
JCLOSE="إغلاق"
204+
JCLOSE="أغلق"
205205
JEMAIL="البريد الإلكتروني"
206206
JERROR="خطأ"
207207
JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="لقد حدث خطأ أثناء معالجة طلبك."

‎installation/language/ar-AA/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Arabic (اللغة العربية)</name>
4-
<version>5.3.2</version>
5-
<creationDate>2025-05</creationDate>
4+
<version>5.3.3</version>
5+
<creationDate>2025-07</creationDate>
66
<author>Joomla! Project (Arabic Translation Team)</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/be-BY/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Belarusian (Belarus)</name>
4-
<version>5.3.2</version>
5-
<creationDate>2025-05</creationDate>
4+
<version>5.3.3</version>
5+
<creationDate>2025-07</creationDate>
66
<author>Joomla Belarus Community</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/bg-BG/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Bulgarian (bg-BG)</name>
4-
<version>5.3.2</version>
5-
<creationDate>2025-05</creationDate>
4+
<version>5.3.3</version>
5+
<creationDate>2025-07</creationDate>
66
<author>Joomla! Bulgaria</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ca-ES/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Catalan (ca-ES)</name>
4-
<version>5.3.2</version>
5-
<creationDate>2025-05</creationDate>
4+
<version>5.3.3</version>
5+
<creationDate>2025-07</creationDate>
66
<author>Catalan [ca-ES] Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/cs-CZ/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Czech (Čeština)</name>
4-
<version>5.3.2</version>
5-
<creationDate>2025-05</creationDate>
4+
<version>5.3.3</version>
5+
<creationDate>2025-07</creationDate>
66
<author>Czech Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

0 commit comments

Comments
 (0)