diff --git a/README.md b/README.md index e069380e9e371..320b9e60b25c1 100644 --- 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 index 72b246a63ce81..fd3f7da4c95e9 100644 --- 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 index fbde03fd3cad5..edf4bdf72264b 100644 --- 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 index fbde03fd3cad5..edf4bdf72264b 100644 --- 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 index 911817a47e437..08e754d280d5d 100644 --- 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 index 911817a47e437..08e754d280d5d 100644 --- 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 index dab1b13b9a4b4..b9c3686214cde 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,8 +1,8 @@ English (en-GB) - 3.6.0 - June 2016 + 4.0.0 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 8031d3eb870be..b268e5efcbf73 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (United Kingdom) en-GB - 3.6.0 - June 2016 + 4.0.0 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 54ebb77d917bd..537a9ac82c6fb 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.0-rc - June 2016 + 4.0.0-dev + July 2016 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 47cf5fc21f1cc..4ad24fad10c10 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,8 +2,8 @@ English (en-GB) Language Pack en-GB - 3.6.0.1 - June 2016 + 4.0.0.1 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/build.xml b/build.xml index 8cbd45ca6efb3..4f71b47a4c021 100644 --- a/build.xml +++ b/build.xml @@ -84,7 +84,7 @@ - + diff --git a/installation/language/ar-AA/ar-AA.ini b/installation/language/ar-AA/ar-AA.ini index ba528bdca8706..d0594e745faf9 100644 --- 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 index 6cdc9c55c4761..d9adbf264371e 100644 --- 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"> English (United Kingdom) - 3.6.0 - June 2016 + 4.0.0 + July 2016 Joomla! Project Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/et-EE/et-EE.ini b/installation/language/et-EE/et-EE.ini index 28ca335482506..e8c79347166c8 100644 --- 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 index d309f4fbe6e86..1d51c449bf6af 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,8 +1,8 @@ English (en-GB) - 3.6.0 - June 2016 + 4.0.0 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 7427c1b8457b8..c0572f2a71bc2 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,8 +2,8 @@ English (United Kingdom) en-GB - 3.6.0 - June 2016 + 4.0.0 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index 83ac975dc9e9d..fe7a4bbe77ee9 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -30,7 +30,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELEASE = '3.6'; + const RELEASE = '4.0'; /** * Maintenance version. @@ -38,7 +38,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_LEVEL = '0-rc'; + const DEV_LEVEL = '0-dev'; /** * Development status. @@ -46,7 +46,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_STATUS = 'Release Candidate'; + const DEV_STATUS = 'Development'; /** * Build number. @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '28-June-2016'; + const RELDATE = '4-July-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @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 index f22cd81bb613a..f2cb325328221 100644 --- 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 index 35a7a94a64d29..39a413afc93c2 100644 --- 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 index 2dd8799cf0a4f..cbc106dec0872 100644 --- 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 index 9d1581bbb27b2..43dc2857f16b5 100644 --- 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 index 0df800038381e..9abe8969055e1 100644 --- a/plugins/behaviour/taggable/taggable.xml +++ b/plugins/behaviour/taggable/taggable.xml @@ -6,7 +6,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt PLG_BEHAVIOUR_TAGGABLE_XML_DESCRIPTION diff --git a/plugins/behaviour/versionable/versionable.php b/plugins/behaviour/versionable/versionable.php index b2d15e74e46d8..83753cc0719c1 100644 --- 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 index 0e411c762f1e9..c15ec04cf3e0a 100644 --- a/plugins/behaviour/versionable/versionable.xml +++ b/plugins/behaviour/versionable/versionable.xml @@ -6,7 +6,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt PLG_BEHAVIOUR_VERSIONABLE_XML_DESCRIPTION