Skip to content

Commit d0b39b7

Browse files
authored
Merge branch '6.1-dev' into 60-admin-menuitem-filter-featured
2 parents 36d7349 + 12ce887 commit d0b39b7

File tree

176 files changed

+1106
-939
lines changed

Some content is hidden

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

176 files changed

+1106
-939
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins/finder/* @hackwar
99
build/build.php @rdeutz
1010
build/bump.php @rdeutz
1111
build/deleted_file_check.php @rdeutz
12+
.drone.yml @rdeutz @hackwar
1213

1314
# Core/Extension Install/Update Tools
1415
administrator/components/com_joomlaupdate/* @rdeutz
@@ -19,9 +20,7 @@ libraries/src/Updater/* @rdeutz
1920
.github/workflows/ci.yml @rdeutz @hackwar @laoneo
2021
tests/* @hackwar @laoneo
2122
tests/Unit/* @rdeutz @laoneo
22-
.drone.yml @rdeutz @hackwar @laoneo
2323
phpunit.xml.dist @rdeutz @hackwar @laoneo
24-
phpunit-pgsql.xml.dist @rdeutz @hackwar @laoneo
2524
phpunit-windows.xml.dist @rdeutz @hackwar @laoneo
2625

2726
# Workflow

.github/CONTRIBUTING.md

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,41 @@
11
Contributing to the Joomla! CMS™
2-
===============
3-
You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but, before it will be accepted, we ask that you follow these simple guidelines:
2+
================================
43

5-
* If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions. Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature. In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
4+
You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but,
5+
before it will be accepted, we ask that you follow these simple guidelines:
66

7-
* If you have found a bug, open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you so you do not have to create an issue, if you are creating a pull request.
7+
* If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions.
8+
Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature.
9+
In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
10+
11+
* If you have found a bug, open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub.
12+
If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue
13+
for you so you do not have to create an issue, if you are creating a pull request.
814

915
* Follow the [Joomla! Coding Standards](https://manual.joomla.org/docs/get-started/codestyle) for code contributions.
1016

11-
* When filing an issue or opening a Pull Request(PR), please include a clear title and description. The title should be a short summary of the issue. For example, `Invalid Query in com_admin`. All issues and PRs should include a description with as much detail as possible. If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
17+
* When filing an issue or opening a Pull Request(PR), please include a clear title and description.
18+
The title should be a short summary of the issue. For example, `Invalid Query in com_admin`. All issues and PRs
19+
should include a description with as much detail as possible. If it is a PR, include what the issue is, what the
20+
PR is addressing, testing instructions and environmental information (PHP version, database driver and version,
21+
and other data you can retrieve from your site's system information view) in case the issue is specific to certain
22+
environments. If additional information is needed, please be prepared to provide it as our community members
23+
review your submission.
1224

13-
* Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. Find [here](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme) more information about the [Security Policies and Procedures](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme).
25+
* Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use
26+
the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker
27+
for security issues. Find [here](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme) more information
28+
about the [Security Policies and Procedures](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme).
1429

15-
Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
30+
Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS
31+
is done by volunteers) and be receptive to feedback about your code.
1632

1733
#### Branches
1834
Bug fixing PRs should be made to the `5.4-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `6.1-dev`.
1935

20-
2136
| Branch | Purpose |
2237
|---------|-----------------------------------------------------------------------------------------|
2338
| 5.4-dev | Branch for the current 5.x Joomla version. |
2439
| 6.0-dev | Branch for the current 6.x Joomla version. Bugfixes only for 6.x go into this branch. |
2540
| 6.1-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch. |
41+
| 7.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |

.github/workflows/ci.yml

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,31 @@ jobs:
134134
strategy:
135135
matrix:
136136
php_version: ['8.3', '8.4']
137-
config: ['phpunit.xml.dist', 'phpunit-pgsql.xml.dist']
137+
config:
138+
- my_version: '8.4'
139+
engine: 'mysqli'
140+
host: 'mysql'
141+
user: 'joomla_ut'
142+
- my_version: '8.0.13'
143+
engine: 'mysqli'
144+
host: 'mysql'
145+
user: 'joomla_ut'
146+
- maria_version: '12.0'
147+
engine: 'mysqli'
148+
host: 'maria'
149+
user: 'joomla_ut'
150+
- maria_version: '10.4'
151+
engine: 'mysqli'
152+
host: 'maria'
153+
user: 'joomla_ut'
154+
- pg_version: '12.0'
155+
engine: 'pgsql'
156+
host: 'postgres'
157+
user: 'root'
158+
- pg_version: '18.0'
159+
engine: 'pgsql'
160+
host: 'postgres'
161+
user: 'root'
138162
steps:
139163
- uses: actions/checkout@v4
140164
- name: Start LDAP container
@@ -146,23 +170,36 @@ jobs:
146170
path: libraries/vendor
147171
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
148172
- name: Run Integration tests
173+
env:
174+
JTEST_DB_ENGINE: ${{ matrix.config.engine }}
175+
JTEST_DB_HOST: ${{ matrix.config.host }}
176+
JTEST_DB_USER: ${{ matrix.config.user }}
177+
JTEST_DB_NAME: test_joomla
178+
JTEST_DB_PASSWORD: joomla_ut
149179
run: |
150180
sleep 3
151-
./libraries/vendor/bin/phpunit --testsuite Integration --configuration ${{ matrix.config }}
181+
./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit.xml.dist
152182
- name: Stop LDAP container
153183
uses: docker://docker
154184
with:
155185
args: docker kill openldap
156186
services:
157187
mysql:
158-
image: mariadb
188+
image: mysql:${{ matrix.config.my_version || '8.4' }}
189+
env:
190+
MYSQL_USER: joomla_ut
191+
MYSQL_PASSWORD: joomla_ut
192+
MYSQL_ROOT_PASSWORD: joomla_ut
193+
MYSQL_DATABASE: test_joomla
194+
maria:
195+
image: mariadb:${{ matrix.config.maria_version || '12.0' }}
159196
env:
160197
MARIADB_USER: joomla_ut
161198
MARIADB_PASSWORD: joomla_ut
162199
MARIADB_ROOT_PASSWORD: joomla_ut
163200
MARIADB_DATABASE: test_joomla
164201
postgres:
165-
image: postgres:12-alpine
202+
image: postgres:${{ matrix.config.pg_version || '18' }}-alpine
166203
env:
167204
POSTGRES_USER: root
168205
POSTGRES_PASSWORD: joomla_ut
@@ -270,18 +307,32 @@ jobs:
270307
test_group: cmysqlmax
271308
db_engine: mysqli
272309
db_host: mysql
310+
my_version: '8.4'
273311
- php_version: '8.3'
274312
test_group: cmysql
275313
db_engine: mysqli
276314
db_host: mysql
315+
my_version: '8.0.13'
316+
- php_version: '8.4'
317+
test_group: cmariamax
318+
db_engine: mysqli
319+
db_host: maria
320+
maria_version: '12.0'
321+
- php_version: '8.3'
322+
test_group: cmaria
323+
db_engine: mysqli
324+
db_host: maria
325+
maria_version: '10.4'
277326
- php_version: '8.3'
278327
test_group: cpostgres
279328
db_engine: pgsql
280329
db_host: postgres
330+
pg_version: '12.0'
281331
- php_version: '8.4'
282332
test_group: cpostgresmax
283333
db_engine: pgsql
284334
db_host: postgres
335+
pg_version: '18.0'
285336
env:
286337
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
287338
steps:
@@ -313,14 +364,21 @@ jobs:
313364
if-no-files-found: ignore
314365
services:
315366
mysql:
316-
image: mariadb
367+
image: mysql:${{ matrix.config.my_version || '8.4' }}
368+
env:
369+
MYSQL_USER: joomla_ut
370+
MYSQL_PASSWORD: joomla_ut
371+
MYSQL_ROOT_PASSWORD: joomla_ut
372+
MYSQL_DATABASE: test_joomla
373+
maria:
374+
image: mariadb:${{ matrix.config.maria_version || '12.0' }}
317375
env:
318376
MARIADB_USER: joomla_ut
319377
MARIADB_PASSWORD: joomla_ut
320378
MARIADB_ROOT_PASSWORD: joomla_ut
321379
MARIADB_DATABASE: test_joomla
322380
postgres:
323-
image: postgres:12-alpine
381+
image: postgres:${{ matrix.config.pg_version || '18' }}-alpine
324382
env:
325383
POSTGRES_USER: root
326384
POSTGRES_PASSWORD: joomla_ut

.github/workflows/create-translation-pull-request-v5.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
with:
3232
ref: translation5
3333
fetch-depth: 0
34+
token: ${{ secrets.PAT_WORKFLOW }}
3435
- uses: actions/setup-node@v5
3536
with:
3637
node-version: 24

.github/workflows/create-translation-pull-request-v6.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
with:
3232
ref: translation6
3333
fetch-depth: 0
34+
token: ${{ secrets.PAT_WORKFLOW }}
3435
- uses: actions/setup-node@v5
3536
with:
3637
node-version: 24

README.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
Joomla! CMS™
2-
====================
2+
============
33

4-
The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
5-
------------------------------------------------------------------------------------------------------
4+
## The Joomla! 6.1 branch is under heavy development and not all links in this document are available yet
65

7-
Build Status
8-
------------
6+
## Build Status
97

108
| Actions | PHP | Node | npm |
119
|-------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
12-
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=6.0-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.3.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
10+
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=6.1-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.3.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
11+
12+
## Overview
1313

14-
Overview
15-
---------------------
1614
* This is the source of Joomla! 6.x.
1715
* Joomla's [Official website](https://www.joomla.org).
18-
* Joomla! 6.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history).
19-
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.0-dev).
16+
* Joomla! 6.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.1_version_history).
17+
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.1-dev).
18+
* Release Managers responsible for Joomla! 6.1
19+
* Stefan Wendhausen @tecpromotion
20+
* Harald Leithner @HLeithner
21+
22+
## What is Joomla?
2023

21-
What is Joomla?
22-
---------------------
2324
* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
2425
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, MariaDB or PostgreSQL to run. You can find [full technical requirements here](https://downloads.joomla.org/technical-requirements).
2526
* Joomla! is **free and Open Source software** distributed under the GNU General Public License version 2 or later.
2627

27-
Looking for an installable package?
28-
---------------------
28+
## Looking for an installable package?
29+
2930
Joomla is not installable out of the box from this repository, please use:
3031
- For the latest stable package: https://downloads.joomla.org
3132
- For a nightly package: https://developer.joomla.org/nightly-builds.html
3233

33-
How to get a working installation from the source
34-
---------------------
34+
## How to get a working installation from the source
35+
3536
For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J5.x:Setting_Up_Your_Local_Environment
3637

3738
You will need:
@@ -49,9 +50,9 @@ git clone https://github.com/joomla/joomla-cms.git
4950
```bash
5051
cd joomla-cms
5152
```
52-
- Go to the 6.0-dev branch:
53+
- Go to the 6.1-dev branch:
5354
```bash
54-
git checkout 6.0-dev
55+
git checkout 6.1-dev
5556
```
5657
- Install all the needed composer packages:
5758
```bash
@@ -67,8 +68,8 @@ Joomla creates a cache of the namespaces of its extensions in `JOOMLA_ROOT/admin
6768
extensions are created, deleted or removed in git then this file needs to be recreated. You can simply delete the file
6869
and it will be regenerated on the next call to Joomla.
6970

70-
Do you want to improve Joomla?
71-
--------------------
71+
## Do you want to improve Joomla?
72+
7273
* Where to [request a feature](https://issues.joomla.org)?
7374
* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org)?
7475
* How to [submit code](https://manual.joomla.org/docs/get-started/git/) to the Joomla CMS using a Pull Request?
@@ -77,8 +78,8 @@ Do you want to improve Joomla?
7778
* Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
7879
* Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
7980

80-
Copyright
81-
---------------------
81+
## Copyright
82+
8283
* (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
8384
* Distributed under the GNU General Public License version 2 or later
8485
* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)

README.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
Joomla! CMS™
22

3-
The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
3+
The Joomla! 6.1 branch is under heavy development and not all links in this document are available yet
44
------------------------------------------------------------------------------------------------------
55

66
1- Overview
77
* This is a Joomla! 6.x installation/upgrade package.
88
* Joomla! Official site: https://www.joomla.org
9-
* Joomla! 6.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history
10-
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.0-dev
9+
* Joomla! 6.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.1_version_history
10+
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.1-dev
11+
* Release Managers responsible for Joomla! 6.1
12+
* Stefan Wendhausen @tecpromotion
13+
* Harald Leithner @HLeithner
1114

1215
2- What is Joomla?
1316
* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
@@ -51,6 +54,7 @@ The Joomla! 6.0 branch is under heavy development and not all links in this docu
5154

5255
10- Where can you get support and help?
5356
* The Joomla! Documentation: https://docs.joomla.org/Special:MyLanguage/Main_Page
57+
* Developer Documentation: https://manual.joomla.org/docs/
5458
* FAQ Frequently Asked Questions: https://docs.joomla.org/Special:MyLanguage/Category:FAQ
5559
* Find the information you need: https://docs.joomla.org/Special:MyLanguage/Start_here
5660
* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html

administrator/components/com_banners/helpers/banners.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 1.6
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Banners\Administrator\Helper\BannersHelper instead
2424
*/
2525
class BannersHelper extends \Joomla\Component\Banners\Administrator\Helper\BannersHelper

administrator/components/com_categories/helpers/categories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 1.6
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper instead
2424
*/
2525
class CategoriesHelper extends \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper

administrator/components/com_categories/src/Model/CategoryModel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,7 @@ protected function cleanCache($group = null)
12311231
switch ($extension) {
12321232
case 'com_content':
12331233
parent::cleanCache('com_content');
1234+
parent::cleanCache('mod_articles');
12341235
parent::cleanCache('mod_articles_archive');
12351236
parent::cleanCache('mod_articles_categories');
12361237
parent::cleanCache('mod_articles_category');

0 commit comments

Comments
 (0)