Sync. Merge branch 'master' into tinymce-scriptoptions

.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,5 +1,7 @@
 Pull Request for Issue # .
 
-#### Summary of Changes
+### Summary of Changes
 
-#### Testing Instructions
+### Testing Instructions
+
+### Documentation Changes Required

.gitignore

@@ -15,19 +15,13 @@
 /configuration.php
 /.htaccess
 /web.config
+/.php_cs.cache
 
 # Test Related Files #
 /phpunit.xml
-/tests/system/webdriver/tests/logs/
-/tests/system/servers/configdef.php
-codecept.phar
-tests/codeception/_output/*
-tests/codeception/vendor/*
-tests/codeception/testingsite*
-tests/codeception/tests/acceptance.suite.yml
-tests/codeception/tests/acceptance/*Tester.php
-tests/codeception/tests/functional/*Tester.php
-tests/codeception/tests/unit/*Tester.php
+
+# 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
@@ -23,6 +28,8 @@ matrix:
       env: RUN_PHPCS="yes" INSTALL_APCU="yes"
     - php: 7.0
       env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
+    - php: 7.1
+      env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
     - php: hhvm
       sudo: true
       dist: trusty
@@ -39,6 +46,7 @@ matrix:
         - redis-server
       env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" # Disabled items that currently do not work in travis-ci hhvm
   allow_failures:
+    - php: 7.1
     - php: hhvm
 
 services:
@@ -47,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

@@ -15,25 +15,26 @@ What is this?
 
 What is Joomla?
 ---------------------
-* Joomla is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
-* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](https://www.joomla.org/about-joomla.html).
+* [Joomla](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
+* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
 * Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
 
 Is Joomla! for you?
 ---------------------
-* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F).
-* View Joomla's core [features here](https://www.joomla.org/core-features.html).
+* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
+* View Joomla's [core features here](https://www.joomla.org/core-features.html).
 * Try it out for yourself in our [online demo](https://demo.joomla.org).
 
 How to find a Joomla! translation?
 ---------------------
-* Repository of [accredited language packs](http://community.joomla.org/translations.html).
-* You can also add languages directly to your website via your Joomla! administration panel.
+* Repository of [accredited language packs](https://community.joomla.org/translations.html).
+* You can also [add languages](https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language) directly to your website via your Joomla! administration panel.
+* Learn how to [setup a Multilingual Joomla! Site](https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site)
 
 Learn Joomla!
 ---------------------
 * Read ['Getting Started with Joomla!'](https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!) to learn the basics.
-* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Beginners).
+* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Portal:Beginners).
 
 What are the benefits of Joomla?
 ---------------------
@@ -45,14 +46,14 @@ Is it easy to change the layout display?
 ---------------------
 * The layout is controlled by templates that you can edit.
 * There are a lot of ready-made professional templates that you can download.
-* Template management information is [available here](https://docs.joomla.org/Portal:Administrators#Template_Management).
+* Template management information is [available here](https://docs.joomla.org/Portal:Template_Management).
 
 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/Installing_Joomla!)?
+* 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!
 ---------------------
@@ -67,20 +68,19 @@ Where can you get support and help?
 * Post questions at [our forums](http://forum.joomla.org);
 * [Joomla Resources Directory](http://resources.joomla.org/) (JRD).
 
-Do you already have a Joomla site that isn't built with Joomla 3.x?
+Do you already have a Joomla! site that isn't built with Joomla! 3.x?
 ---------------------
 * What's [new in Joomla! 3.x](https://www.joomla.org/3)?
 * What are the [main differences between 2.5 and 3.x](https://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](https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration).
 * How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration).
-* How to [convert an existing website to Joomla](https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site).
 
 Do you want to improve Joomla?
 --------------------
-* How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)?
-* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)?
+* Where to [request a feature](https://issues.joomla.org/)?
+* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org/)?
 * Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/).
-* Documentation for [Developers](https://docs.joomla.org/Developers).
+* Documentation for [Developers](https://docs.joomla.org/Portal:Developers).
 * Documentation for [Web designers](https://docs.joomla.org/Web_designers).
 
 Copyright

README.txt

@@ -6,38 +6,40 @@
 
 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 either MySQL, PostgreSQL, or SQL Server to run it.
-	More details here: https://www.joomla.org/about-joomla.html
+	* 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 either MySQL, PostgreSQL, or SQL Server to run.
+	You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
 
-3- Is Joomla for you?
-	* Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F
-	* See Features - https://www.joomla.org/core-features.html
+3- Is Joomla! for you?
+	* Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
+	* See Joomla's core features - https://www.joomla.org/core-features.html
 	* Try out our online demo: https://demo.joomla.org/
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: http://community.joomla.org/translations.html
-	* You can also add languages directly to your website via your Joomla! administration panel.
+	* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language
+	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site
 
 5- Learn Joomla!
 	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!
-	* Before installing, read the beginners guide: https://docs.joomla.org/Beginners
+	* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners
 
-6- What are the limits of Joomla?
-	* Joomla sites can be extended in functionalities with Extensions that you can create (or download) to suite your needs.
-	* There are lots of ready made extensions that you can download and install.
-	* See the Joomla! Extensions Directory (JED): http://extensions.joomla.org
+6- What are the benefits of Joomla?
+	* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+	* There are many ready-made extensions that you can download and install.
+	* Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
 
 7- Is it easy to change the layout display?
 	* The layout is controlled by templates that you can edit.
-	* There are lots of ready made templates that you can download.
+	* There are a lot of ready-made professional templates that you can download.
+	* Check out the template management information: https://docs.joomla.org/Portal:Template_Management
 
 8- Ready to install Joomla?
-	* See minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
-	* How do you install Joomla! ? - https://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.
-	See the tutorial: https://docs.joomla.org/Tutorial:Joomla_Local_install
+	* 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 online hosting account of your choice.
+	See the tutorial: https://docs.joomla.org/Installing_Joomla_locally
 
 9- Updates are free!
 	* Always use the latest version: https://www.joomla.org/download.html
@@ -48,21 +50,20 @@
 	* Find the information you need: https://docs.joomla.org/Start_here
 	* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
 	* Post questions at our forums: http://forum.joomla.org
-	* Joomla Resources Directory (JRD): http://resources.joomla.org/
+	* Joomla! Resources Directory (JRD): http://resources.joomla.org/
 
-11- Do you already have a Joomla site that's not built with Joomla 3.x ?
-	* What's new in Joomla 3.x: https://www.joomla.org/3
-	* What are the main differences from 2.5 to 3? Table of contents: https://docs.joomla.org/Differences_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: https://www.joomla.org/3
+	* What are the main differences from 2.5 to 3? https://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? Tutorial: https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration
 	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration
-	* Convert an existing Web site to Joomla: https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site
 
 12- Do you want to improve Joomla?
-	* How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F
+	* Where to request a feature? https://issues.joomla.org/
 	* How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues
 	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
-	* Are you a Developer? https://docs.joomla.org/Developers
-	* Are you a Web designer? https://docs.joomla.org/Web_designers
+	* Documentation for Developers: https://docs.joomla.org/Portal:Developers
+	* Documentation for Web designers: https://docs.joomla.org/Web_designers
 
 Copyright:
 	* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.

administrator/components/com_admin/models/help.php

@@ -198,7 +198,7 @@ public function &getLatestVersionCheck()
 	{
 		if (!$this->latest_version_check)
 		{
-			$override = 'https://help.joomla.org/proxy/index.php?option=com_help&keyref=Help{major}{minor}:'
+			$override = 'https://help.joomla.org/proxy/index.php?keyref=Help{major}{minor}:'
 				. 'Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&lang={langcode}';
 			$this->latest_version_check = JHelp::createUrl('JVERSION', false, $override);
 		}

administrator/components/com_admin/models/profile.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
+JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php');
 
 /**
  * User model.