Skip to content

Commit be56882

Browse files
authored
Merge branch '6.0-dev' into alias-edit-article
2 parents 5e08947 + cbecdd5 commit be56882

File tree

1,261 files changed

+15938
-15709
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,261 files changed

+15938
-15709
lines changed

.drone.yml

Lines changed: 35 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ clone:
66

77
steps:
88
- name: setup
9-
image: joomlaprojects/docker-images:php8.3
9+
image: joomlaprojects/docker-images:php8.4
1010
volumes:
1111
- name: certificates
1212
path: /certificates
1313
commands:
1414
- cp -v tests/certs/* /certificates/
1515

1616
- name: composer
17-
image: joomlaprojects/docker-images:php8.3
17+
image: joomlaprojects/docker-images:php8.4
1818
volumes:
1919
- name: composer-cache
2020
path: /tmp/composer-cache
@@ -70,6 +70,13 @@ steps:
7070
- php -v
7171
- ./libraries/vendor/bin/phpunit --testsuite Unit
7272

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+
7380
- name: php81-integration
7481
depends_on: [ npm ]
7582
image: joomlaprojects/docker-images:php8.1
@@ -91,6 +98,13 @@ steps:
9198
- php -v
9299
- ./libraries/vendor/bin/phpunit --testsuite Integration
93100

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+
94108
- name: php81-integration-pgsql
95109
depends_on: [ npm ]
96110
image: joomlaprojects/docker-images:php8.1
@@ -112,6 +126,13 @@ steps:
112126
- php -v
113127
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
114128

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+
115136
- name: scss-cs
116137
depends_on: [ npm ]
117138
image: node:current-alpine
@@ -128,14 +149,14 @@ steps:
128149
- name: prepare_system_tests
129150
depends_on:
130151
- npm
131-
image: joomlaprojects/docker-images:systemtests8.1
152+
image: joomlaprojects/docker-images:cypress8.4
132153
volumes:
133154
- name: cypress-cache
134155
path: /root/.cache/Cypress
135156
environment:
136157
CYPRESS_VERIFY_TIMEOUT: 100000
137158
commands:
138-
- mv cypress.config.dist.mjs cypress.config.mjs
159+
- cp cypress.config.dist.mjs cypress.config.mjs
139160
- npx cypress install
140161
- npx cypress verify
141162

@@ -149,42 +170,24 @@ steps:
149170
environment:
150171
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
151172
commands:
152-
- bash tests/System/drone-system-run.sh "$(pwd)" cmysql mysqli mysql
173+
- bash tests/System/entrypoint.sh "$(pwd)" cmysql mysqli mysql
153174

154175
- name: phpmax-system-mysql
155176
depends_on:
156177
- phpmin-system-mysql
157-
image: joomlaprojects/docker-images:cypress8.2
178+
image: joomlaprojects/docker-images:cypress8.4
158179
volumes:
159180
- name: cypress-cache
160181
path: /root/.cache/Cypress
161182
environment:
162183
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
163184
commands:
164-
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
185+
- bash tests/System/entrypoint.sh "$(pwd)" cmysqlmax mysqli mysql
165186
when:
166187
event:
167188
exclude:
168189
- pull_request
169190

170-
- name: phpnext-system-mysql
171-
depends_on:
172-
- phpmax-system-mysql
173-
image: joomlaprojects/docker-images:cypress8.3
174-
volumes:
175-
- name: cypress-cache
176-
path: /root/.cache/Cypress
177-
environment:
178-
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
179-
failure: ignore
180-
commands:
181-
- echo "This test is disabled because php next is not stable yet"
182-
- exit 1
183-
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql
184-
when:
185-
event:
186-
exclude:
187-
- pull_request
188191

189192
- name: phpmin-system-postgres
190193
depends_on:
@@ -196,7 +199,7 @@ steps:
196199
environment:
197200
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
198201
commands:
199-
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
202+
- bash tests/System/entrypoint.sh "$(pwd)" cpostgres pgsql postgres
200203
when:
201204
event:
202205
exclude:
@@ -205,39 +208,18 @@ steps:
205208
- name: phpmax-system-postgres
206209
depends_on:
207210
- phpmin-system-postgres
208-
image: joomlaprojects/docker-images:cypress8.2
209-
volumes:
210-
- name: cypress-cache
211-
path: /root/.cache/Cypress
212-
environment:
213-
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
214-
commands:
215-
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
216-
217-
- name: phpnext-system-postgres
218-
depends_on:
219-
- phpmax-system-postgres
220-
image: joomlaprojects/docker-images:cypress8.3
211+
image: joomlaprojects/docker-images:cypress8.4
221212
volumes:
222213
- name: cypress-cache
223214
path: /root/.cache/Cypress
224215
environment:
225216
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
226-
failure: ignore
227217
commands:
228-
- echo "This test is disabled because php next is not stable yet"
229-
- exit 1
230-
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres
231-
when:
232-
event:
233-
exclude:
234-
- pull_request
218+
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresmax pgsql postgres
235219

236220
- name: artifacts-system-tests
237221
image: joomlaprojects/docker-images:packager
238222
depends_on:
239-
- phpnext-system-mysql
240-
- phpnext-system-postgres
241223
- phpmax-system-mysql
242224
- phpmax-system-postgres
243225
- phpmin-system-mysql
@@ -410,15 +392,16 @@ steps:
410392
- rclone delete nightly:/home/devj/public_html/nightlies/ --include "Joomla_$MINORVERSION.*"
411393
- rclone delete nightly:/home/devj/public_html/cache/com_content/
412394
- rclone copy ./transfer/ nightly:/home/devj/public_html/nightlies/
413-
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.2](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
395+
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla ${MINORVERSION}](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
414396

415397
- name: buildfailure
416398
image: joomlaprojects/docker-images:packager
417399
environment:
418400
MATTERMOST_NIGHTLY_HOOK:
419401
from_secret: mattermost_nightly_hook
420402
commands:
421-
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.2](https://developer.joomla.org/nightly-builds.html) FAILED to build."}' $MATTERMOST_NIGHTLY_HOOK
403+
- export MINORVERSION=${DRONE_BRANCH%-*}
404+
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla ${MINORVERSION}](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
422405
when:
423406
status:
424407
- failure
@@ -432,6 +415,6 @@ trigger:
432415

433416
---
434417
kind: signature
435-
hmac: 10ae86041b814459e0a4618a7fa2356480177af7966412cc050e9902e9384cbe
418+
hmac: 99da78521b10f37ddf6731e695fe52f85ee3db142bccac66901ae5372e332aae
436419

437420
...

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ insert_final_newline = true
1515
indent_style = space
1616
indent_size = 4
1717

18-
[*.{js,json,scss,css,yml,vue}]
18+
[*.{mjs,js,json,scss,css,yml,vue}]
1919
indent_style = space
2020
indent_size = 2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
env:
1414
JOOMLA_MAJOR_VERSION: 5
15-
JOOMLA_MINOR_VERSION: 5.2
15+
JOOMLA_MINOR_VERSION: 5.3
1616

1717
permissions:
1818
contents: read
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Update static error pages
6262
run: |
63-
npm ci --ignore-scripts && node build/build.js --build-pages
63+
npm ci --ignore-scripts && node build/build.mjs --build-pages
6464
6565
- name: Create commit
6666
continue-on-error: true

.php-cs-fixer.dist.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
// Arrays on multiline should have a trailing comma
7777
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
7878
// Align elements in multiline array and variable declarations on new lines below each other
79-
'binary_operator_spaces' => ['operators' => ['=>' => 'align_single_space_minimal', '=' => 'align']],
79+
'binary_operator_spaces' => ['operators' => ['=>' => 'align_single_space_minimal', '=' => 'align', '??=' => 'align']],
8080
// The "No break" comment in switch statements
8181
'no_break_comment' => ['comment_text' => 'No break'],
8282
// Remove unused imports
@@ -91,6 +91,14 @@
9191
'native_function_invocation' => ['include' => ['@compiler_optimized']],
9292
// Adds null to type declarations when parameter have a default null value
9393
'nullable_type_declaration_for_default_null_value' => true,
94+
// Removes unneeded parentheses around control statements
95+
'no_unneeded_control_parentheses' => true,
96+
// Using isset($var) && multiple times should be done in one call.
97+
'combine_consecutive_issets' => true,
98+
// Calling unset on multiple items should be done in one call
99+
'combine_consecutive_unsets' => true,
100+
// There must be no sprintf calls with only the first argument
101+
'no_useless_sprintf' => true,
94102
]
95103
)
96104
->setFinder($finder);

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
Joomla! CMS™
22
====================
33

4+
The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
5+
------------------------------------------------------------------------------------------------------
6+
47
Build Status
58

69
| Drone-CI | AppVeyor | PHP | Node | npm |
710
|------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
8-
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.2-dev?svg=true)](https://ci.appveyor.com/project/release-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/) |
11+
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=6.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/6.0-dev?svg=true)](https://ci.appveyor.com/project/release-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/) |
912

1013
Overview
1114
---------------------
12-
* This is the source of Joomla! 5.x.
15+
* This is the source of Joomla! 6.x.
1316
* Joomla's [Official website](https://www.joomla.org).
14-
* Joomla! 5.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.2_version_history).
15-
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.2-dev).
17+
* Joomla! 6.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history).
18+
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.0-dev).
1619

1720
What is Joomla?
1821
---------------------
@@ -45,9 +48,9 @@ git clone https://github.com/joomla/joomla-cms.git
4548
```bash
4649
cd joomla-cms
4750
```
48-
- Go to the 5.2-dev branch:
51+
- Go to the 6.0-dev branch:
4952
```bash
50-
git checkout 5.2-dev
53+
git checkout 6.0-dev
5154
```
5255
- Install all the needed composer packages:
5356
```bash

README.txt

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

3+
The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
4+
------------------------------------------------------------------------------------------------------
5+
36
1- Overview
4-
* This is a Joomla! 5.x installation/upgrade package.
7+
* This is a Joomla! 6.x installation/upgrade package.
58
* Joomla! Official site: https://www.joomla.org
6-
* Joomla! 5.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.2_version_history
7-
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.2-dev
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
811

912
2- What is Joomla?
1013
* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
@@ -20,10 +23,10 @@ Joomla! CMS™
2023
4- How to find a Joomla! translation?
2124
* Repository of accredited language packs: https://downloads.joomla.org/language-packs
2225
* 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
26+
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J6.x:Setup_a_Multilingual_Site
2427

2528
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!
29+
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J6.x:Getting_Started_with_Joomla!
2730
* Before installing, read the beginners guide: https://docs.joomla.org/Special:MyLanguage/Portal:Beginners
2831

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

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
60+
11- Do you already have a Joomla! site that's not built with Joomla! 6.x ?
61+
* What's new in Joomla! 6.x: https://www.joomla.org/6
62+
* 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
63+
* 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
6064
* 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
6165
* 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
6266
* 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/actionlogs.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<file>actionlogs.xml</file>
1717
<file>config.xml</file>
1818
<folder>forms</folder>
19-
<folder>layouts</folder>
2019
<folder>services</folder>
2120
<folder>src</folder>
2221
<folder>tmpl</folder>

administrator/components/com_actionlogs/forms/filter_actionlogs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</field>
2828
<field
2929
name="user"
30-
type="logcreator"
30+
type="user"
3131
label="COM_ACTIONLOGS_NAME"
3232
class="js-select-submit-on-change"
3333
>

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

Lines changed: 6 additions & 6 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
*
@@ -87,7 +87,7 @@ public function exportLogs()
8787
if (\count($data)) {
8888
try {
8989
$rows = ActionlogsHelper::getCsvData($data);
90-
} catch (\InvalidArgumentException $exception) {
90+
} catch (\InvalidArgumentException) {
9191
$this->setMessage(Text::_('COM_ACTIONLOGS_ERROR_COULD_NOT_EXPORT_DATA'), 'error');
9292
$this->setRedirect(Route::_('index.php?option=com_actionlogs&view=actionlogs', false));
9393

0 commit comments

Comments
 (0)