Release Joomla! 5.3.0 Beta 1

joomla · Feb 17, 2025 · 6676f74 · 6676f74
1 parent c4c8380
commit 6676f74
Show file tree

Hide file tree

Showing 54 changed files with 131 additions and 80 deletions.
diff --git a/administrator/components/com_scheduler/src/Model/TasksModel.php b/administrator/components/com_scheduler/src/Model/TasksModel.php
@@ -35,6 +35,8 @@
  */
 class TasksModel extends ListModel
 {
+    protected $listForbiddenList = ['select', 'multi_ordering'];
+
     /**
      * Constructor.
      *
@@ -343,8 +345,19 @@ static function (TaskOption $taskOption): string {
                 }
             }
         } else {
-            // @todo Should add quoting here
-            $query->order($multiOrdering);
+            $orderClauses = [];
+
+            // Loop through provided clauses
+            foreach ($multiOrdering as $ordering) {
+                [$column, $direction] = explode(' ', $ordering);
+
+                $orderClauses[] = $db->quoteName($column) . ' ' . $direction;
+            }
+
+            // At least one correct order clause
+            if (\count($orderClauses) > 0) {
+                $query->order($orderClauses);
+            }
         }
 
         return $query;
@@ -435,6 +448,44 @@ private function attachTaskOptions(array $items): void
      */
     protected function populateState($ordering = 'a.next_execution', $direction = 'ASC'): void
     {
+        $app = Factory::getApplication();
+
+        // Clean the multiorder values
+        if ($list = $app->getUserStateFromRequest($this->context . '.list', 'list', [], 'array')) {
+            if (!empty($list['multi_ordering']) && \is_array($list['multi_ordering'])) {
+                $orderClauses = [];
+
+                // Loop through provided clauses
+                foreach ($list['multi_ordering'] as $multiOrdering) {
+                    // Split the combined string into individual variables
+                    $multiOrderingParts = explode(' ', $multiOrdering, 2);
+
+                    // Check that at least the column is present
+                    if (\count($multiOrderingParts) < 1) {
+                        continue;
+                    }
+
+                    // Assign variables
+                    $multiOrderingColumn = $multiOrderingParts[0];
+                    $multiOrderingDir    = \count($multiOrderingParts) === 2 ? $multiOrderingParts[1] : 'asc';
+
+                    // Validate provided column
+                    if (!\in_array($multiOrderingColumn, $this->filter_fields)) {
+                        continue;
+                    }
+
+                    // Validate order dir
+                    if (strtolower($multiOrderingDir) !== 'asc' && strtolower($multiOrderingDir) !== 'desc') {
+                        continue;
+                    }
+
+                    $orderClauses[] = $multiOrderingColumn . ' ' . $multiOrderingDir;
+                }
+
+                $this->setState('list.multi_ordering', $orderClauses);
+            }
+        }
+
         // Call the parent method
         parent::populateState($ordering, $direction);
     }

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.3.0-alpha4-dev</version>
-	<creationDate>2025-01</creationDate>
+	<version>5.3.0-beta1</version>
+	<creationDate>2025-02</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>5.3.0.1</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/modules/mod_feed/services/provider.php b/administrator/modules/mod_feed/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The feed module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.3.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function register(Container $container)
     {

diff --git a/administrator/modules/mod_feed/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_feed/src/Dispatcher/Dispatcher.php
@@ -22,7 +22,7 @@
 /**
  * Dispatcher class for mod_feed
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.3.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -33,7 +33,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     protected function getLayoutData()
     {

diff --git a/administrator/modules/mod_feed/src/Helper/FeedHelper.php b/administrator/modules/mod_feed/src/Helper/FeedHelper.php
@@ -33,7 +33,7 @@ class FeedHelper
      *
      * @return  \Joomla\CMS\Feed\Feed|string  Return a Feed object or a string message if error.
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function getFeedData(Registry $params, FeedFactory $feed): \Joomla\CMS\Feed\Feed|string
     {
@@ -63,7 +63,7 @@ public function getFeedData(Registry $params, FeedFactory $feed): \Joomla\CMS\Fe
      *
      * @since   1.5
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     * @deprecated 5.3.0 will be removed in 7.0
      *             Use the non-static method getFeedData
      *             Example: Factory::getApplication()->bootModule('mod_feed', 'administrator')
      *                          ->getHelper('FeedHelper')

diff --git a/administrator/modules/mod_privacy_status/services/provider.php b/administrator/modules/mod_privacy_status/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The privacy status module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.3.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function register(Container $container)
     {

diff --git a/administrator/modules/mod_privacy_status/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_privacy_status/src/Dispatcher/Dispatcher.php
@@ -23,7 +23,7 @@
 /**
  * Dispatcher class for mod_privacy_status
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.3.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -34,7 +34,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function dispatch()
     {
@@ -61,7 +61,7 @@ public function dispatch()
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     protected function getLayoutData()
     {

diff --git a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
@@ -40,7 +40,7 @@ class PrivacyStatusHelper implements DatabaseAwareInterface
      *
      * @return  array  Array containing a status of whether a privacy policy is set and a link to the policy document for editing
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function getPrivacyPolicyInformation(CMSApplicationInterface $app)
     {
@@ -73,7 +73,7 @@ public function getPrivacyPolicyInformation(CMSApplicationInterface $app)
      *
      * @return  array  Array containing a status of whether a menu is published for the request form and its current link
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      *
      */
     public function getRequestFormMenuStatus(CMSApplicationInterface $app)
@@ -162,7 +162,7 @@ public function getRequestFormMenuStatus(CMSApplicationInterface $app)
      *
      * @return  integer
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function getNumberOfUrgentRequests()
     {
@@ -192,7 +192,7 @@ public function getNumberOfUrgentRequests()
      *
      * @return string The database encryption details
      *
-     * @since __DEPLOY_VERSION__
+     * @since 5.3.0
      */
     public function getDatabaseConnectionEncryption()
     {
@@ -206,7 +206,7 @@ public function getDatabaseConnectionEncryption()
      *
      * @since   4.0.0
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     * @deprecated 5.3.0 will be removed in 7.0
      *             Use the non-static method getPrivacyPolicyInformation
      *             Example: Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
      *                          ->getHelper('PrivacyStatusHelper')
@@ -228,7 +228,7 @@ public static function getPrivacyPolicyInfo()
      *
      * @since   4.0.0
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     * @deprecated 5.3.0 will be removed in 7.0
      *             Use the non-static method getRequestFormMenuStatus
      *             Example: Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
      *                          ->getHelper('PrivacyStatusHelper')
@@ -250,7 +250,7 @@ public static function getRequestFormPublished()
      *
      * @since   4.0.0
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     * @deprecated 5.3.0 will be removed in 7.0
      *             Use the non-static method getNumberOfUrgentRequests
      *             Example: Factory::getApplication()->bootModule('mod_privacy_status', 'administrator')
      *                          ->getHelper('PrivacyStatusHelper')

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>5.3.0</version>
-	<creationDate>2025-01</creationDate>
+	<creationDate>2025-02</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/libraries/src/Component/ComponentRecord.php b/libraries/src/Component/ComponentRecord.php
@@ -53,7 +53,7 @@ class ComponentRecord
      * @var    string
      * @since  4.0.0
      *
-     * @deprecated  __DEPLOY_VERSION__ will be removed in 7.0 as it was never used
+     * @deprecated  5.3.0 will be removed in 7.0 as it was never used
      */
     public $namespace;
 

diff --git a/libraries/src/Event/Plugin/System/Stats/GetStatsDataEvent.php b/libraries/src/Event/Plugin/System/Stats/GetStatsDataEvent.php
@@ -24,7 +24,7 @@
  * Example:
  *   new GetStatsDataEvent('onEventName', ['context' => 'com_example.example']);
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.3.0
  */
 class GetStatsDataEvent extends AbstractImmutableEvent implements ResultAwareInterface
 {
@@ -37,8 +37,8 @@ class GetStatsDataEvent extends AbstractImmutableEvent implements ResultAwareInt
      *
      * @var array
      *
-     * @since  __DEPLOY_VERSION__
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @since  5.3.0
+     * @deprecated 5.3.0 will be removed in 6.0
      */
     protected $legacyArgumentsOrder = ['context'];
 
@@ -50,7 +50,7 @@ class GetStatsDataEvent extends AbstractImmutableEvent implements ResultAwareInt
      *
      * @throws  \BadMethodCallException
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.3.0
      */
     public function __construct($name, array $arguments = [])
     {
@@ -73,7 +73,7 @@ public function __construct($name, array $arguments = [])
      *
      * @return  string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  5.3.0
      */
     protected function onSetContext(string $value): string
     {
@@ -85,7 +85,7 @@ protected function onSetContext(string $value): string
      *
      * @return  string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  5.3.0
      */
     public function getContext(): string
     {

diff --git a/libraries/src/Event/SampleData/GetOverviewEvent.php b/libraries/src/Event/SampleData/GetOverviewEvent.php
@@ -20,7 +20,7 @@
 /**
  * Cass for Sample data events
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.3.0
  */
 class GetOverviewEvent extends SampleDataEvent implements ResultAwareInterface
 {