Merge pull request #1 from joomla/master

Master

.gitignore

@@ -16,3 +16,14 @@
 
 # Test Related Files #
 /phpunit.xml
+/tests/system/webdriver/tests/logs/
+/tests/system/servers/configdef.php
+
+# phpDocumentor Logs #
+phpdoc-*
+
+# Patch Tester
+administrator/components/com_patchtester/
+administrator/templates/hathor/html/com_patchtester
+components/com_patchtester/
+

.travis.yml

@@ -3,15 +3,31 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
 
 before_script:
-  - pyrus channel-discover pear.phpunit.de
-  - pyrus install --force phpunit/DbUnit
+  - composer self-update
+  - pyrus install -f pear/PHP_CodeSniffer-1.5.4
   - phpenv rehash
+  - mysql -e 'create database joomla_ut;'
+  - mysql joomla_ut < tests/unit/suites/database/stubs/mysql.sql
+  - psql -c 'create database joomla_ut;' -U postgres
+  - psql -d joomla_ut -a -f tests/unit/suites/database/stubs/postgresql.sql
 
 script:
   - phpunit --configuration travisci-phpunit.xml
+  - phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .
 
 branches:
   except:
     - 2.5.x
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/18687d008d633d02aa84
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
+

CONTRIBUTING.md

@@ -2,10 +2,20 @@ Contributing to the Joomla! CMS
 ===============
 All contributions are welcome to be submitted for review for inclusion in the Joomla! CMS, but before they will be accepted, we ask that you follow these simple steps:
 
-1) Open an item on the Joomlacode tracker in the appropriate area.
-* CMS Bug Reports: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8103
-* CMS Feature Requests: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8549
+1) Open an issue on our [Issue Tracker](http://issues.joomla.org/) or here on GitHub. If you can provide a fix create a pull request instead, it will automatically create the issue for you.
 
-2) After submitting the item to the Joomlacode tracker, add a link to the Joomlacode tracker item and the GitHub issue or pull request.
+2) Follow the [Joomla! Coding Standards](http://joomla.github.io/coding-standards)!
 
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
+
+#### Branches
+Pull Requests should usually be made for the `staging` branch as this contains the most recent version of the code.
+There are other branches available which serve specific purposes.
+
+| Branch | Purpose |
+| ------ | ------- |
+| staging | Current codebase. |
+| master | Each commit made to staging gets tested if it passes unit tests and codestyle rules and then merged into master. This is done automatically. |
+| 2.5.x | Branch for the Joomla 2.5.x series. Currently in maintenance mode with EOL end of 2014. No new features are accepted here. |
+| 3.2.x | Branch for the Joomla 3.2.x series. Currently in security mode with EOL Oct 2014. Only security issues are fixed. |
+| 3.4-dev | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. |

README.md

@@ -1,18 +1,23 @@
-Joomla! CMS [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
+Joomla! CMS [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
 ====================
 
+Build Status
+---------------------
+Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
+Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)
+
 What is this?
 ---------------------
-* This is a Joomla! installation/upgrade package to version 3.0.x
+* This is a Joomla! installation/upgrade package to version 3.x
 * Joomla! [Official site](http://www.joomla.org)
-* Joomla! 3.0 [version history](http://docs.joomla.org/Joomla_3.0_version_history)
-* Detailed changes in the [Changelog](http://joomlacode.org/gf/project/joomla/scmsvn/?action=browse&path=/development/trunk/administrator/&view=log)
+* Joomla! 3.3 [version history](http://docs.joomla.org/Joomla_3.3_version_history)
+* Detailed changes in the [Changelog](https://github.com/joomla/joomla-cms/commits/master)
 
 What is Joomla?
 ---------------------
 * Joomla! is a **Content Management System** (CMS) which enables you to build Web sites and powerful online applications.
 * It's a **free and OpenSource software**, distributed under the GNU General Public License version 2 or later
-* This is a simple and powerful web server application and it requires a server with PHP and MySQL to run it.
+* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run it.
 More [details here](http://www.joomla.org/about-joomla.html)
 
 Is Joomla! for you?
@@ -61,13 +66,13 @@ Where can you get support and help?
 * Post questions at [our forums](http://forum.joomla.org)
 * [Joomla Resources Directory](http://resources.joomla.org/tos.html) (JRD):
 
-Do you already have a Joomla site that's not built with Joomla 3.0.x ?
+Do you already have a Joomla site that's not built with Joomla 3.x ?
 ---------------------
-* What's [new in Joomla 3.0.x](http://www.joomla.org/3)
-* What are the [main differences from 2.5 to 3.0](http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0)?
-* How to [migrate from 2.5.x to 3.0.x](http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0)?
+* What's [new in Joomla 3.x](http://www.joomla.org/3)
+* What are the [main differences from 2.5 to 3.x](http://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F)?
+* How to [migrate from 2.5.x to 3.x](http://docs.joomla.org/Should_I_update_from_Joomla!_2.5_to_3.x%3F)?
 * What are the [main differences from 1.5 to 2.5](http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5)?
-* How to [migrate from 1.5.x to 3.0.x](http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0)?
+* How to [migrate from 1.5.x to 3.x](http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0)?
 * [Convert an existing Web site to Joomla](http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site)
 
 Do you want to improve Joomla?
@@ -80,7 +85,7 @@ Do you want to improve Joomla?
 
 Copyright:
 ---------------------
-* Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-* [Credits](http://docs.joomla.org/Joomla_3.0_Credits)
+* Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+* [Credits](http://docs.joomla.org/Joomla!_Credits_and_Thanks)
 * Distributed under the GNU General Public License version 2 or later
 * See [Licenses details](http://docs.joomla.org/Joomla_Licenses)

README.txt

@@ -1,13 +1,13 @@
 1- What is this?
-	* This is a Joomla! installation/upgrade package to version 3.0.x
+	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: http://www.joomla.org
-	* Joomla 3.0 version history - http://docs.joomla.org/Joomla_3.0_version_history
-	* Detailed changes in the Changelog: http://joomlacode.org/gf/project/joomla/scmsvn/?action=browse&path=/development/trunk/administrator/&view=log
+	* Joomla 3.3 version history - http://docs.joomla.org/Joomla_3.3_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?
 	* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
 	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later
-	* This is a simple and powerful web server application and it requires a server with PHP and MySQL to run it. 
+	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run it.
 	More details here: http://www.joomla.org/about-joomla.html
 
 3- Is Joomla for you?
@@ -36,7 +36,7 @@
 	* See minimum requirements here: http://www.joomla.org/technical-requirements.html
 	* How do you install Joomla! ? - http://docs.joomla.org/Installing_Joomla!
 	* Start your Joomla experience building your site with a local test server.
-	When ready it can be moved to an on-line hosting account of your choice. 
+	When ready it can be moved to an on-line hosting account of your choice.
 	See the tutorial: http://docs.joomla.org/Tutorial:Joomla_Local_install
 
 9- Updates are free!
@@ -49,12 +49,12 @@
 	* Post questions at our forums: http://forum.joomla.org
 	* Joomla Resources Directory (JRD): http://resources.joomla.org/tos.html
 
-11- Do you already have a Joomla site that's not built with Joomla 3.0.x ?
-	* What's new in Joomla 3.0.x - http://www.joomla.org/3
-	* What are the main differences from 2.5 to 3.0? Table of contents: http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
-	* How to migrate from 2.5.x to 3.0.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0
+11- Do you already have a Joomla site that's not built with Joomla 3.x ?
+	* What's new in Joomla 3.x - http://www.joomla.org/3
+	* What are the main differences from 2.5 to 3? Table of contents: http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
+	* How to migrate from 2.5.x to 3.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0
 	* What are the main differences from 1.5 to 2.5? Table of contents: http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5
-	* How to migrate from 1.5.x to 3.0.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0
+	* How to migrate from 1.5.x to 3.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0
 	* Convert an existing Web site to Joomla - http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site
 
 12- Do you want to improve Joomla?
@@ -65,7 +65,7 @@
 	* Are you a Web designer? http://docs.joomla.org/Web_designers
 
 Copyright:
-	* Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-	* Credits: http://docs.joomla.org/Joomla_3.0_Credits
+	* Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+	* Credits: http://docs.joomla.org/Joomla!_Credits_and_Thanks
 	* Distributed under the GNU General Public License version 2 or later
 	* See Licenses details at http://docs.joomla.org/Joomla_Licenses

administrator/components/com_admin/admin.php

@@ -3,14 +3,15 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
 
 // No access check.
 
-$controller	= JControllerLegacy::getInstance('Admin');
+$controller = JControllerLegacy::getInstance('Admin');
 $controller->execute(JFactory::getApplication()->input->get('task'));
 $controller->redirect();

administrator/components/com_admin/admin.xml

@@ -3,10 +3,9 @@
 	<name>com_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
-	<license>GNU General Public License version 2 or later; see
-		LICENSE.txt</license>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>

administrator/components/com_admin/controller.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/controllers/profile.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,14 +19,15 @@
 class AdminControllerProfile extends JControllerForm
 {
 	/**
-	 * Method to check if you can add a new record.
+	 * Method to check if you can edit a record.
 	 *
 	 * Extended classes can override this if necessary.
 	 *
-	 * @param   array  An array of input data.
-	 * @param   string	The name of the key for the primary key.
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
@@ -37,26 +38,16 @@ protected function allowEdit($data = array(), $key = 'id')
 	/**
 	 * Overrides parent save method to check the submitted passwords match.
 	 *
-	 * @return  mixed  Boolean or JError.
-	 * @since   1.6
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   3.2
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		$data = $this->input->post->get('jform', array(), 'array');
-
-		// TODO: JForm should really have a validation handler for this.
-		if (isset($data['password']) && isset($data['password2']))
-		{
-			// Check the passwords match.
-			if ($data['password'] != $data['password2'])
-			{
-				$this->setMessage(JText::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'), 'warning');
-				$this->setRedirect(JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id='.JFactory::getUser()->id, false));
-				return false;
-			}
-
-			unset($data['password2']);
-		}
+		$this->setRedirect(JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id=' . JFactory::getUser()->id, false));
 
 		$return = parent::save();
 
@@ -72,9 +63,10 @@ public function save($key = null, $urlVar = null)
 	/**
 	 * Method to cancel an edit.
 	 *
-	 * @param   string	$key	The name of the primary key of the URL variable.
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  Boolean  True if access level checks pass, false otherwise.
 	 *
-	 * @return  Boolean	True if access level checks pass, false otherwise.
 	 * @since   1.6
 	 */
 	public function cancel($key = null)

administrator/components/com_admin/helpers/html/directory.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,32 +21,32 @@ abstract class JHtmlDirectory
 	/**
 	 * Method to generate a (un)writable message for directory
 	 *
-	 * @param   boolean	$writable is the directory writable?
+	 * @param   boolean  $writable  is the directory writable?
 	 *
 	 * @return  string	html code
 	 */
 	public static function writable($writable)
 	{
 		if ($writable)
 		{
-			return '<span class="badge badge-success">'. JText::_('COM_ADMIN_WRITABLE') .'</span>';
+			return '<span class="badge badge-success">' . JText::_('COM_ADMIN_WRITABLE') . '</span>';
 		}
 		else
 		{
-			return '<span class="badge badge-important">'. JText::_('COM_ADMIN_UNWRITABLE') .'</span>';
+			return '<span class="badge badge-important">' . JText::_('COM_ADMIN_UNWRITABLE') . '</span>';
 		}
 	}
 
 	/**
 	 * Method to generate a message for a directory
 	 *
-	 * @param   string	$dir the directory
-	 * @param   boolean	$message the message
-	 * @param   boolean	$visible is the $dir visible?
+	 * @param   string   $dir      the directory
+	 * @param   boolean  $message  the message
+	 * @param   boolean  $visible  is the $dir visible?
 	 *
 	 * @return  string	html code
 	 */
-	public static function message($dir, $message, $visible=true)
+	public static function message($dir, $message, $visible = true)
 	{
 		if ($visible)
 		{
@@ -56,13 +56,14 @@ public static function message($dir, $message, $visible=true)
 		{
 			$output = '';
 		}
+
 		if (empty($message))
 		{
 			return $output;
 		}
 		else
 		{
-			return $output.' <strong>'.JText::_($message).'</strong>';
+			return $output . ' <strong>' . JText::_($message) . '</strong>';
 		}
 	}
 }