Merge remote-tracking branch 'personal/admin_latest_modules' into adm…

…in_latest_modules

.drone.yml

@@ -384,15 +384,15 @@ steps:
       - rclone delete nightly:/home/devj/public_html/nightlies/ --include "Joomla_$MINORVERSION.*"
       - rclone delete nightly:/home/devj/public_html/cache/com_content/
       - rclone copy ./transfer/ nightly:/home/devj/public_html/nightlies/
-      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.1](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
+      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.2](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
 
   - name: buildfailure
     image: joomlaprojects/docker-images:packager
     environment:
       MATTERMOST_NIGHTLY_HOOK:
         from_secret: mattermost_nightly_hook
     commands:
-      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.1](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
+      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.2](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
     when:
       status:
         - failure
@@ -407,6 +407,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 2511b0e67290bd50c69982b00930e6b7d32097a32cec1bd787cfc3d06c94e875
+hmac: 6ff990776397b763388e15c484c14359c5fab51fa2f9e51b9542cb4ae4f936d0
 
 ...

README.md

@@ -1,21 +1,21 @@
 Joomla! CMS™
 ====================
 
-The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
+The Joomla! 5.2 branch is under heavy development and not all links in this document are available yet
 ------------------------------------------------------------------------------------------------------
 
 Build Status
 ---------------------
 | Drone-CI                                                                                                                                 | AppVeyor                                                                                                                                                           | PHP                                                                           | Node                                                                                 | npm                                                                             |
 |------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------
 * This is the source of Joomla! 5.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 5.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.1-dev).
+* Joomla! 5.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.2_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.2-dev).
 
 What is Joomla?
 ---------------------
@@ -48,9 +48,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 5.1-dev branch:
+- Go to the 5.2-dev branch:
 ```bash
-git checkout 5.1-dev
+git checkout 5.2-dev
 ```
 - Install all the needed composer packages:
 ```bash

README.txt

@@ -1,13 +1,13 @@
 Joomla! CMS™
 
-The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
+The Joomla! 5.2 branch is under heavy development and not all links in this document are available yet
 ------------------------------------------------------------------------------------------------------
 
 1- Overview
 	* This is a Joomla! 5.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 5.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.1-dev
+	* Joomla! 5.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.2_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.2-dev
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.

administrator/language/en-GB/install.xml

@@ -2,7 +2,7 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

administrator/language/en-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

administrator/manifests/files/joomla.xml

@@ -6,7 +6,7 @@
 	<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.1.0-rc2-dev</version>
+	<version>5.2.0-alpha1-dev</version>
 	<creationDate>2024-04</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

administrator/manifests/packages/pkg_en-GB.xml

@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>5.1.0.1</version>
+	<version>5.2.0.1</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

api/language/en-GB/install.xml

@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

api/language/en-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

build.xml

@@ -85,7 +85,7 @@
 			<arg value="--template" />
 			<arg value="joomla" />
 			<arg value="--title" />
-			<arg value="Joomla! CMS 5.1 API" />
+			<arg value="Joomla! CMS 5.2 API" />
 		</exec>
 	</target>
 

installation/language/en-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

language/en-GB/install.xml

@@ -2,7 +2,7 @@
 <extension client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

language/en-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="site">
 	<name>English (en-GB)</name>
-	<version>5.1.0</version>
+	<version>5.2.0</version>
 	<creationDate>2024-04</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

libraries/src/Router/SiteRouter.php

@@ -588,9 +588,7 @@ public function getComponentRouter($component)
      */
     public function setComponentRouter($component, $router)
     {
-        $reflection = new \ReflectionClass($router);
-
-        if (\in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames())) {
+        if ($router instanceof RouterInterface) {
             $this->componentRouters[$component] = $router;
 
             return true;

libraries/src/Version.php

@@ -47,7 +47,7 @@ final class Version
      * @var    integer
      * @since  3.8.0
      */
-    public const MINOR_VERSION = 1;
+    public const MINOR_VERSION = 2;
 
     /**
      * Patch release version.
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc2-dev';
+    public const EXTRA_VERSION = 'alpha1-dev';
 
     /**
      * Development status.
@@ -82,23 +82,23 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const CODENAME = 'Kudumisha';
+    public const CODENAME = 'Uthabiti';
 
     /**
      * Release date.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '2-April-2024';
+    public const RELDATE = '3-April-2024';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:26';
+    public const RELTIME = '16:00';
 
     /**
      * Release timezone.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "joomla",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "repository": {
@@ -126,4 +126,4 @@
     "stylelint-order": "^5.0.0",
     "stylelint-scss": "^4.7.0"
   }
-}
+}

renovate.json

@@ -10,11 +10,11 @@
   "lockFileMaintenance": { "enabled": true },
   "composerIgnorePlatformReqs": ["ext-*", "lib-*"],
   "rangeStrategy": "update-lockfile",
-  "baseBranches": ["4.2-dev", "4.3-dev", "5.0-dev"],
+  "baseBranches": ["4.4-dev", "5.0-dev", "5.1-dev", "5.2-dev", "6.0-dev"],
   "packageRules": [
     {
       "enabled": false,
-      "matchBaseBranches": "4.2-dev",
+      "matchBaseBranches": "5.2-dev",
       "matchPackagePatterns": ["*"]
     }
   ],