Skip to content

Commit 2ca56fc

Browse files
authored
[6.0] Upmerges - 2025-05-28
Merge pull request joomla#45534 from Bodge-IT/upmerges/2025-05-28
2 parents 08acdaf + 0f7cd8d commit 2ca56fc

File tree

16 files changed

+54
-54
lines changed

16 files changed

+54
-54
lines changed

administrator/components/com_joomlaupdate/src/Controller/UpdateController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ public function ajax()
721721
*
722722
* @return void
723723
*
724-
* @since 6.0.0
724+
* @since 5.4.0
725725
*/
726726
public function healthstatus()
727727
{

administrator/components/com_joomlaupdate/src/Model/NotificationModel.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* Joomla! Notification Model
3131
*
3232
* @internal
33-
* @since 6.0.0
33+
* @since 5.4.0
3434
*/
3535
final class NotificationModel extends BaseDatabaseModel
3636
{
@@ -42,7 +42,7 @@ final class NotificationModel extends BaseDatabaseModel
4242
*
4343
* @return void
4444
*
45-
* @since 6.0.0
45+
* @since 5.4.0
4646
*/
4747
public function sendNotification($type, $oldVersion): void
4848
{
@@ -100,7 +100,7 @@ public function sendNotification($type, $oldVersion): void
100100
*
101101
* @return array The list of Super User emails
102102
*
103-
* @since 6.0.0
103+
* @since 5.4.0
104104
*/
105105
private function getSuperUsers($email = null): array
106106
{

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ public function download()
466466
*
467467
* @return void
468468
*
469-
* @since 6.0.0
469+
* @since 5.4.0
470470
*/
471471
public function updateLastHealthCheck()
472472
{
@@ -489,7 +489,7 @@ public function updateLastHealthCheck()
489489
*
490490
* @return string|null
491491
*
492-
* @since 6.0.0
492+
* @since 5.4.0
493493
*/
494494
public function getAutoUpdateVersion(): ?string
495495
{
@@ -505,7 +505,7 @@ public function getAutoUpdateVersion(): ?string
505505
*
506506
* @return boolean
507507
*
508-
* @since 6.0.0
508+
* @since 5.4.0
509509
*/
510510
public function getAutoUpdateRequirementsState(): bool
511511
{
@@ -525,7 +525,7 @@ public function getAutoUpdateRequirementsState(): bool
525525
*
526526
* @return array
527527
*
528-
* @since 6.0.0
528+
* @since 5.4.0
529529
*/
530530
public function prepareAutoUpdate(string $targetVersion): array
531531
{
@@ -556,7 +556,7 @@ public function prepareAutoUpdate(string $targetVersion): array
556556
*
557557
* @return bool
558558
*
559-
* @since 6.0.0
559+
* @since 5.4.0
560560
*/
561561
public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetState)
562562
{
@@ -631,7 +631,7 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
631631
*
632632
* @return string
633633
*
634-
* @since 6.0.0
634+
* @since 5.4.0
635635
*/
636636
protected function getAutoUpdateToken(): string
637637
{

api/components/com_joomlaupdate/src/View/Healthcheck/JsonapiView.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* The healthcheck view
2626
*
27-
* @since 6.0.0
27+
* @since 5.4.0
2828
*/
2929
class JsonapiView extends BaseApiView
3030
{
@@ -33,7 +33,7 @@ class JsonapiView extends BaseApiView
3333
*
3434
* @return string The rendered data
3535
*
36-
* @since 6.0.0
36+
* @since 5.4.0
3737
*/
3838
public function healthCheck()
3939
{
@@ -55,7 +55,7 @@ public function healthCheck()
5555
*
5656
* @return array
5757
*
58-
* @since 6.0.0
58+
* @since 5.4.0
5959
*/
6060
protected function getStatsData()
6161
{

api/components/com_joomlaupdate/src/View/Notification/JsonapiView.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* The notification view
2424
*
25-
* @since 6.0.0
25+
* @since 5.4.0
2626
*/
2727
class JsonapiView extends BaseApiView
2828
{
@@ -31,7 +31,7 @@ class JsonapiView extends BaseApiView
3131
*
3232
* @return string The rendered data
3333
*
34-
* @since 6.0.0
34+
* @since 5.4.0
3535
*/
3636
public function notification($type, $oldVersion)
3737
{

api/components/com_joomlaupdate/src/View/Updates/JsonapiView.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* The updates view
2626
*
27-
* @since 6.0.0
27+
* @since 5.4.0
2828
*/
2929
class JsonapiView extends BaseApiView
3030
{
@@ -33,7 +33,7 @@ class JsonapiView extends BaseApiView
3333
*
3434
* @return string The rendered data
3535
*
36-
* @since 6.0.0
36+
* @since 5.4.0
3737
*/
3838
public function getUpdate()
3939
{
@@ -72,7 +72,7 @@ public function getUpdate()
7272
*
7373
* @return string The rendered data
7474
*
75-
* @since 6.0.0
75+
* @since 5.4.0
7676
*/
7777
public function prepareUpdate(string $targetVersion): string
7878
{
@@ -101,7 +101,7 @@ public function prepareUpdate(string $targetVersion): string
101101
*
102102
* @return string The rendered data
103103
*
104-
* @since 6.0.0
104+
* @since 5.4.0
105105
*/
106106
public function finalizeUpdate($fromVersion)
107107
{

libraries/src/Console/AutomatedUpdatesRegisterCommand.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@
2626
/**
2727
* Console command for managing the update channel for Joomla
2828
*
29-
* @since 6.0.0
29+
* @since 5.4.0
3030
*/
3131
class AutomatedUpdatesRegisterCommand extends AbstractCommand
3232
{
3333
/**
3434
* The default command name
3535
*
3636
* @var string
37-
* @since 6.0.0
37+
* @since 5.4.0
3838
*/
3939
protected static $defaultName = 'core:autoupdate:register';
4040

4141
/**
4242
* SymfonyStyle Object
4343
*
4444
* @var SymfonyStyle
45-
* @since 6.0.0
45+
* @since 5.4.0
4646
*/
4747
private $ioStyle;
4848

@@ -51,7 +51,7 @@ class AutomatedUpdatesRegisterCommand extends AbstractCommand
5151
*
5252
* @return void
5353
*
54-
* @since 6.0.0
54+
* @since 5.4.0
5555
*/
5656
protected function configure(): void
5757
{
@@ -70,7 +70,7 @@ protected function configure(): void
7070
*
7171
* @return void
7272
*
73-
* @since 6.0.0
73+
* @since 5.4.0
7474
*
7575
*/
7676
private function configureIO(InputInterface $input, OutputInterface $output)
@@ -86,7 +86,7 @@ private function configureIO(InputInterface $input, OutputInterface $output)
8686
*
8787
* @return integer The command exit code
8888
*
89-
* @since 6.0.0
89+
* @since 5.4.0
9090
*/
9191
protected function doExecute(InputInterface $input, OutputInterface $output): int
9292
{

libraries/src/Console/AutomatedUpdatesUnregisterCommand.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@
2626
/**
2727
* Console command for managing the update channel for Joomla
2828
*
29-
* @since 6.0.0
29+
* @since 5.4.0
3030
*/
3131
class AutomatedUpdatesUnregisterCommand extends AbstractCommand
3232
{
3333
/**
3434
* The default command name
3535
*
3636
* @var string
37-
* @since 6.0.0
37+
* @since 5.4.0
3838
*/
3939
protected static $defaultName = 'core:autoupdate:unregister';
4040

4141
/**
4242
* SymfonyStyle Object
4343
*
4444
* @var SymfonyStyle
45-
* @since 6.0.0
45+
* @since 5.4.0
4646
*/
4747
private $ioStyle;
4848

@@ -51,7 +51,7 @@ class AutomatedUpdatesUnregisterCommand extends AbstractCommand
5151
*
5252
* @return void
5353
*
54-
* @since 6.0.0
54+
* @since 5.4.0
5555
*/
5656
protected function configure(): void
5757
{
@@ -70,7 +70,7 @@ protected function configure(): void
7070
*
7171
* @return void
7272
*
73-
* @since 6.0.0
73+
* @since 5.4.0
7474
*
7575
*/
7676
private function configureIO(InputInterface $input, OutputInterface $output)
@@ -86,7 +86,7 @@ private function configureIO(InputInterface $input, OutputInterface $output)
8686
*
8787
* @return integer The command exit code
8888
*
89-
* @since 6.0.0
89+
* @since 5.4.0
9090
*/
9191
protected function doExecute(InputInterface $input, OutputInterface $output): int
9292
{

libraries/src/Extension/PluginInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface PluginInterface extends DispatcherAwareInterface
3131
*
3232
* @since 4.0.0
3333
*
34-
* @deprecated 6.0.0 will be removed in 7.0
34+
* @deprecated 5.4.0 will be removed in 7.0
3535
* Plugin should implement SubscriberInterface.
3636
* These plugins will be added to dispatcher in PluginHelper::import().
3737
*/

libraries/src/Plugin/CMSPlugin.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
223223
*
224224
* @since 4.0.0
225225
*
226-
* @deprecated 6.0.0 will be removed in 7.0
226+
* @deprecated 5.4.0 will be removed in 7.0
227227
* Plugin should implement SubscriberInterface.
228228
* These plugins will be added to dispatcher in PluginHelper::import().
229229
*/
@@ -294,7 +294,7 @@ public function registerListeners()
294294
*
295295
* @since 4.0.0
296296
*
297-
* @deprecated 6.0.0 will be removed in 7.0
297+
* @deprecated 5.4.0 will be removed in 7.0
298298
* Plugin should implement SubscriberInterface.
299299
*/
300300
final protected function registerLegacyListener(string $methodName)
@@ -345,7 +345,7 @@ function (AbstractEvent $event) use ($methodName) {
345345
*
346346
* @since 4.0.0
347347
*
348-
* @deprecated 6.0.0 will be removed in 7.0
348+
* @deprecated 5.4.0 will be removed in 7.0
349349
* Plugin should implement SubscriberInterface.
350350
*/
351351
final protected function registerListener(string $methodName)
@@ -362,7 +362,7 @@ final protected function registerListener(string $methodName)
362362
*
363363
* @since 4.0.0
364364
*
365-
* @deprecated 6.0.0 will be removed in 7.0
365+
* @deprecated 5.4.0 will be removed in 7.0
366366
* Plugin should implement SubscriberInterface.
367367
*/
368368
private function parameterImplementsEventInterface(\ReflectionParameter $parameter): bool

0 commit comments

Comments
 (0)