From e7581675b70302e7753526ab66160e56284673d3 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Tue, 15 Aug 2017 07:20:38 -0500 Subject: [PATCH] Prepare 3.8 Beta 2 release --- administrator/components/com_fields/helpers/fields.php | 2 +- administrator/manifests/files/joomla.xml | 2 +- .../{Joomla/CMS => }/Form/Field/RedirectStatusField.php | 6 +++--- libraries/src/Version.php | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename libraries/src/{Joomla/CMS => }/Form/Field/RedirectStatusField.php (89%) diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php index 304a53af723c7..9416817029119 100644 --- a/administrator/components/com_fields/helpers/fields.php +++ b/administrator/components/com_fields/helpers/fields.php @@ -738,7 +738,7 @@ public static function getFieldTypes() * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.8.0 */ public static function clearFieldsCache() { diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 59725a3d07dcd..17e58d4ba19b9 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2017 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.8.0-dev + 3.8.0-beta2 August 2017 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Joomla/CMS/Form/Field/RedirectStatusField.php b/libraries/src/Form/Field/RedirectStatusField.php similarity index 89% rename from libraries/src/Joomla/CMS/Form/Field/RedirectStatusField.php rename to libraries/src/Form/Field/RedirectStatusField.php index 056eeac79dd11..a4f531d00dc89 100644 --- a/libraries/src/Joomla/CMS/Form/Field/RedirectStatusField.php +++ b/libraries/src/Form/Field/RedirectStatusField.php @@ -17,7 +17,7 @@ /** * Redirect Status field. * - * @since __DEPLOY_VERSION__ + * @since 3.8.0 */ class RedirectStatusField extends \JFormFieldPredefinedList { @@ -25,7 +25,7 @@ class RedirectStatusField extends \JFormFieldPredefinedList * The form field type. * * @var string - * @since __DEPLOY_VERSION__ + * @since 3.8.0 */ public $type = 'Redirect_Status'; @@ -33,7 +33,7 @@ class RedirectStatusField extends \JFormFieldPredefinedList * Available statuses * * @var array - * @since __DEPLOY_VERSION__ + * @since 3.8.0 */ protected $predefinedOptions = array( '-2' => 'JTRASHED', diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 972cd9d2f2479..ea469c2cbfdb7 100644 --- 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 = 'beta2'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '0-dev'; + const DEV_LEVEL = '0-beta2'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Beta'; /** * Build number. @@ -111,7 +111,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '8-August-2017'; + const RELDATE = '15-August-2017'; /** * Release time.