Merge branch 'staging' into username

.github/ISSUE_TEMPLATE.md

@@ -1,18 +1,18 @@
-#### Steps to reproduce the issue
+### Steps to reproduce the issue
 
 
 
-#### Expected result
+### Expected result
 
 
 
-#### Actual result
+### Actual result
 
 
 
-#### System information (as much as possible)
+### System information (as much as possible)
 
 
 
-#### Additional comments
+### Additional comments
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 Pull Request for Issue # .
 
-#### Summary of Changes
+### Summary of Changes
 
-#### Testing Instructions
+### Testing Instructions
 
-#### Documentation Changes Required
+### Documentation Changes Required

.gitignore

@@ -15,10 +15,14 @@
 /configuration.php
 /.htaccess
 /web.config
+/.php_cs.cache
 
 # Test Related Files #
 /phpunit.xml
 
+# Node modules #
+node_modules/
+
 # phpDocumentor Logs #
 phpdoc-*
 

.php_cs

@@ -0,0 +1,65 @@
+<?php
+
+$topFilesFinder = Symfony\CS\Finder\DefaultFinder::create()
+	->in(array(__DIR__ . '/libraries'))
+	->files()
+	->depth(0);
+
+$mainFinder = Symfony\CS\Finder\DefaultFinder::create()
+	->in(
+		array(
+			__DIR__ . '/libraries/cms',
+			__DIR__ . '/libraries/joomla',
+			__DIR__ . '/libraries/legacy',
+		)
+	)
+	->append($topFilesFinder);
+
+return Symfony\CS\Config\Config::create()
+    ->setUsingLinter(false)
+    ->setUsingCache(true)
+    ->level(Symfony\CS\FixerInterface::NONE_LEVEL)
+    ->fixers(
+	    array(
+		    // psr-1
+		    'encoding',
+		    // psr-2
+		    'elseif',
+		    'eof_ending',
+		    'function_call_space',
+		    'line_after_namespace',
+		    'linefeed',
+		    'lowercase_constants',
+		    'lowercase_keywords',
+		    'method_argument_space',
+		    'multiple_use',
+		    'parenthesis',
+		    'single_line_after_imports',
+		    'trailing_spaces',
+		    'visibility',
+		    // symfony
+		    'array_element_no_space_before_comma',
+		    'array_element_white_space_after_comma',
+		    'duplicate_semicolon',
+		    'empty_return',
+		    'extra_empty_lines',
+		    'function_typehint_space',
+		    'include',
+		    'join_function',
+		    'list_commas',
+		    'multiline_array_trailing_comma',
+		    'no_blank_lines_after_class_opening',
+		    'phpdoc_trim',
+		    'return',
+		    'single_array_no_trailing_comma',
+		    'single_blank_line_before_namespace',
+		    'spaces_cast',
+		    'unneeded_control_parentheses',
+		    'unused_use',
+		    'whitespacy_lines',
+		    // contrib
+		    'concat_with_spaces',
+		    'long_array_syntax',
+        )
+    )
+    ->finder($mainFinder);

.travis.yml

@@ -6,13 +6,18 @@ language: php
 env:
   global:
     - RUN_PHPCS="no"
+    - RUN_UNIT_TESTS="yes"
+    - RUN_JAVASCRIPT_TESTS="no"
     - INSTALL_MEMCACHE="yes"
     - INSTALL_MEMCACHED="yes"
     - INSTALL_REDIS="yes"
 
 matrix:
   fast_finish: true
   include:
+    - node_js: 6.1
+      sudo: true
+      env: RUN_JAVASCRIPT_TESTS="yes" RUN_UNIT_TESTS="no"
     - php: 5.3
       env: INSTALL_APC="yes"
     - php: 5.4
@@ -50,30 +55,15 @@ services:
   - redis-server
 
 before_script:
+  # JavaScript tests
+  - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash build/travis/javascript-tests.sh $PWD; fi
   # Make sure all dev dependencies are installed
-  - composer install
-  # Set up databases for testing
-  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then mysql -e 'create database joomla_ut;'; fi
-  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then mysql joomla_ut < tests/unit/schema/mysql.sql; fi
-  - if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then mysql -u root -e 'create database joomla_ut;'; fi
-  - if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then mysql -u root joomla_ut < tests/unit/schema/mysql.sql; fi
-  - psql -c 'create database joomla_ut;' -U postgres
-  - psql -d joomla_ut -a -f tests/unit/schema/postgresql.sql
-  # Set up Apache
-  # - ./build/travis/php-apache.sh
-  # Enable additional PHP extensions
-  - if [[ $INSTALL_MEMCACHE == "yes" ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
-  - if [[ $INSTALL_MEMCACHED == "yes" ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
-  - if [[ $INSTALL_APC == "yes" ]]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
-  - if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 5.* ]]; then printf "\n" | pecl install apcu-4.0.10 && phpenv config-add build/travis/phpenv/apcu-$TRAVIS_PHP_VERSION.ini; fi
-  - if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 7.* ]]; then printf "\n" | pecl install apcu-beta && phpenv config-add build/travis/phpenv/apcu-$TRAVIS_PHP_VERSION.ini; fi
-  - if [[ $INSTALL_APCU_BC_BETA == "yes" ]]; then printf "\n" | pecl install apcu_bc-beta; fi
-  - if [[ $INSTALL_REDIS == "yes" && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-add build/travis/phpenv/redis.ini; fi
-  - if [[ $INSTALL_REDIS == "yes" && $TRAVIS_PHP_VERSION = hhvm ]]; then cat build/travis/phpenv/redis.ini >> /etc/hhvm/php.ini; fi
+  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then bash build/travis/unit-tests.sh $PWD; fi
 
 script:
-  - libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
+  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi
   - if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
+  - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run ; fi
 
 branches:
   except:

README.md

@@ -53,7 +53,7 @@ Ready to install Joomla?
 * Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html). 
 * How do you [install Joomla](https://docs.joomla.org/J3.x:Installing_Joomla)?
 * You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
-When ready, it can be moved to an on-line hosting account of your choice.
+When ready, it can be moved to an online hosting account of your choice.
 
 Updates are free!
 ---------------------

README.txt

@@ -38,7 +38,7 @@
 	* Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
 	* How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla
 	* You could start your Joomla! experience building your site on 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 online hosting account of your choice.
 	See the tutorial: https://docs.joomla.org/Installing_Joomla_locally
 
 9- Updates are free!

administrator/components/com_admin/script.php

@@ -250,8 +250,8 @@ protected function updateManifestCaches()
 			array('library', 'fof', '', 0),
 			array('library', 'phpass', '', 0),
 
-			// Modules site
-			// Site
+			// Modules
+			// - Site
 			array('module', 'mod_articles_archive', '', 0),
 			array('module', 'mod_articles_latest', '', 0),
 			array('module', 'mod_articles_popular', '', 0),
@@ -277,7 +277,7 @@ protected function updateManifestCaches()
 			array('module', 'mod_tags_popular', '', 0),
 			array('module', 'mod_tags_similar', '', 0),
 
-			// Administrator
+			// - Administrator
 			array('module', 'mod_custom', '', 1),
 			array('module', 'mod_feed', '', 1),
 			array('module', 'mod_latest', '', 1),
@@ -293,7 +293,7 @@ protected function updateManifestCaches()
 			array('module', 'mod_toolbar', '', 1),
 			array('module', 'mod_multilangstatus', '', 1),
 
-			// Plug-ins
+			// Plugins
 			array('plugin', 'gmail', 'authentication', 0),
 			array('plugin', 'joomla', 'authentication', 0),
 			array('plugin', 'ldap', 'authentication', 0),
@@ -1426,6 +1426,7 @@ public function deleteUnexistingFiles()
 			'/administrator/templates/isis/js/jquery.js',
 			'/administrator/templates/isis/js/bootstrap.min.js',
 			'/media/system/js/permissions.min.js',
+			'/libraries/platform.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode

administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql

@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE `#__newsfeeds` MODIFY `link` VARCHAR(2048) NOT NULL;

administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql

@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE "#__newsfeeds" ALTER COLUMN "link" TYPE character varying(2048);

administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql

@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [link] [nvarchar](2048) NOT NULL;

administrator/components/com_banners/banners.php

@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_banners'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 // Execute the task.

administrator/components/com_banners/models/forms/banner.xml

@@ -92,7 +92,7 @@
 			description="COM_BANNERS_FIELD_DESCRIPTION_DESC"
 			filter="JComponentHelper::filterText"
 			buttons="true"
-			hide="readmore,pagebreak"
+			hide="readmore,pagebreak,module"
 		/>
 
 		<field