Merge branch 'staging' into array_push_misuse

# Conflicts:
#	administrator/components/com_joomlaupdate/restore.php
#	libraries/joomla/database/query/sqlsrv.php

.github/CONTRIBUTING.md

@@ -19,7 +19,6 @@ There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
-| staging | Current codebase. |
+| 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. |
-| 2.5.x | Branch for the Joomla 2.5.x series. Support for this version has ended, no patches are accepted here. |
-| 3.6.x | 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. |
+| 4.0-dev | Branch for the next major Joomla version. New backward incompatible features go into this branch. Commits to staging will be applied to this branch as well. |

.travis.yml

@@ -48,7 +48,6 @@ 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
     - node_js: 6.1
 

README.md

@@ -10,14 +10,14 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.6 [version history](https://docs.joomla.org/Joomla_3.6_version_history).
+* Joomla! 3.7 [version history](https://docs.joomla.org/Joomla_3.7_version_history).
 * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
 
 What is Joomla?
 ---------------------
 * [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.
+* 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://downloads.joomla.org/technical-requirements).
+* Joomla! is **free and Open Source software** distributed under the GNU General Public License version 2 or later.
 
 Is Joomla! for you?
 ---------------------
@@ -50,22 +50,22 @@ Is it easy to change the layout display?
 
 Ready to install Joomla?
 ---------------------
-* Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html). 
+* Check the [minimum requirements](https://downloads.joomla.org/technical-requirements). 
 * 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 online hosting account of your choice.
 
 Updates are free!
 ---------------------
-* Always use the [latest version](https://www.joomla.org/download.html).
+* Always use the [latest version](https://downloads.joomla.org/latest).
 
 Where can you get support and help?
 ---------------------
 * [The Joomla! Documentation](https://docs.joomla.org/Main_Page);
 * [Frequently Asked Questions](https://docs.joomla.org/Category:FAQ) (FAQ);
 * 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);
+* Post questions at [our forums](https://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?

README.txt

@@ -1,14 +1,14 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.6 version history - https://docs.joomla.org/Joomla_3.6_version_history
+	* Joomla! 3.7 version history - https://docs.joomla.org/Joomla_3.7_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 either MySQL, PostgreSQL, or SQL Server to run.
-	You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
+	* It's a free and Open Source 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://downloads.joomla.org/technical-requirements.
 
 3- Is Joomla! for you?
 	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
@@ -35,21 +35,21 @@
 	* Check out the template management information: https://docs.joomla.org/Portal:Template_Management
 
 8- Ready to install Joomla?
-	* 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
+	* Check the minimum requirements here: https://downloads.joomla.org/technical-requirements
+	* How do you install Joomla - https://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
+	* Always use the latest version: https://downloads.joomla.org/latest
 
 10- Where can you get support and help?
 	* The Joomla! Documentation: https://docs.joomla.org/Main_Page
 	* FAQ Frequently Asked Questions: https://docs.joomla.org/Category:FAQ
 	* 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
+	* Post questions at our forums: https://forum.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 ?

administrator/components/com_admin/models/help.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\String\StringHelper;
+
 /**
  * Admin Component Help Model
  *
@@ -173,8 +175,7 @@ public function &getToc()
 			// Strip the extension
 			$file = preg_replace('#\.xml$|\.html$#', '', $file);
 
-			if ($help_search
-				&& JString::strpos(JString::strtolower(strip_tags($buffer)), JString::strtolower($help_search)) === false)
+			if ($help_search && StringHelper::strpos(StringHelper::strtolower(strip_tags($buffer)), StringHelper::strtolower($help_search)) === false)
 			{
 				continue;
 			}

administrator/components/com_admin/postinstall/eaccelerator.php

@@ -46,8 +46,7 @@ function admin_postinstall_eaccelerator_action()
 	$prev = ArrayHelper::fromObject(new JConfig);
 	$data = array_merge($prev, array('cacheHandler' => 'file'));
 
-	$config = new Registry('config');
-	$config->loadArray($data);
+	$config = new Registry($data);
 
 	jimport('joomla.filesystem.path');
 	jimport('joomla.filesystem.file');

administrator/components/com_admin/postinstall/joomla40checks.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for Joomla 4.0 pre checks
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Checks if the installation meats the current requirements for Joomla 4
+ *
+ * @return  boolean  True if any check fails.
+ *
+ * @since   3.7
+ *
+ * @see     https://developer.joomla.org/news/658-joomla4-manifesto.html
+ */
+function admin_postinstall_joomla40checks_condition()
+{
+	$db            = JFactory::getDbo();
+	$serverType    = $db->getServerType();
+	$serverVersion = $db->getVersion();
+
+	if ($serverType == 'mssql')
+	{
+		// MS SQL support will be dropped
+		return true;
+	}
+
+	if ($serverType == 'postgresql' && version_compare($serverVersion, '9.2', 'lt'))
+	{
+		// PostgreSQL minimum version is 9.2
+		return true;
+	}
+
+
+	if ($serverType == 'mysql' && version_compare($serverVersion, '5.5.3', 'lt'))
+	{
+		// MySQL minimum version is 5.5.3
+		return true;
+	}
+
+	// PHP minimum version is 5.5
+	return version_compare(PHP_VERSION, '5.5.9', 'lt');
+}