Merge remote-tracking branch 'upstream/staging' into banners_frontend_cs

Conflicts:
	components/com_banners/models/banners.php

.travis.yml

@@ -8,12 +8,12 @@ php:
 
 before_script:
   - composer self-update
-  - pyrus install -f pear/PHP_CodeSniffer-1.5.4
+  - pyrus install -f pear/PHP_CodeSniffer-1.5.5
   - phpenv rehash
   - mysql -e 'create database joomla_ut;'
-  - mysql joomla_ut < tests/unit/suites/database/stubs/mysql.sql
+  - mysql joomla_ut < tests/unit/schema/mysql.sql
   - psql -c 'create database joomla_ut;' -U postgres
-  - psql -d joomla_ut -a -f tests/unit/suites/database/stubs/postgresql.sql
+  - psql -d joomla_ut -a -f tests/unit/schema/postgresql.sql
 
 script:
   - phpunit --configuration travisci-phpunit.xml

CONTRIBUTING.md

@@ -6,6 +6,8 @@ All contributions are welcome to be submitted for review for inclusion in the Jo
 
 2) Follow the [Joomla! Coding Standards](http://joomla.github.io/coding-standards)!
 
+3) When filing an issue or opening a pull request, please include a clear title and description.  The title should be a short summary of an issue and if possible, should include a reference to an open issue.  For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient.  All issues and pull requests should include a description with as much detail as possible, including what the issue is, (if a pull request) what the pull request is addressing as well as testing instructions, and environmental information (PHP version, database driver and version, and other data you would retrieve from your site's System Information view) in case the issue is specific to certain environments.  If additional information is needed, please be prepared to provide it as our community members review your submission.
+
 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

administrator/components/com_admin/controller.php

@@ -12,9 +12,7 @@
 /**
  * Admin Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminController extends JControllerLegacy
 {

administrator/components/com_admin/controllers/profile.php

@@ -12,9 +12,7 @@
 /**
  * User profile controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminControllerProfile extends JControllerForm
 {

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

@@ -12,9 +12,7 @@
 /**
  * Utility class working with directory
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlDirectory
 {

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

@@ -12,9 +12,7 @@
 /**
  * Utility class working with phpsetting
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlPhpSetting
 {

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

@@ -12,9 +12,7 @@
 /**
  * Utility class working with system
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 abstract class JHtmlSystem
 {

administrator/components/com_admin/models/help.php

@@ -12,9 +12,7 @@
 /**
  * Admin Component Help Model
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminModelHelp extends JModelLegacy
 {

administrator/components/com_admin/models/profile.php

@@ -14,9 +14,7 @@
 /**
  * User model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminModelProfile extends UsersModelUser
 {

administrator/components/com_admin/models/sysinfo.php

@@ -12,9 +12,7 @@
 /**
  * Model for the display of system information.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminModelSysInfo extends JModelLegacy
 {

administrator/components/com_admin/script.php

@@ -12,9 +12,7 @@
 /**
  * Script file of Joomla CMS
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6.4
+ * @since  1.6.4
  */
 class JoomlaInstallerScript
 {

administrator/components/com_admin/views/help/view.html.php

@@ -12,9 +12,7 @@
 /**
  * HTML View class for the Admin component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminViewHelp extends JViewLegacy
 {
@@ -49,7 +47,11 @@ class AdminViewHelp extends JViewLegacy
 	protected $start_here = null;
 
 	/**
-	 * Display the view
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -66,6 +68,8 @@ public function display($tpl = null)
 	/**
 	 * Setup the Toolbar
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()

administrator/components/com_admin/views/profile/view.html.php

@@ -12,9 +12,7 @@
 /**
  * View class to allow users edit their own profile.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminViewProfile extends JViewLegacy
 {
@@ -25,7 +23,11 @@ class AdminViewProfile extends JViewLegacy
 	protected $state;
 
 	/**
-	 * Display the view
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -37,6 +39,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -50,6 +53,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()

administrator/components/com_admin/views/sysinfo/view.html.php

@@ -12,9 +12,7 @@
 /**
  * Sysinfo View class for the Admin component
  *
- * @package     Joomla.Administrator
- * @subpackage  com_admin
- * @since       1.6
+ * @since  1.6
  */
 class AdminViewSysinfo extends JViewLegacy
 {
@@ -44,7 +42,11 @@ class AdminViewSysinfo extends JViewLegacy
 	protected $directory = null;
 
 	/**
-	 * Display the view
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
@@ -89,6 +91,8 @@ protected function _setSubMenu()
 	/**
 	 * Setup the Toolbar
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()

administrator/components/com_banners/controller.php

@@ -12,9 +12,7 @@
 /**
  * Banners master display controller.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersController extends JControllerLegacy
 {

administrator/components/com_banners/controllers/banner.php

@@ -12,9 +12,7 @@
 /**
  * Banner controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerBanner extends JControllerForm
 {

administrator/components/com_banners/controllers/banners.php

@@ -12,9 +12,7 @@
 /**
  * Banners list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerBanners extends JControllerAdmin
 {

administrator/components/com_banners/controllers/client.php

@@ -12,9 +12,7 @@
 /**
  * Client controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerClient extends JControllerForm
 {

administrator/components/com_banners/controllers/clients.php

@@ -12,9 +12,7 @@
 /**
  * Clients list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerClients extends JControllerAdmin
 {

administrator/components/com_banners/controllers/tracks.php

@@ -12,9 +12,7 @@
 /**
  * Tracks list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerTracks extends JControllerLegacy
 {

administrator/components/com_banners/controllers/tracks.raw.php

@@ -12,9 +12,7 @@
 /**
  * Tracks list controller class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersControllerTracks extends JControllerLegacy
 {

administrator/components/com_banners/helpers/banners.php

@@ -12,9 +12,7 @@
 /**
  * Banners component helper.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersHelper extends JHelperContent
 {

administrator/components/com_banners/helpers/html/banner.php

@@ -12,9 +12,7 @@
 /**
  * Banner HTML class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       2.5
+ * @since  2.5
  */
 abstract class JHtmlBanner
 {

administrator/components/com_banners/models/banner.php

@@ -12,9 +12,7 @@
 /**
  * Banner model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelBanner extends JModelAdmin
 {

administrator/components/com_banners/models/banners.php

@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of banner records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelBanners extends JModelList
 {

administrator/components/com_banners/models/client.php

@@ -12,9 +12,7 @@
 /**
  * Client model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelClient extends JModelAdmin
 {

administrator/components/com_banners/models/clients.php

@@ -12,9 +12,7 @@
 /**
  * Methods supporting a list of banner records.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class BannersModelClients extends JModelList
 {

administrator/components/com_banners/models/download.php

@@ -12,9 +12,7 @@
 /**
  * Download model.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.5
+ * @since  1.5
  */
 class BannersModelDownload extends JModelForm
 {

administrator/components/com_banners/models/fields/bannerclient.php

@@ -16,9 +16,7 @@
 /**
  * Bannerclient Field class for the Joomla Framework.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_banners
- * @since       1.6
+ * @since  1.6
  */
 class JFormFieldBannerClient extends JFormFieldList
 {