Skip to content

[6.0] Upmerges - 2025-05-28 #45534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bodge-IT merged 6 commits into from
May 28, 2025
Merged

[6.0] Upmerges - 2025-05-28 #45534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2198dc
Add the compat6 plugins with enabled options (#45525)
richard67 May 25, 2025
45434cb
Joomla! 5.4.0 Alpha 1
muhme May 25, 2025
f061770
Revert to dev
muhme May 25, 2025
d70d61f
Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-05-28
Bodge-IT May 28, 2025
7d3eb15
Test GPG signing verification
Bodge-IT May 28, 2025
0f7cd8d
Test GPG verification with matching email
Bodge-IT May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ public function ajax()
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
public function healthstatus()
{
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_joomlaupdate/src/Model/NotificationModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* Joomla! Notification Model
*
* @internal
* @since 6.0.0
* @since 5.4.0
*/
final class NotificationModel extends BaseDatabaseModel
{
Expand All @@ -42,7 +42,7 @@ final class NotificationModel extends BaseDatabaseModel
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
public function sendNotification($type, $oldVersion): void
{
Expand Down Expand Up @@ -100,7 +100,7 @@ public function sendNotification($type, $oldVersion): void
*
* @return array The list of Super User emails
*
* @since 6.0.0
* @since 5.4.0
*/
private function getSuperUsers($email = null): array
{
Expand Down
12 changes: 6 additions & 6 deletions administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ public function download()
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
public function updateLastHealthCheck()
{
Expand All @@ -489,7 +489,7 @@ public function updateLastHealthCheck()
*
* @return string|null
*
* @since 6.0.0
* @since 5.4.0
*/
public function getAutoUpdateVersion(): ?string
{
Expand All @@ -505,7 +505,7 @@ public function getAutoUpdateVersion(): ?string
*
* @return boolean
*
* @since 6.0.0
* @since 5.4.0
*/
public function getAutoUpdateRequirementsState(): bool
{
Expand All @@ -525,7 +525,7 @@ public function getAutoUpdateRequirementsState(): bool
*
* @return array
*
* @since 6.0.0
* @since 5.4.0
*/
public function prepareAutoUpdate(string $targetVersion): array
{
Expand Down Expand Up @@ -556,7 +556,7 @@ public function prepareAutoUpdate(string $targetVersion): array
*
* @return bool
*
* @since 6.0.0
* @since 5.4.0
*/
public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetState)
{
Expand Down Expand Up @@ -631,7 +631,7 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
*
* @return string
*
* @since 6.0.0
* @since 5.4.0
*/
protected function getAutoUpdateToken(): string
{
Expand Down
6 changes: 3 additions & 3 deletions api/components/com_joomlaupdate/src/View/Healthcheck/JsonapiView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* The healthcheck view
*
* @since 6.0.0
* @since 5.4.0
*/
class JsonapiView extends BaseApiView
{
Expand All @@ -33,7 +33,7 @@ class JsonapiView extends BaseApiView
*
* @return string The rendered data
*
* @since 6.0.0
* @since 5.4.0
*/
public function healthCheck()
{
Expand All @@ -55,7 +55,7 @@ public function healthCheck()
*
* @return array
*
* @since 6.0.0
* @since 5.4.0
*/
protected function getStatsData()
{
Expand Down
4 changes: 2 additions & 2 deletions api/components/com_joomlaupdate/src/View/Notification/JsonapiView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* The notification view
*
* @since 6.0.0
* @since 5.4.0
*/
class JsonapiView extends BaseApiView
{
Expand All @@ -31,7 +31,7 @@ class JsonapiView extends BaseApiView
*
* @return string The rendered data
*
* @since 6.0.0
* @since 5.4.0
*/
public function notification($type, $oldVersion)
{
Expand Down
8 changes: 4 additions & 4 deletions api/components/com_joomlaupdate/src/View/Updates/JsonapiView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* The updates view
*
* @since 6.0.0
* @since 5.4.0
*/
class JsonapiView extends BaseApiView
{
Expand All @@ -33,7 +33,7 @@ class JsonapiView extends BaseApiView
*
* @return string The rendered data
*
* @since 6.0.0
* @since 5.4.0
*/
public function getUpdate()
{
Expand Down Expand Up @@ -72,7 +72,7 @@ public function getUpdate()
*
* @return string The rendered data
*
* @since 6.0.0
* @since 5.4.0
*/
public function prepareUpdate(string $targetVersion): string
{
Expand Down Expand Up @@ -101,7 +101,7 @@ public function prepareUpdate(string $targetVersion): string
*
* @return string The rendered data
*
* @since 6.0.0
* @since 5.4.0
*/
public function finalizeUpdate($fromVersion)
{
Expand Down
12 changes: 6 additions & 6 deletions libraries/src/Console/AutomatedUpdatesRegisterCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
/**
* Console command for managing the update channel for Joomla
*
* @since 6.0.0
* @since 5.4.0
*/
class AutomatedUpdatesRegisterCommand extends AbstractCommand
{
/**
* The default command name
*
* @var string
* @since 6.0.0
* @since 5.4.0
*/
protected static $defaultName = 'core:autoupdate:register';

/**
* SymfonyStyle Object
*
* @var SymfonyStyle
* @since 6.0.0
* @since 5.4.0
*/
private $ioStyle;

Expand All @@ -51,7 +51,7 @@ class AutomatedUpdatesRegisterCommand extends AbstractCommand
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
protected function configure(): void
{
Expand All @@ -70,7 +70,7 @@ protected function configure(): void
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*
*/
private function configureIO(InputInterface $input, OutputInterface $output)
Expand All @@ -86,7 +86,7 @@ private function configureIO(InputInterface $input, OutputInterface $output)
*
* @return integer The command exit code
*
* @since 6.0.0
* @since 5.4.0
*/
protected function doExecute(InputInterface $input, OutputInterface $output): int
{
Expand Down
12 changes: 6 additions & 6 deletions libraries/src/Console/AutomatedUpdatesUnregisterCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
/**
* Console command for managing the update channel for Joomla
*
* @since 6.0.0
* @since 5.4.0
*/
class AutomatedUpdatesUnregisterCommand extends AbstractCommand
{
/**
* The default command name
*
* @var string
* @since 6.0.0
* @since 5.4.0
*/
protected static $defaultName = 'core:autoupdate:unregister';

/**
* SymfonyStyle Object
*
* @var SymfonyStyle
* @since 6.0.0
* @since 5.4.0
*/
private $ioStyle;

Expand All @@ -51,7 +51,7 @@ class AutomatedUpdatesUnregisterCommand extends AbstractCommand
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
protected function configure(): void
{
Expand All @@ -70,7 +70,7 @@ protected function configure(): void
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*
*/
private function configureIO(InputInterface $input, OutputInterface $output)
Expand All @@ -86,7 +86,7 @@ private function configureIO(InputInterface $input, OutputInterface $output)
*
* @return integer The command exit code
*
* @since 6.0.0
* @since 5.4.0
*/
protected function doExecute(InputInterface $input, OutputInterface $output): int
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Extension/PluginInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ interface PluginInterface extends DispatcherAwareInterface
*
* @since 4.0.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Plugin should implement SubscriberInterface.
* These plugins will be added to dispatcher in PluginHelper::import().
*/
Expand Down
8 changes: 4 additions & 4 deletions libraries/src/Plugin/CMSPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
*
* @since 4.0.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Plugin should implement SubscriberInterface.
* These plugins will be added to dispatcher in PluginHelper::import().
*/
Expand Down Expand Up @@ -294,7 +294,7 @@ public function registerListeners()
*
* @since 4.0.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Plugin should implement SubscriberInterface.
*/
final protected function registerLegacyListener(string $methodName)
Expand Down Expand Up @@ -345,7 +345,7 @@ function (AbstractEvent $event) use ($methodName) {
*
* @since 4.0.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Plugin should implement SubscriberInterface.
*/
final protected function registerListener(string $methodName)
Expand All @@ -362,7 +362,7 @@ final protected function registerListener(string $methodName)
*
* @since 4.0.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Plugin should implement SubscriberInterface.
*/
private function parameterImplementsEventInterface(\ReflectionParameter $parameter): bool
Expand Down
10 changes: 5 additions & 5 deletions libraries/src/Table/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ abstract class Table extends \stdClass implements TableInterface, DispatcherAwar
* @var DatabaseInterface
* @since 1.7.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Use setDatabase() and getDatabase() instead
* Example: $this->setDatabase($db);
*/
Expand Down Expand Up @@ -542,7 +542,7 @@ public function getId()
*
* @since 1.7.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Use getDatabase() instead
* Example: $this->getDatabase();
*/
Expand All @@ -560,7 +560,7 @@ public function getDbo()
*
* @since 1.7.0
*
* @deprecated 6.0.0 will be removed in 7.0
* @deprecated 5.4.0 will be removed in 7.0
* Use setDatabase() instead
* Example: $this->setDatabase($db);
*/
Expand All @@ -576,7 +576,7 @@ public function setDbo(DatabaseInterface $db)
*
* @return DatabaseInterface
*
* @since 6.0.0
* @since 5.4.0
* @throws DatabaseNotFoundException May be thrown if the database has not been set.
*
* @note This method will be removed in 7.0 and DatabaseAwareTrait will be used instead.
Expand All @@ -593,7 +593,7 @@ protected function getDatabase(): DatabaseInterface
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*
* @note This method will be removed in 7.0 and DatabaseAwareTrait will be used instead.
*/
Expand Down
4 changes: 2 additions & 2 deletions plugins/extension/joomlaupdate/src/Extension/Joomlaupdate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function getSubscribedEvents(): array
* @return void
* @throws \Exception
*
* @since 6.0.0
* @since 5.4.0
*/
public function onExtensionBeforeSave(\Joomla\CMS\Event\Model\BeforeSaveEvent $event)
{
Expand Down Expand Up @@ -105,7 +105,7 @@ public function onExtensionBeforeSave(\Joomla\CMS\Event\Model\BeforeSaveEvent $e
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
public function onExtensionAfterSave(AfterSaveEvent $event): void
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/quickicon/autoupdate/services/provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*
* @return void
*
* @since 6.0.0
* @since 5.4.0
*/
public function register(Container $container)
{
Expand Down
Loading