Skip to content

Commit d7ef03d

Browse files
Bodge-ITBodge-IT
authored
Merge pull request #44939 from Bodge-IT/upmerges/2025-02-19
[6.0] Upmerges - 2025-02-19
2 parents 1df90f5 + 97ae0cd commit d7ef03d

File tree

150 files changed

+684
-397
lines changed

Some content is hidden

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

150 files changed

+684
-397
lines changed

‎.drone.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ steps:
128128
- name: prepare_system_tests
129129
depends_on:
130130
- npm
131-
image: joomlaprojects/docker-images:cypress8.1
131+
image: joomlaprojects/docker-images:cypress8.4
132132
volumes:
133133
- name: cypress-cache
134134
path: /root/.cache/Cypress
135135
environment:
136136
CYPRESS_VERIFY_TIMEOUT: 100000
137137
commands:
138-
- mv cypress.config.dist.mjs cypress.config.mjs
138+
- cp cypress.config.dist.mjs cypress.config.mjs
139139
- npx cypress install
140140
- npx cypress verify
141141

@@ -149,19 +149,19 @@ steps:
149149
environment:
150150
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
151151
commands:
152-
- bash tests/System/drone-system-run.sh "$(pwd)" cmysql mysqli mysql
152+
- bash tests/System/entrypoint.sh "$(pwd)" cmysql mysqli mysql
153153

154154
- name: phpmax-system-mysql
155155
depends_on:
156156
- phpmin-system-mysql
157-
image: joomlaprojects/docker-images:cypress8.2
157+
image: joomlaprojects/docker-images:cypress8.3
158158
volumes:
159159
- name: cypress-cache
160160
path: /root/.cache/Cypress
161161
environment:
162162
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
163163
commands:
164-
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
164+
- bash tests/System/entrypoint.sh "$(pwd)" cmysqlmax mysqli mysql
165165
when:
166166
event:
167167
exclude:
@@ -170,7 +170,7 @@ steps:
170170
- name: phpnext-system-mysql
171171
depends_on:
172172
- phpmax-system-mysql
173-
image: joomlaprojects/docker-images:cypress8.3
173+
image: joomlaprojects/docker-images:cypress8.4
174174
volumes:
175175
- name: cypress-cache
176176
path: /root/.cache/Cypress
@@ -180,7 +180,7 @@ steps:
180180
commands:
181181
- echo "This test is disabled because php next is not stable yet"
182182
- exit 1
183-
- bash tests/System/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql
183+
- bash tests/System/entrypoint.sh "$(pwd)" cmysqlnext mysqli mysql
184184
when:
185185
event:
186186
exclude:
@@ -196,7 +196,7 @@ steps:
196196
environment:
197197
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
198198
commands:
199-
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
199+
- bash tests/System/entrypoint.sh "$(pwd)" cpostgres pgsql postgres
200200
when:
201201
event:
202202
exclude:
@@ -205,19 +205,19 @@ steps:
205205
- name: phpmax-system-postgres
206206
depends_on:
207207
- phpmin-system-postgres
208-
image: joomlaprojects/docker-images:cypress8.2
208+
image: joomlaprojects/docker-images:cypress8.3
209209
volumes:
210210
- name: cypress-cache
211211
path: /root/.cache/Cypress
212212
environment:
213213
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
214214
commands:
215-
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
215+
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresmax pgsql postgres
216216

217217
- name: phpnext-system-postgres
218218
depends_on:
219219
- phpmax-system-postgres
220-
image: joomlaprojects/docker-images:cypress8.3
220+
image: joomlaprojects/docker-images:cypress8.4
221221
volumes:
222222
- name: cypress-cache
223223
path: /root/.cache/Cypress
@@ -227,7 +227,7 @@ steps:
227227
commands:
228228
- echo "This test is disabled because php next is not stable yet"
229229
- exit 1
230-
- bash tests/System/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres
230+
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresnext pgsql postgres
231231
when:
232232
event:
233233
exclude:
@@ -433,6 +433,6 @@ trigger:
433433

434434
---
435435
kind: signature
436-
hmac: 1d94d558654c2898eea3360184eede03be6b48154c110579fe0254ea0780d91a
436+
hmac: fedcefde305c98f4dfc926b9039f83692827337da9e689e423c9de93a97248dd
437437

438438
...

‎administrator/components/com_actionlogs/src/Model/ActionlogModel.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected function sendNotificationEmails($messages, $username, $context)
126126
$query = $db->getQuery(true);
127127

128128
$query
129-
->select($db->quoteName(['u.email', 'u.username', 'l.extensions', 'l.exclude_self']))
129+
->select($db->quoteName(['u.email', 'l.extensions']))
130130
->from($db->quoteName('#__users', 'u'))
131131
->where($db->quoteName('u.block') . ' = 0')
132132
->join(
@@ -142,10 +142,6 @@ protected function sendNotificationEmails($messages, $username, $context)
142142
$recipients = [];
143143

144144
foreach ($users as $user) {
145-
if ($user->username === $this->getCurrentUser()->username && $user->exclude_self) {
146-
continue;
147-
}
148-
149145
$extensions = json_decode($user->extensions, true);
150146

151147
if ($extensions && \in_array(strtok($context, '.'), $extensions)) {

‎administrator/components/com_associations/src/Controller/AssociationController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AssociationController extends FormController
3939
*/
4040
public function edit($key = null, $urlVar = null)
4141
{
42-
list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'), 2);
42+
[$extensionName, $typeName] = explode('.', $this->input->get('itemtype', '', 'string'), 2);
4343

4444
$id = $this->input->get('id', 0, 'int');
4545

@@ -67,7 +67,7 @@ public function cancel($key = null)
6767
{
6868
$this->checkToken();
6969

70-
list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'), 2);
70+
[$extensionName, $typeName] = explode('.', $this->input->get('itemtype', '', 'string'), 2);
7171

7272
// Only check in, if component item type allows to check out.
7373
if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName)) {

‎administrator/components/com_associations/src/Controller/AssociationsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function checkin()
9494
$this->setRedirect(Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
9595

9696
// Figure out if the item supports checking and check it in
97-
list($extensionName, $typeName) = explode('.', $this->input->get('itemtype'));
97+
[$extensionName, $typeName] = explode('.', $this->input->get('itemtype'));
9898

9999
$extension = AssociationsHelper::getSupportedExtension($extensionName);
100100
$types = $extension->get('types');

‎administrator/components/com_associations/src/Dispatcher/Dispatcher.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function checkAccess()
4343
$itemType = $this->input->get('itemtype', '', 'string');
4444

4545
if ($itemType !== '') {
46-
list($extensionName, $typeName) = explode('.', $itemType);
46+
[$extensionName, $typeName] = explode('.', $itemType);
4747

4848
if (!AssociationsHelper::hasSupport($extensionName)) {
4949
throw new \Exception(

‎administrator/components/com_associations/src/Field/ItemlanguageField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function getOptions()
4646
{
4747
$input = Factory::getApplication()->getInput();
4848

49-
list($extensionName, $typeName) = explode('.', $input->get('itemtype', '', 'string'), 2);
49+
[$extensionName, $typeName] = explode('.', $input->get('itemtype', '', 'string'), 2);
5050

5151
// Get the extension specific helper method
5252
$helper = AssociationsHelper::getExtensionHelper($extensionName);

‎administrator/components/com_associations/src/Helper/AssociationsHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private static function getExtensionHelperClassName($extensionName)
193193
*/
194194
private static function getExtensionRealName($extensionName)
195195
{
196-
return strpos($extensionName, 'com_') === false ? $extensionName : substr($extensionName, 4);
196+
return !str_contains($extensionName, 'com_') ? $extensionName : substr($extensionName, 4);
197197
}
198198

199199
/**

‎administrator/components/com_associations/src/Model/AssociationsModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ protected function getListQuery()
154154
{
155155
$type = null;
156156

157-
list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'), 2);
157+
[$extensionName, $typeName] = explode('.', $this->state->get('itemtype'), 2);
158158

159159
$extension = AssociationsHelper::getSupportedExtension($extensionName);
160160
$types = $extension->get('types');

‎administrator/components/com_associations/src/View/Associations/HtmlView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function display($tpl = null)
140140
} elseif ($this->state->get('itemtype') != '' && $this->state->get('language') != '') {
141141
$type = null;
142142

143-
list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'), 2);
143+
[$extensionName, $typeName] = explode('.', $this->state->get('itemtype'), 2);
144144

145145
$extension = AssociationsHelper::getSupportedExtension($extensionName);
146146

‎administrator/components/com_banners/src/Model/BannerModel.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public function save($data)
417417
if ($createCategory && $this->canCreateCategory()) {
418418
$category = [
419419
// Remove #new# prefix, if exists.
420-
'title' => strpos($data['catid'], '#new#') === 0 ? substr($data['catid'], 5) : $data['catid'],
420+
'title' => str_starts_with($data['catid'], '#new#') ? substr($data['catid'], 5) : $data['catid'],
421421
'parent_id' => 1,
422422
'extension' => 'com_banners',
423423
'language' => $data['language'],
@@ -446,9 +446,9 @@ public function save($data)
446446
$origTable->load($input->getInt('id'));
447447

448448
if ($data['name'] == $origTable->name) {
449-
list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['name']);
450-
$data['name'] = $name;
451-
$data['alias'] = $alias;
449+
[$name, $alias] = $this->generateNewTitle($data['catid'], $data['alias'], $data['name']);
450+
$data['name'] = $name;
451+
$data['alias'] = $alias;
452452
} else {
453453
if ($data['alias'] == $origTable->alias) {
454454
$data['alias'] = '';

0 commit comments

Comments
 (0)