Merge branch '5.1-dev' into 5.1/custom-fields-form

joomla · Mar 3, 2024 · 4977185 · 4977185
2 parents a86650f + 5d9bc8f
commit 4977185
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 17 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -2208,6 +2208,31 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             // From 5.1.0-alpha3 to 5.1.0-alpha4
             '/administrator/components/com_redirect/tmpl/links/default_batch_footer.php',
             '/modules/mod_banners/mod_banners.php',
+            // From 5.1.0-alpha4 to 5.1.0-beta1
+            '/administrator/modules/mod_custom/mod_custom.php',
+            '/administrator/modules/mod_frontend/mod_frontend.php',
+            '/administrator/modules/mod_latestactions/mod_latestactions.php',
+            '/administrator/modules/mod_loginsupport/mod_loginsupport.php',
+            '/administrator/modules/mod_messages/mod_messages.php',
+            '/administrator/modules/mod_multilangstatus/mod_multilangstatus.php',
+            '/administrator/modules/mod_sampledata/mod_sampledata.php',
+            '/administrator/modules/mod_stats_admin/mod_stats_admin.php',
+            '/administrator/modules/mod_title/mod_title.php',
+            '/administrator/modules/mod_toolbar/mod_toolbar.php',
+            '/administrator/modules/mod_user/mod_user.php',
+            '/administrator/modules/mod_version/mod_version.php',
+            '/media/plg_system_jooa11y/css/jooa11y.css',
+            '/media/plg_system_jooa11y/css/jooa11y.min.css',
+            '/media/plg_system_jooa11y/css/jooa11y.min.css.gz',
+            '/media/plg_system_jooa11y/scss/jooa11y.scss',
+            '/media/vendor/joomla-a11y-checker/LICENSE.md',
+            '/modules/mod_feed/mod_feed.php',
+            '/modules/mod_languages/mod_languages.php',
+            '/modules/mod_stats/mod_stats.php',
+            '/modules/mod_syndicate/mod_syndicate.php',
+            '/modules/mod_tags_popular/mod_tags_popular.php',
+            '/modules/mod_tags_similar/mod_tags_similar.php',
+            '/modules/mod_wrapper/mod_wrapper.php',
         ];
 
         $folders = [
@@ -2442,6 +2467,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/fgrosse/phpasn1/lib',
             '/libraries/vendor/fgrosse/phpasn1',
             '/libraries/vendor/fgrosse',
+            // From 5.1.0-alpha4 to 5.1.0-beta1
+            '/media/vendor/joomla-a11y-checker',
+            '/media/plg_system_jooa11y/scss',
+            '/media/plg_system_jooa11y/css',
         ];
 
         $status['files_checked']   = $files;

diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
@@ -349,7 +349,6 @@ JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
 JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s"
 JLIB_FORM_VALIDATE_FIELD_URL_INJECTION_DETECTED="Invalid URL: A code injection has been detected in %1$s."
 JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING="Invalid URL: URL schema is missing in %1$s. Please add one of the following at the beginning: %2$s."
-JLIB_FORM_VALIDATE_FIELD_URL_INJECTION_DETECTED="Invalid URL: A code injection has been detected in %1$s."
 JLIB_FORM_VALUE_CACHE_APCU="APC User Cache"
 JLIB_FORM_VALUE_CACHE_FILE="File"
 JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)"
@@ -662,11 +661,11 @@ JLIB_INSTALLER_SQL_BEGIN="Start of SQL updates."
 JLIB_INSTALLER_SQL_BEGIN_SCHEMA="The current database version (schema) is %s."
 JLIB_INSTALLER_SQL_END="End of SQL updates."
 JLIB_INSTALLER_SQL_END_NOT_COMPLETE="End of SQL updates - INCOMPLETE."
-JLIB_INSTALLER_TUF_FREEZE_ATTACK="Update not possible because the offered update has expired."
 JLIB_INSTALLER_TUF_DEBUG_MESSAGE="TUF Debug Message: %s"
+JLIB_INSTALLER_TUF_DOWNLOAD_SIZE="The size of the update downloaded did not match the expected size."
+JLIB_INSTALLER_TUF_FREEZE_ATTACK="Update not possible because the offered update has expired."
 JLIB_INSTALLER_TUF_INVALID_METADATA="The saved TUF update information is invalid."
 JLIB_INSTALLER_TUF_NOT_AVAILABLE="TUF is not available for extensions yet."
-JLIB_INSTALLER_TUF_DOWNLOAD_SIZE="The size of the update downloaded did not match the expected size."
 JLIB_INSTALLER_TUF_ROLLBACK_ATTACK="Update not possible because the offered update is older than the currently installed version."
 JLIB_INSTALLER_TUF_SIGNATURE_THRESHOLD="Update not possible because the offered update does not have enough signatures."
 JLIB_INSTALLER_UNINSTALL="Uninstall"

diff --git a/administrator/modules/mod_sampledata/src/Helper/SampledataHelper.php b/administrator/modules/mod_sampledata/src/Helper/SampledataHelper.php
@@ -57,7 +57,7 @@ public function getSampledataList()
      *
      * @since  3.8.0
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getSampledataList
      *             Example: Factory::getApplication()->bootModule('mod_sampledata', 'administrator')
      *                            ->getHelper('SampledataHelper')

diff --git a/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php b/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
@@ -156,7 +156,7 @@ public function getStatsData(Registry $params, CMSApplication $app, DatabaseInte
      *
      * @since   3.0
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getStatsData
      *             Example: Factory::getApplication()->bootModule('mod_stats_admin', 'administrator')
      *                          ->getHelper('StatsAdminHelper')

diff --git a/administrator/modules/mod_version/src/Helper/VersionHelper.php b/administrator/modules/mod_version/src/Helper/VersionHelper.php
@@ -42,7 +42,7 @@ public function getVersionString()
      *
      * @return  string  String containing the current Joomla version.
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getVersionString
      *             Example: Factory::getApplication()->bootModule('mod_version', 'administrator')
      *                            ->getHelper('VersionHelper')

diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
@@ -345,7 +345,6 @@ JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
 JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s"
 JLIB_FORM_VALIDATE_FIELD_URL_INJECTION_DETECTED="Invalid URL: A code injection has been detected in %1$s."
 JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING="Invalid URL: URL schema is missing in %1$s. Please add one of the following at the beginning: %2$s."
-JLIB_FORM_VALIDATE_FIELD_URL_INJECTION_DETECTED="Invalid URL: A code injection has been detected in %1$s."
 JLIB_FORM_VALUE_CACHE_APCU="APC User Cache"
 JLIB_FORM_VALUE_CACHE_FILE="File"
 JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)"

diff --git a/modules/mod_syndicate/src/Helper/SyndicateHelper.php b/modules/mod_syndicate/src/Helper/SyndicateHelper.php
@@ -58,7 +58,7 @@ public function getSyndicateLink(Registry $params, HtmlDocument $document)
      *
      * @since   1.5
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getSyndicateLink
      *             Example: Factory::getApplication()->bootModule('mod_syndicate', 'site')
      *                            ->getHelper('SyndicateHelper')

diff --git a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
@@ -82,7 +82,7 @@ public function getTags(&$params)
             'INNER',
             $db->quoteName('#__ucm_content', 'ucm'),
             $db->quoteName('m.content_item_id') . ' = ' . $db->quoteName('ucm.core_content_item_id') .
-            ' AND ' . $db->quoteName('m.type_id') . ' = ' . $db->quoteName('ucm.core_type_id')
+                ' AND ' . $db->quoteName('m.type_id') . ' = ' . $db->quoteName('ucm.core_type_id')
         );
 
         $query->join(
@@ -121,17 +121,17 @@ public function getTags(&$params)
         $query->where($db->quoteName('c.core_state') . ' = 1')
             ->where(
                 '(' . $db->quoteName('c.core_access') . ' IN (' . implode(',', $query->bindArray($groups)) . ')'
-                . ' OR ' . $db->quoteName('c.core_access') . ' = 0)'
+                    . ' OR ' . $db->quoteName('c.core_access') . ' = 0)'
             )
             ->where(
                 '(' . $db->quoteName('c.core_publish_up') . ' IS NULL'
-                . ' OR ' . $db->quoteName('c.core_publish_up') . ' = :nullDate2'
-                . ' OR ' . $db->quoteName('c.core_publish_up') . ' <= :nowDate2)'
+                    . ' OR ' . $db->quoteName('c.core_publish_up') . ' = :nullDate2'
+                    . ' OR ' . $db->quoteName('c.core_publish_up') . ' <= :nowDate2)'
             )
             ->where(
                 '(' . $db->quoteName('c.core_publish_down') . ' IS NULL'
-                . ' OR ' . $db->quoteName('c.core_publish_down') . ' = :nullDate3'
-                . ' OR ' . $db->quoteName('c.core_publish_down') . ' >= :nowDate3)'
+                    . ' OR ' . $db->quoteName('c.core_publish_down') . ' = :nullDate3'
+                    . ' OR ' . $db->quoteName('c.core_publish_down') . ' >= :nowDate3)'
             )
             ->bind([':nullDate2', ':nullDate3'], $nullDate)
             ->bind([':nowDate2', ':nowDate3'], $nowDate);
@@ -203,7 +203,7 @@ public function getTags(&$params)
      *
      * @since   3.1
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getTags
      *             Example: Factory::getApplication()->bootModule('mod_tags_popular', 'site')
      *                          ->getHelper('TagsPopularHelper')

diff --git a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
@@ -232,7 +232,7 @@ public function getItems(&$params)
      *
      * @return  array
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getItems
      *             Example: Factory::getApplication()->bootModule('mod_tags_similar', 'site')
      *                          ->getHelper('TagsSimilarHelper')

diff --git a/modules/mod_wrapper/src/Helper/WrapperHelper.php b/modules/mod_wrapper/src/Helper/WrapperHelper.php
@@ -79,7 +79,7 @@ public function getParamsWrapper(Registry $params, SiteApplication $app)
      *
      * @since   1.5
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
      *             Use the non-static method getParamsWrapper
      *             Example: Factory::getApplication()->bootModule('mod_wrapper', 'site')
      *                          ->getHelper('WrapperHelper')