Skip to content

Commit d1c714c

Browse files
richard67richard67
authored
Merge branch '6.0-dev' into fix-pagebreak-null-item
2 parents 69a0e27 + c52a560 commit d1c714c

File tree

1,465 files changed

+13034
-34977
lines changed

Some content is hidden

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

1,465 files changed

+13034
-34977
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Start from the official PHP 8.2 image with Apache
2-
FROM php:8.2-apache-bookworm
1+
# Start from the official PHP 8.3 image with Apache
2+
FROM php:8.3-apache-bookworm
33

44
# Install system dependencies, Node.js, Composer, and Cypress dependencies
55
RUN apt-get update && apt-get install -y \

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
needs: [code-style-php]
117117
strategy:
118118
matrix:
119-
php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
119+
php_version: ['8.3', '8.4', '8.5']
120120
steps:
121121
- uses: actions/checkout@v4
122122
- uses: actions/cache/restore@v4
@@ -133,7 +133,7 @@ jobs:
133133
needs: [code-style-php]
134134
strategy:
135135
matrix:
136-
php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
136+
php_version: ['8.3', '8.4', '8.5']
137137
config:
138138
- my_version: '8.4'
139139
engine: 'mysqli'
@@ -211,7 +211,7 @@ jobs:
211211
needs: [code-style-php]
212212
strategy:
213213
matrix:
214-
php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
214+
php_version: ['8.3', '8.4', '8.5']
215215
steps:
216216
- uses: actions/checkout@v4
217217
- uses: actions/cache/restore@v4
@@ -237,7 +237,7 @@ jobs:
237237
needs: [code-style-php]
238238
strategy:
239239
matrix:
240-
php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
240+
php_version: ['8.3', '8.4', '8.5']
241241
steps:
242242
- uses: actions/checkout@v4
243243
- uses: actions/cache/restore@v4
@@ -308,7 +308,7 @@ jobs:
308308
db_engine: mysqli
309309
db_host: mysql
310310
my_version: '8.4'
311-
- php_version: '8.1'
311+
- php_version: '8.3'
312312
test_group: cmysql
313313
db_engine: mysqli
314314
db_host: mysql
@@ -318,12 +318,12 @@ jobs:
318318
db_engine: mysqli
319319
db_host: maria
320320
maria_version: '12.0'
321-
- php_version: '8.1'
321+
- php_version: '8.3'
322322
test_group: cmaria
323323
db_engine: mysqli
324324
db_host: maria
325325
maria_version: '10.4'
326-
- php_version: '8.1'
326+
- php_version: '8.3'
327327
test_group: cpostgres
328328
db_engine: pgsql
329329
db_host: postgres

‎.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

‎.github/workflows/typos.toml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
[files]
77
extend-exclude = [
88
"/templates/system/*.html",
9-
"/administrator/components/com_admin/sql/*",
109
"/build/media_source/vendor/tinymce/langs/*",
1110
"/installation/language/*",
12-
"includes/*.html",
11+
"!/installation/language/en-GB/",
12+
"/includes/*.html",
1313
"/plugins/sampledata/testing/*",
1414
]
1515

@@ -40,9 +40,3 @@ supercedes="supercedes" # Valid spelling rejected https://github.com/crate-c
4040
ue="ue" # selector in queries
4141
vertexes="vertexes" # Valid spelling waiting fix https://github.com/crate-ci/typos/issues/1150
4242
wheres="wheres" # $wheres in modules\mod_related_items\src\Helper\RelatedItemsHelper.php
43-
44-
# deprecated strings can be removed in 6.0
45-
configurated="configurated"
46-
discernable="discernable"
47-
hilight="hilight"
48-
mis="mis"

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
.docker
99
/docker-compose.yml
1010
/nbproject
11+
/.devcontainer
12+
/.github
13+
/.vscode
1114

1215
# Local System Files (i.e. cache, logs, etc.)
1316
/administrator/cache

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ Build Status
66

77
| Actions | PHP | Node | npm |
88
|-------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
9-
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=5.4-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.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/) |
9+
| [![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/) |
1010

1111
Overview
1212
---------------------
13-
* This is the source of Joomla! 5.x.
13+
* This is the source of Joomla! 6.x.
1414
* Joomla's [Official website](https://www.joomla.org).
15-
* Joomla! 5.4 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.4_version_history).
16-
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.4-dev).
15+
* Joomla! 6.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history).
16+
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.0-dev).
1717

1818
What is Joomla?
1919
---------------------
@@ -46,9 +46,9 @@ git clone https://github.com/joomla/joomla-cms.git
4646
```bash
4747
cd joomla-cms
4848
```
49-
- Go to the 5.4-dev branch:
49+
- Go to the 6.0-dev branch:
5050
```bash
51-
git checkout 5.4-dev
51+
git checkout 6.0-dev
5252
```
5353
- Install all the needed composer packages:
5454
```bash

‎README.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Joomla! CMS™
22

33
1- Overview
4-
* This is a Joomla! 5.x installation/upgrade package.
4+
* This is a Joomla! 6.x installation/upgrade package.
55
* Joomla! Official site: https://www.joomla.org
6-
* Joomla! 5.4 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.4_version_history
7-
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.4-dev
6+
* Joomla! 6.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history
7+
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.0-dev
88

99
2- What is Joomla?
1010
* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
@@ -20,10 +20,10 @@ Joomla! CMS™
2020
4- How to find a Joomla! translation?
2121
* Repository of accredited language packs: https://downloads.joomla.org/language-packs
2222
* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site/Installing_New_Language
23-
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site
23+
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J6.x:Setup_a_Multilingual_Site
2424

2525
5- Learn Joomla!
26-
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J5.x:Getting_Started_with_Joomla!
26+
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J6.x:Getting_Started_with_Joomla!
2727
* Before installing, read the beginners guide: https://docs.joomla.org/Special:MyLanguage/Portal:Beginners
2828

2929
6- What are the benefits of Joomla?
@@ -54,9 +54,10 @@ Joomla! CMS™
5454
* Post questions at our forums: https://forum.joomla.org
5555
* Joomla! Resources Directory (JRD): https://community.joomla.org/service-providers-directory/
5656

57-
11- Do you already have a Joomla! site that's not built with Joomla! 5.x ?
58-
* What's new in Joomla! 5.x: https://www.joomla.org/5
59-
* What are the main differences between 4.x and 5.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_4.x_and_5.x
57+
11- Do you already have a Joomla! site that's not built with Joomla! 6.x ?
58+
* What's new in Joomla! 6.x: https://www.joomla.org/6
59+
* What are the main differences between 5.x and 6.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_5.x_and_6.x
60+
* How to migrate from 5.x to 6.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_5.x_to_6.x_Step_by_Step_Migration
6061
* How to migrate from 4.x to 5.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_4.x_to_5.x_Step_by_Step_Migration
6162
* How to migrate from 3.x to 4.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_3.x_to_4.x_Step_by_Step_Migration
6263
* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration

‎administrator/components/com_actionlogs/src/Controller/ActionlogsController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
use Joomla\CMS\Component\ComponentHelper;
1515
use Joomla\CMS\Date\Date;
1616
use Joomla\CMS\Event\ActionLog\AfterLogExportEvent;
17-
use Joomla\CMS\Input\Input;
1817
use Joomla\CMS\Language\Text;
1918
use Joomla\CMS\MVC\Controller\AdminController;
2019
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
2120
use Joomla\CMS\Router\Route;
2221
use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
2322
use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
23+
use Joomla\Input\Input;
2424
use Joomla\Utilities\ArrayHelper;
2525

2626
// phpcs:disable PSR1.Files.SideEffects
@@ -38,11 +38,11 @@ class ActionlogsController extends AdminController
3838
* Constructor.
3939
*
4040
* @param array $config An optional associative array of configuration settings.
41-
* Recognized key values include 'name', 'default_task', 'model_path', and
42-
* 'view_path' (this list is not meant to be comprehensive).
41+
* Recognized key values include 'name', 'default_task', 'model_path', and
42+
* 'view_path' (this list is not meant to be comprehensive).
4343
* @param ?MVCFactoryInterface $factory The factory.
44-
* @param CMSApplication $app The Application for the dispatcher
45-
* @param Input $input Input
44+
* @param ?CMSApplication $app The Application for the dispatcher
45+
* @param ?Input $input Input
4646
*
4747
* @since 3.9.0
4848
*

‎administrator/components/com_actionlogs/src/Field/ExtensionField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ExtensionField extends ListField
4444
public function getOptions()
4545
{
4646
$db = $this->getDatabase();
47-
$query = $db->getQuery(true)
47+
$query = $db->createQuery()
4848
->select('DISTINCT ' . $db->quoteName('extension'))
4949
->from($db->quoteName('#__action_logs'))
5050
->order($db->quoteName('extension'));

‎administrator/components/com_actionlogs/src/Field/LogcreatorField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function getOptions()
5959
$db = $this->getDatabase();
6060

6161
// Construct the query
62-
$query = $db->getQuery(true)
62+
$query = $db->createQuery()
6363
->select($db->quoteName('u.id', 'value'))
6464
->select($db->quoteName('u.username', 'text'))
6565
->from($db->quoteName('#__users', 'u'))

0 commit comments

Comments
 (0)