Merge branch 'staging' of github.com:joomla/joomla-cms into staging

.appveyor.yml

@@ -91,6 +91,7 @@ install:
     - IF %PHP%==1 echo wincache.enablecli = 1 >> php.ini
     - IF %PHP%==1 echo zend_extension=php_opcache.dll >> php.ini
     - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini
+    - IF %PHP%==1 echo extension=php_ldap.dll >> php.ini
     - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
     - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
     - cd C:\projects\joomla-cms

.github/CONTRIBUTING.md

@@ -20,6 +20,5 @@ There are other branches available which serve specific purposes.
 | Branch | Purpose |
 | ------ | ------- |
 | staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. |
-| master | Each commit made to staging gets tested if it passes unit tests and codestyle rules. It is then merged into master. This is done automatically. |
-| 3.8-dev | Branch for the next minor Joomla version. The 3.8.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
+| 3.9-dev | Branch for the next minor Joomla version. The 3.9.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
 | 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |

.github/SUPPORT.md

@@ -0,0 +1,8 @@
+Where can you get support and help?
+====================
+* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page);
+* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ);
+* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here);
+* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
+* Post questions at [our forums](https://forum.joomla.org);
+* [Joomla Resources Directory](https://resources.joomla.org) (JRD).

.gitignore

@@ -12,6 +12,8 @@
 /administrator/logs
 /cache
 /installation/cache
+/installation/sessions
+/libraries/autoload_psr4.php
 /tmp
 /configuration.php
 /.htaccess
@@ -21,6 +23,9 @@
 # Test Related Files #
 /phpunit.xml
 
+# Stubs file holding mapped classes
+/stubs.php
+
 # Node modules #
 node_modules/
 
@@ -71,12 +76,14 @@ Desktop.ini
 /libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
 /libraries/vendor/ircmaxell/password-compat/README.md
 /libraries/vendor/ircmaxell/password-compat/version-test.php
+/libraries/vendor/joomla/*/.gitattributes
 /libraries/vendor/joomla/*/.github
 /libraries/vendor/joomla/*/.gitignore
 /libraries/vendor/joomla/*/.gitmodules
 /libraries/vendor/joomla/*/docs
 /libraries/vendor/joomla/*/Tests
 /libraries/vendor/joomla/*/vendor
+/libraries/vendor/joomla/*/.scrutinizer.yml
 /libraries/vendor/joomla/*/.travis.yml
 /libraries/vendor/joomla/*/CONTRIBUTING.md
 /libraries/vendor/joomla/*/composer.json
@@ -113,6 +120,12 @@ Desktop.ini
 /libraries/vendor/paragonie/random_compat/psalm-autoload.php
 /libraries/vendor/paragonie/random_compat/psalm.xml
 /libraries/vendor/paragonie/random_compat/tests
+/libraries/vendor/paragonie/sodium_compat/.gitignore
+/libraries/vendor/paragonie/sodium_compat/composer.json
+/libraries/vendor/paragonie/sodium_compat/composer.lock
+/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
+/libraries/vendor/paragonie/sodium_compat/README.md
+/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
 /libraries/vendor/phpmailer/phpmailer/docs
 /libraries/vendor/phpmailer/phpmailer/examples
 /libraries/vendor/phpmailer/phpmailer/language
@@ -122,8 +135,11 @@ Desktop.ini
 /libraries/vendor/phpmailer/phpmailer/.travis.yml
 /libraries/vendor/phpmailer/phpmailer/changelog.md
 /libraries/vendor/phpmailer/phpmailer/composer.json
+/libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
+/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
 /libraries/vendor/phpmailer/phpmailer/README.md
 /libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
+/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
 /libraries/vendor/phpmailer/phpmailer/extras/README.md
 /libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
 /libraries/vendor/psr/log/Psr/Log/Test

.travis.yml

@@ -17,17 +17,24 @@ matrix:
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: 7.1
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
+    # Requires older Precise image
     - php: 5.3
       env: INSTALL_APC="yes"
+      sudo: true
+      dist: precise
+    # The new Trusty image has issues with running APC, do not enable it here
     - php: 5.4
-      env: INSTALL_APC="yes"
+      env: INSTALL_APC="no"
     - php: 5.5
       env: INSTALL_APCU="yes"
     - php: 5.6
       env: INSTALL_APCU="yes"
+    - php: 7.2
+      env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: nightly
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
   allow_failures:
+    - php: 7.2
     - php: nightly
 
 services:

README.md

@@ -15,8 +15,8 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.7 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
+* Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).
 
 What is Joomla?
 ---------------------
@@ -71,7 +71,7 @@ Where can you get support and help?
 * Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here);
 * Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
 * Post questions at [our forums](https://forum.joomla.org);
-* [Joomla Resources Directory](https://resources.joomla.org/) (JRD).
+* [Joomla Resources Directory](https://resources.joomla.org) (JRD).
 
 Do you already have a Joomla! site that isn't built with Joomla! 3.x?
 ---------------------
@@ -82,9 +82,9 @@ Do you already have a Joomla! site that isn't built with Joomla! 3.x?
 
 Do you want to improve Joomla?
 --------------------
-* Where to [request a feature](https://issues.joomla.org/)?
-* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/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/).
+* Where to [request a feature](https://issues.joomla.org)?
+* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/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/Special:MyLanguage/Portal:Developers).
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
 

README.txt

@@ -1,8 +1,8 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.7 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
+	* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
@@ -13,7 +13,7 @@
 3- Is Joomla! for you?
 	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Special:MyLanguage/Portal:Learn_More
 	* See Joomla's core features - https://www.joomla.org/core-features.html
-	* Try out our online demo: https://demo.joomla.org/
+	* Try out our online demo: https://demo.joomla.org
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: https://community.joomla.org/translations.html
@@ -59,9 +59,9 @@
 	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_1.5_to_3.x_Step_by_Step_Migration
 
 12- Do you want to improve Joomla?
-	* Where to request a feature? https://issues.joomla.org/
+	* Where to request a feature? https://issues.joomla.org
 	* How do you report a bug? https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues
-	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
+	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org
 	* Documentation for Developers: https://docs.joomla.org/Special:MyLanguage/Portal:Developers
 	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
 

administrator/components/com_admin/models/sysinfo.php

@@ -118,11 +118,15 @@ class AdminModelSysInfo extends JModelLegacy
 			'proxy_host',
 			'proxy_user',
 			'proxy_pass',
+			'redis_server_host',
+			'redis_server_auth',
 			'secret',
 			'sendmail',
 			'session.save_path',
 			'session_memcache_server_host',
 			'session_memcached_server_host',
+			'session_redis_server_host',
+			'session_redis_server_auth',
 			'sitename',
 			'smtphost',
 			'tmp_path',
@@ -159,7 +163,7 @@ class AdminModelSysInfo extends JModelLegacy
 	 * Remove sections of data marked as private in the privateSettings
 	 *
 	 * @param   array   $dataArray  Array with data tha may contain private informati
-	 * @param   string  $dataType   Type of data to search for an specific section in the privateSettings array
+	 * @param   string  $dataType   Type of data to search for a specific section in the privateSettings array
 	 *
 	 * @return  array
 	 *

administrator/components/com_admin/postinstall/joomla40checks.php

@@ -19,6 +19,7 @@
  * @since   3.7
  *
  * @link    https://developer.joomla.org/news/658-joomla4-manifesto.html
+ * @link    https://developer.joomla.org/news/704-looking-forward-with-joomla-4.html
  */
 function admin_postinstall_joomla40checks_condition()
 {
@@ -50,6 +51,6 @@ function admin_postinstall_joomla40checks_condition()
 		return true;
 	}
 
-	// PHP minimum version is 5.5
-	return version_compare(PHP_VERSION, '5.5.9', 'lt');
+	// PHP minimum version is 7.0
+	return version_compare(PHP_VERSION, '7.0', 'lt');
 }