Merge pull request #27 from mbabker/4.0-dev-version

Version bump & Fix global class use
wilsonge · Jul 4, 2016 · 4ede831 · 4ede831
2 parents 23f2d7b + 6ee2ed0
commit 4ede831
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.6 [version history](https://docs.joomla.org/Joomla_3.6_version_history).
+* Joomla! 4.0 [version history](https://docs.joomla.org/Joomla_4.0_version_history).
 * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
 
 What is Joomla?

diff --git a/README.txt b/README.txt
@@ -1,7 +1,7 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.6 version history - https://docs.joomla.org/Joomla_3.6_version_history
+	* Joomla! 4.0 version history - https://docs.joomla.org/Joomla_4.0_version_history
 	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?

diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini b/administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini b/administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini b/administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini b/administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 

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.6" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.6.0</version>
-	<creationDate>June 2016</creationDate>
+	<version>4.0.0</version>
+	<creationDate>July 2016</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.6" client="administrator" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.6.0</version>
-	<creationDate>June 2016</creationDate>
+	<version>4.0.0</version>
+	<creationDate>July 2016</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 - 2016 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.6.0-rc</version>
-	<creationDate>June 2016</creationDate>
+	<version>4.0.0-dev</version>
+	<creationDate>July 2016</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.6" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.6.0.1</version>
-	<creationDate>June 2016</creationDate>
+	<version>4.0.0.1</version>
+	<creationDate>July 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/build.xml b/build.xml
@@ -84,7 +84,7 @@
 			<arg value="--template" />
 			<arg value="joomla" />
 			<arg value="--title" />
-			<arg value="Joomla! CMS 3.6 API" />
+			<arg value="Joomla! CMS 4.0 API" />
 		</exec>
 	</target>
 

diff --git a/installation/language/ar-AA/ar-AA.ini b/installation/language/ar-AA/ar-AA.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 

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

diff --git a/installation/language/et-EE/et-EE.ini b/installation/language/et-EE/et-EE.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 

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.6" client="site">
 	<name>English (en-GB)</name>
-	<version>3.6.0</version>
-	<creationDate>June 2016</creationDate>
+	<version>4.0.0</version>
+	<creationDate>July 2016</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.6" client="site" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.6.0</version>
-	<creationDate>June 2016</creationDate>
+	<version>4.0.0</version>
+	<creationDate>July 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -30,23 +30,23 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELEASE = '3.6';
+	const RELEASE = '4.0';
 
 	/**
 	 * Maintenance version.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '0-rc';
+	const DEV_LEVEL = '0-dev';
 
 	/**
 	 * Development status.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Release Candidate';
+	const DEV_STATUS = 'Development';
 
 	/**
 	 * Build number.
@@ -70,15 +70,15 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '28-June-2016';
+	const RELDATE = '4-July-2016';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '20:34';
+	const RELTIME = '15:28';
 
 	/**
 	 * Release timezone.

diff --git a/libraries/joomla/user/response.php b/libraries/joomla/user/response.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  User
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 

diff --git a/libraries/src/Cms/Service/Provider/Application.php b/libraries/src/Cms/Service/Provider/Application.php
@@ -36,7 +36,7 @@ public function register(Container $container)
 			'JApplicationAdministrator',
 			function (Container $container)
 			{
-				return new JApplicationAdministrator(null, null, null, $container);
+				return new \JApplicationAdministrator(null, null, null, $container);
 			},
 			true
 		);
@@ -45,7 +45,7 @@ function (Container $container)
 			'JApplicationSite',
 			function (Container $container)
 			{
-				return new JApplicationSite(null, null, null, $container);
+				return new \JApplicationSite(null, null, null, $container);
 			},
 			true
 		);

diff --git a/libraries/src/Cms/Service/Provider/Database.php b/libraries/src/Cms/Service/Provider/Database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Service
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -13,7 +13,6 @@
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\Dispatcher;
 
 /**
  * Service provider for the application's database dependency
@@ -37,7 +36,7 @@ public function register(Container $container)
 			'JDatabaseDriver',
 			function (Container $container)
 			{
-				$conf = JFactory::getConfig();
+				$conf = \JFactory::getConfig();
 
 				$options = array(
 					'driver'   => $conf->get('dbtype'),
@@ -50,7 +49,7 @@ function (Container $container)
 
 				try
 				{
-					$db = JDatabaseDriver::getInstance($options);
+					$db = \JDatabaseDriver::getInstance($options);
 				}
 				catch (RuntimeException $e)
 				{

diff --git a/plugins/behaviour/taggable/taggable.php b/plugins/behaviour/taggable/taggable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Taggable
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/plugins/behaviour/taggable/taggable.xml b/plugins/behaviour/taggable/taggable.xml
@@ -6,7 +6,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_BEHAVIOUR_TAGGABLE_XML_DESCRIPTION</description>
 	<files>

diff --git a/plugins/behaviour/versionable/versionable.php b/plugins/behaviour/versionable/versionable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Taggable
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/plugins/behaviour/versionable/versionable.xml b/plugins/behaviour/versionable/versionable.xml
@@ -6,7 +6,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_BEHAVIOUR_VERSIONABLE_XML_DESCRIPTION</description>
 	<files>