Skip to content

Commit 0c85e66

Browse files
laoneolaoneo
authored
Merge branch '5.3-dev' into ghactions-codestyle
2 parents a15be28 + 2fea432 commit 0c85e66

File tree

76 files changed

+17209
-446
lines changed

Some content is hidden

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

76 files changed

+17209
-446
lines changed

‎.drone.yml‎

Lines changed: 1 addition & 313 deletions
Original file line numberDiff line numberDiff line change
@@ -1,315 +1,3 @@
1-
---
2-
kind: pipeline
3-
name: default
4-
5-
clone:
6-
7-
steps:
8-
- name: setup
9-
image: joomlaprojects/docker-images:php8.4
10-
volumes:
11-
- name: certificates
12-
path: /certificates
13-
commands:
14-
- cp -v tests/certs/* /certificates/
15-
16-
- name: composer
17-
image: joomlaprojects/docker-images:php8.4
18-
volumes:
19-
- name: composer-cache
20-
path: /tmp/composer-cache
21-
commands:
22-
- composer validate --no-check-all --strict
23-
- composer install --no-progress --ignore-platform-reqs
24-
25-
- name: phpcs
26-
image: joomlaprojects/docker-images:php8.1
27-
depends_on: [ composer ]
28-
commands:
29-
- echo $(date)
30-
- ./libraries/vendor/bin/php-cs-fixer fix -vvv --dry-run --diff
31-
- ./libraries/vendor/bin/phpcs --extensions=php -p --standard=ruleset.xml .
32-
- echo $(date)
33-
34-
- name: phpstan
35-
image: joomlaprojects/docker-images:php8.2
36-
depends_on: [ phpcs ]
37-
failure: ignore
38-
commands:
39-
- ./libraries/vendor/bin/phpstan
40-
41-
- name: npm
42-
image: node:20-bullseye-slim
43-
depends_on: [ phpcs ]
44-
volumes:
45-
- name: npm-cache
46-
path: /tmp/npm-cache
47-
environment:
48-
npm_config_cache: /tmp/npm-cache
49-
commands:
50-
- npm ci --unsafe-perm
51-
52-
- name: php81-unit
53-
depends_on: [ phpcs ]
54-
image: joomlaprojects/docker-images:php8.1
55-
commands:
56-
- php -v
57-
- ./libraries/vendor/bin/phpunit --testsuite Unit
58-
59-
- name: php82-unit
60-
depends_on: [ phpcs ]
61-
image: joomlaprojects/docker-images:php8.2
62-
commands:
63-
- php -v
64-
- ./libraries/vendor/bin/phpunit --testsuite Unit
65-
66-
- name: php83-unit
67-
depends_on: [ phpcs ]
68-
image: joomlaprojects/docker-images:php8.3
69-
commands:
70-
- php -v
71-
- ./libraries/vendor/bin/phpunit --testsuite Unit
72-
73-
- name: php84-unit
74-
depends_on: [ phpcs ]
75-
image: joomlaprojects/docker-images:php8.4
76-
commands:
77-
- php -v
78-
- ./libraries/vendor/bin/phpunit --testsuite Unit
79-
80-
- name: php81-integration
81-
depends_on: [ npm ]
82-
image: joomlaprojects/docker-images:php8.1
83-
commands:
84-
- php -v
85-
- ./libraries/vendor/bin/phpunit --testsuite Integration
86-
87-
- name: php82-integration
88-
depends_on: [ npm ]
89-
image: joomlaprojects/docker-images:php8.2
90-
commands:
91-
- php -v
92-
- ./libraries/vendor/bin/phpunit --testsuite Integration
93-
94-
- name: php83-integration
95-
depends_on: [ npm ]
96-
image: joomlaprojects/docker-images:php8.3
97-
commands:
98-
- php -v
99-
- ./libraries/vendor/bin/phpunit --testsuite Integration
100-
101-
- name: php84-integration
102-
depends_on: [ npm ]
103-
image: joomlaprojects/docker-images:php8.4
104-
commands:
105-
- php -v
106-
- ./libraries/vendor/bin/phpunit --testsuite Integration
107-
108-
- name: php81-integration-pgsql
109-
depends_on: [ npm ]
110-
image: joomlaprojects/docker-images:php8.1
111-
commands:
112-
- php -v
113-
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
114-
115-
- name: php82-integration-pgsql
116-
depends_on: [ npm ]
117-
image: joomlaprojects/docker-images:php8.2
118-
commands:
119-
- php -v
120-
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
121-
122-
- name: php83-integration-pgsql
123-
depends_on: [ npm ]
124-
image: joomlaprojects/docker-images:php8.3
125-
commands:
126-
- php -v
127-
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
128-
129-
- name: php84-integration-pgsql
130-
depends_on: [ npm ]
131-
image: joomlaprojects/docker-images:php8.4
132-
commands:
133-
- php -v
134-
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
135-
136-
- name: scss-cs
137-
depends_on: [ npm ]
138-
image: node:current-alpine
139-
commands:
140-
- npm run lint:css
141-
142-
- name: javascript-cs
143-
depends_on: [ npm ]
144-
image: node:current-alpine
145-
commands:
146-
- npm run lint:js
147-
- npm run lint:testjs
148-
149-
- name: prepare_system_tests
150-
depends_on:
151-
- npm
152-
image: joomlaprojects/docker-images:cypress8.4
153-
volumes:
154-
- name: cypress-cache
155-
path: /root/.cache/Cypress
156-
environment:
157-
CYPRESS_VERIFY_TIMEOUT: 100000
158-
commands:
159-
- cp cypress.config.dist.mjs cypress.config.mjs
160-
- npx cypress install
161-
- npx cypress verify
162-
163-
- name: phpmin-system-mysql
164-
depends_on:
165-
- prepare_system_tests
166-
image: joomlaprojects/docker-images:cypress8.1
167-
volumes:
168-
- name: cypress-cache
169-
path: /root/.cache/Cypress
170-
environment:
171-
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
172-
commands:
173-
- bash tests/System/entrypoint.sh "$(pwd)" cmysql mysqli mysql
174-
175-
- name: phpmax-system-mysql
176-
depends_on:
177-
- phpmin-system-mysql
178-
image: joomlaprojects/docker-images:cypress8.4
179-
volumes:
180-
- name: cypress-cache
181-
path: /root/.cache/Cypress
182-
environment:
183-
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
184-
commands:
185-
- bash tests/System/entrypoint.sh "$(pwd)" cmysqlmax mysqli mysql
186-
when:
187-
event:
188-
exclude:
189-
- pull_request
190-
191-
192-
- name: phpmin-system-postgres
193-
depends_on:
194-
- prepare_system_tests
195-
image: joomlaprojects/docker-images:cypress8.1
196-
volumes:
197-
- name: cypress-cache
198-
path: /root/.cache/Cypress
199-
environment:
200-
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
201-
commands:
202-
- bash tests/System/entrypoint.sh "$(pwd)" cpostgres pgsql postgres
203-
when:
204-
event:
205-
exclude:
206-
- pull_request
207-
208-
- name: phpmax-system-postgres
209-
depends_on:
210-
- phpmin-system-postgres
211-
image: joomlaprojects/docker-images:cypress8.4
212-
volumes:
213-
- name: cypress-cache
214-
path: /root/.cache/Cypress
215-
environment:
216-
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
217-
commands:
218-
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresmax pgsql postgres
219-
220-
- name: artifacts-system-tests
221-
image: joomlaprojects/docker-images:packager
222-
depends_on:
223-
- phpmax-system-mysql
224-
- phpmax-system-postgres
225-
- phpmin-system-mysql
226-
- phpmin-system-postgres
227-
environment:
228-
WEB_SERVER:
229-
from_secret: webserver
230-
FTP_KEY:
231-
from_secret: ftp_key
232-
FTP_USER:
233-
from_secret: ftp_user
234-
FTP_HOST:
235-
from_secret: ftp_host
236-
ARTIFACTS_ROOT:
237-
from_secret: artifacts_root
238-
GITHUB_TOKEN:
239-
from_secret: github_token
240-
commands:
241-
- export PLUGIN_DEST_DIR=$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
242-
- echo https://$WEB_SERVER/drone/$PLUGIN_DEST_DIR
243-
- mkdir -p ~/.ssh
244-
- eval $(ssh-agent -s)
245-
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
246-
- echo "$FTP_KEY" > ~/.ssh/id_rsa
247-
- chmod 600 ~/.ssh/id_rsa
248-
- ssh-add
249-
- rclone config create artifacts sftp host $FTP_HOST user $FTP_USER port 22
250-
- rclone mkdir artifacts:$ARTIFACTS_ROOT/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
251-
- rclone copy tests/System/output/ artifacts:$ARTIFACTS_ROOT/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
252-
- 'curl -X POST "https://api.github.com/repos/$DRONE_REPO/statuses/$DRONE_COMMIT" -H "Content-Type: application/json" -H "Authorization: token $GITHUB_TOKEN" -d "{\"state\":\"failure\", \"context\": \"Artifacts from Failure\", \"description\": \"You can find artifacts from the failure of the build here:\", \"target_url\": \"https://$WEB_SERVER/drone/$PLUGIN_DEST_DIR\"}" > /dev/null'
253-
when:
254-
status:
255-
- failure
256-
257-
volumes:
258-
- name: composer-cache
259-
host:
260-
path: /tmp/composer-cache
261-
- name: cypress-cache
262-
host:
263-
path: /tmp/cypress-cache
264-
- name: npm-cache
265-
host:
266-
path: /tmp/npm-cache
267-
- name: certificates
268-
host:
269-
path: /tmp/certificates
270-
271-
services:
272-
- name: mysql
273-
image: mysql:8.0
274-
command: ["--default-authentication-plugin=mysql_native_password"]
275-
environment:
276-
MYSQL_USER: joomla_ut
277-
MYSQL_PASSWORD: joomla_ut
278-
MYSQL_ROOT_PASSWORD: joomla_ut
279-
MYSQL_DATABASE: test_joomla
280-
281-
- name: postgres
282-
image: postgres:12-alpine
283-
ports:
284-
- 5432
285-
environment:
286-
POSTGRES_USER: root
287-
POSTGRES_PASSWORD: joomla_ut
288-
POSTGRES_DB: test_joomla
289-
290-
- name: openldap
291-
image: bitnami/openldap:latest
292-
ports:
293-
- 1389
294-
- 1636
295-
volumes:
296-
- name: certificates
297-
path: /certificates
298-
environment:
299-
LDAP_ADMIN_USERNAME: admin
300-
LDAP_ADMIN_PASSWORD: adminpassword
301-
LDAP_USERS: customuser
302-
LDAP_PASSWORDS: custompassword
303-
LDAP_ENABLE_TLS: yes
304-
LDAP_TLS_CERT_FILE: /certificates/openldap.crt
305-
LDAP_TLS_KEY_FILE: /certificates/openldap.key
306-
LDAP_TLS_CA_FILE: /certificates/CA.crt
307-
BITNAMI_DEBUG: true
308-
LDAP_CONFIG_ADMIN_ENABLED: yes
309-
LDAP_CONFIG_ADMIN_USERNAME: admin
310-
LDAP_CONFIG_ADMIN_PASSWORD: configpassword
311-
312-
---
3131
kind: pipeline
3142
name: package
3153

@@ -415,6 +103,6 @@ trigger:
415103

416104
---
417105
kind: signature
418-
hmac: 99da78521b10f37ddf6731e695fe52f85ee3db142bccac66901ae5372e332aae
106+
hmac: 8c9f8d28fda74e2a6fc508602dd07e9af7d9f4a5a13af769c6a53e6bd6e91389
419107

420108
...

‎.github/workflows/ci.yml‎

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

‎administrator/language/en-GB/install.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<extension client="administrator" type="language" method="upgrade">
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
5-
<version>5.3.2</version>
6-
<creationDate>2025-05</creationDate>
5+
<version>5.3.3</version>
6+
<creationDate>2025-07</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎administrator/language/en-GB/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="administrator">
33
<name>English (en-GB)</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</author>
77
<authorEmail>[email protected]</authorEmail>
88
<authorUrl>www.joomla.org</authorUrl>

‎administrator/manifests/files/joomla.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>5.3.2-dev</version>
10-
<creationDate>2025-05</creationDate>
9+
<version>5.3.3-dev</version>
10+
<creationDate>2025-07</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

1313
<scriptfile>administrator/components/com_admin/script.php</scriptfile>

‎administrator/manifests/packages/pkg_en-GB.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<extension type="package" method="upgrade">
33
<name>English (en-GB) Language Pack</name>
44
<packagename>en-GB</packagename>
5-
<version>5.3.2.1</version>
6-
<creationDate>2025-05</creationDate>
5+
<version>5.3.3.1</version>
6+
<creationDate>2025-07</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎api/language/en-GB/install.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<extension client="api" type="language" method="upgrade">
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
5-
<version>5.3.2</version>
6-
<creationDate>2025-05</creationDate>
5+
<version>5.3.3</version>
6+
<creationDate>2025-07</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎api/language/en-GB/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="api">
33
<name>English (en-GB)</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</author>
77
<authorEmail>[email protected]</authorEmail>
88
<authorUrl>www.joomla.org</authorUrl>

0 commit comments

Comments
 (0)