Prepare Joomla! 3.9.26-rc

joomla · Apr 7, 2021 · 6796300 · 6796300
1 parent 21aff1d
commit 6796300
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/administrator/components/com_admin/postinstall/behindproxy.php b/administrator/components/com_admin/postinstall/behindproxy.php
@@ -18,7 +18,7 @@
  *
  * @return  boolean
  *
- * @since   __DEPLOY_VERSION__
+ * @since   3.9.26
  */
 function admin_postinstall_behindproxy_condition()
 {
@@ -48,7 +48,7 @@ function admin_postinstall_behindproxy_condition()
  *
  * @return  void
  *
- * @since   __DEPLOY_VERSION__
+ * @since   3.9.26
  */
 function behindproxy_postinstall_action()
 {

diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.9" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.9.25</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26</version>
+	<creationDate>April 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension version="3.9" client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.9.25</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26</version>
+	<creationDate>April 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</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) 2005 - 2020 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.9.25</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26-rc</version>
+	<creationDate>April 2021</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
@@ -2,8 +2,8 @@
 <extension type="package" version="3.9" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.9.25.1</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26.1</version>
+	<creationDate>April 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
@@ -3,8 +3,8 @@
 	version="3.8"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.9.25</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26</version>
+	<creationDate>April 2021</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.9" client="site">
 	<name>English (en-GB)</name>
-	<version>3.9.25</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26</version>
+	<creationDate>April 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension version="3.9" client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.9.25</version>
-	<creationDate>March 2021</creationDate>
+	<version>3.9.26</version>
+	<creationDate>April 2021</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
@@ -120,7 +120,7 @@ class Installer extends \JAdapter
 	 * Backup extra_query during update_sites rebuild
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.26
 	 */
 	public $extraQuery = '';
 

diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php
@@ -61,7 +61,7 @@ class AbstractMenu
 	 * User object to check access levels for
 	 *
 	 * @var    User
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.26
 	 */
 	protected $storedUser;
 
@@ -152,7 +152,7 @@ public static function getInstance($client, $options = array())
 	 *
 	 * @return null
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since 3.9.26
 	 */
 	public function setUser($user)
 	{
@@ -396,7 +396,7 @@ public function load()
 	 *
 	 * @return User
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since 3.9.26
 	 */
 	protected function getUser()
 	{
@@ -417,7 +417,7 @@ protected function getUser()
 	 *
 	 * @return User|null
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since 3.9.26
 	 */
 	public function __get($propName)
 	{

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -60,7 +60,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'dev';
+	const EXTRA_VERSION = 'rc';
 
 	/**
 	 * Release version.
@@ -78,15 +78,15 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '26-dev';
+	const DEV_LEVEL = '26-rc';
 
 	/**
 	 * Development status.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Development';
+	const DEV_STATUS = 'Release Candidate';
 
 	/**
 	 * Build number.
@@ -111,15 +111,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '2-March-2021';
+	const RELDATE = '7-April-2021';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '15:07';
+	const RELTIME = '22:45';
 
 	/**
 	 * Release timezone.

diff --git a/tests/unit/suites/libraries/cms/form/rule/FilePathRuleTest.php b/tests/unit/suites/libraries/cms/form/rule/FilePathRuleTest.php
@@ -15,7 +15,7 @@
  *
  * @package     Joomla.UnitTest
  * @subpackage  Form
- * @since       __DEPLOY_VERSION__
+ * @since       3.9.26
  */
 class FilePathRuleTest extends TestCase
 {
@@ -24,7 +24,7 @@ class FilePathRuleTest extends TestCase
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.9.26
 	 */
 	public function dataTestPaths()
 	{
@@ -77,7 +77,7 @@ public function dataTestPaths()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.9.26
 	 * @dataProvider dataTestPaths
 	 */
 	public function testRule($expected, $element, $value)