Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version bump & Fix global class use #27

Merged
merged 1 commit into from
Jul 4, 2016
Merged

Version bump & Fix global class use #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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?
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.plg_behaviour_taggable.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.plg_behaviour_taggable.sys.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.plg_behaviour_versionable.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.plg_behaviour_versionable.sys.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/en-GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/packages/pkg_en-GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion installation/language/ar-AA/ar-AA.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions installation/language/en-GB/en-GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/et-EE/et-EE.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions language/en-GB/en-GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions language/en-GB/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions libraries/cms/version/version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion libraries/joomla/user/response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Cms/Service/Provider/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand All @@ -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
);
Expand Down
7 changes: 3 additions & 4 deletions libraries/src/Cms/Service/Provider/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand All @@ -13,7 +13,6 @@

use Joomla\DI\Container;
use Joomla\DI\ServiceProviderInterface;
use Joomla\Event\Dispatcher;

/**
* Service provider for the application's database dependency
Expand All @@ -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'),
Expand All @@ -50,7 +49,7 @@ function (Container $container)

try
{
$db = JDatabaseDriver::getInstance($options);
$db = \JDatabaseDriver::getInstance($options);
}
catch (RuntimeException $e)
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/behaviour/taggable/taggable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion plugins/behaviour/taggable/taggable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/behaviour/versionable/versionable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion plugins/behaviour/versionable/versionable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down