Merge branch '4.0-dev' into remove-ftp-layer

# Conflicts:
#	administrator/components/com_joomlaupdate/Controller/DisplayController.php
#	installation/tmpl/preinstall/default.php
#	libraries/src/Filesystem/File.php
#	libraries/src/Filesystem/Folder.php

SECURITY.md

@@ -0,0 +1,39 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and policies for the `Joomla! Project`.
+
+  * [Reporting a Bug](#reporting-a-bug)
+  * [Response Handling](#response-handling)
+  * [Security Announcement Policy](#security-announcement-policy)
+  * [Further Details on the Joomla! Security Policies](https://security.joomla.org)
+
+## Reporting a Bug
+
+The `Joomla` team and community take all security bugs in `Joomla` seriously.
+
+The Joomla! Project takes security vulnerabilities very seriously. As such, the Joomla! Security Strike Team (JSST) oversees the project's security issues and follows some specific procedures when dealing with these issues.
+
+If you find a possible vulnerability, please report it to the JSST using the [online form](https://developer.joomla.org/security/contact-the-team.html) or via email at security@joomla.org 
+
+We maintain a list of [GPG keys and addresses](https://developer.joomla.org/security/gpg-keys.html) for the security@joomla.org address and members of the JSST to allow signed and encrypted communications.
+
+To report an issue in a Joomla! extension, please submit it to the [Vulnerable Extensions List.](https://vel.joomla.org/submit-vel)
+
+For support with a site which has been attacked, please visit the [Joomla! Forum.](https://forum.joomla.org/viewforum.php?f=714)
+
+Thank you for improving the security of `Joomla`.
+
+## Response Handling
+
+The JSST aims to ensure all issues are handled in a timely manner and for clear communication between the team and issue reporters. As such, we have established the following guidelines for responding to issue reports:
+
+* Within 24 hours every report gets acknowledged
+* Within 7 days every report gets a further response stating either
+    * the issue is closed (and why)
+    * the issue is still under investigation; if needed, additional information will be requested
+* Within 21 days every report must be resolved unless there are exceptional circumstances requiring additional time
+
+## Security Announcement Policy
+* Verified vulnerabilities will only be publicly announced AFTER a release is issued which fixes the vulnerability.
+* All announcements will contain as much information as possible, but will NOT contain step-by-step instructions for the vulnerability.
+* The `Joomla! Project` will properly credit individuals and/or organizations who responsibly disclose security issues to the JSST. You can indicate the way you would like to be referred to in the advisory about the vulnerability. Our preference is to use full names. If you do not specify then we will use the contact name associated with the email address the report was received from. You can also request a pseudonym or having your name withheld.

administrator/components/com_admin/Service/HTML/PhpSetting.php

@@ -56,27 +56,4 @@ public function string($val)
 	{
 		return !empty($val) ? $val : Text::_('JNONE');
 	}
-
-	/**
-	 * Method to generate an integer from a value
-	 *
-	 * @param   string  $val  a php ini value
-	 *
-	 * @return  string html code
-	 *
-	 * @deprecated  4.0  Use intval() or casting instead.
-	 */
-	public function integer($val)
-	{
-		try
-		{
-			Log::add(sprintf('%s() is deprecated. Use intval() or casting instead.', __METHOD__), Log::WARNING, 'deprecated');
-		}
-		catch (\RuntimeException $exception)
-		{
-			// Informational log only
-		}
-
-		return (int) $val;
-	}
 }

administrator/components/com_admin/services/provider.php

@@ -9,9 +9,9 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
-use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
 use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
@@ -38,13 +38,13 @@
 	public function register(Container $container)
 	{
 		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Admin'));
-		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Admin'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Admin'));
 
 		$container->set(
 			ComponentInterface::class,
 			function (Container $container)
 			{
-				$component = new AdminComponent($container->get(DispatcherFactoryInterface::class));
+				$component = new AdminComponent($container->get(ComponentDispatcherFactoryInterface::class));
 
 				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
 				$component->setRegistry($container->get(Registry::class));

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql

@@ -41,7 +41,8 @@ CREATE TABLE IF NOT EXISTS `#__workflow_associations` (
   `item_id` int(10) NOT NULL DEFAULT 0 COMMENT 'Extension table id value',
   `stage_id` int(10) NOT NULL COMMENT 'Foreign Key to #__workflow_stages.id',
   `extension` varchar(50) NOT NULL,
-  PRIMARY KEY (`item_id`, `stage_id`, `extension`),
+  PRIMARY KEY (`item_id`, `extension`),
+  KEY `idx_item_stage_extension` (`item_id`, `stage_id`, `extension`)
   KEY `idx_item_id` (`item_id`),
   KEY `idx_stage_id` (`stage_id`),
   KEY `idx_extension` (`extension`)

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-15.sql

@@ -38,8 +38,9 @@ CREATE TABLE IF NOT EXISTS "#__workflow_associations" (
   "item_id" bigint DEFAULT 0 NOT NULL,
   "stage_id" bigint DEFAULT 0 NOT NULL,
   "extension" varchar(50) NOT NULL,
-  PRIMARY KEY ("item_id", "stage_id", "extension")
+  PRIMARY KEY ("item_id", "extension")
 );
+CREATE INDEX "#__workflow_associations_idx_item_stage_extension" ON "#__workflow_associations" ("item_id", "stage_id", "extension");
 CREATE INDEX "#__workflow_associations_idx_item_id" ON "#__workflow_associations" ("item_id");
 CREATE INDEX "#__workflow_associations_idx_stage_id" ON "#__workflow_associations" ("stage_id");
 CREATE INDEX "#__workflow_associations_idx_extension" ON "#__workflow_associations" ("extension");

administrator/components/com_admin/tmpl/profile/edit.php

@@ -13,9 +13,6 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\HTML\HTMLHelper;
 
-// Include the component HTML helpers.
-HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-
 HTMLHelper::_('behavior.formvalidator');
 
 // Get the form fieldsets.

administrator/components/com_admin/tmpl/sysinfo/default.php

@@ -13,9 +13,6 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\HTML\HTMLHelper;
 
-// Add specific helper files for html generation
-HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-
 HTMLHelper::_('behavior.tabstate');
 ?>
 

administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php

@@ -86,7 +86,7 @@
 					<?php echo Text::_('COM_ADMIN_SESSION_AUTO_START'); ?>
 				</th>
 				<td>
-					<?php echo HTMLHelper::_('phpsetting.integer', $this->php_settings['session.auto_start']); ?>
+					<?php echo (int) $this->php_settings['session.auto_start']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -142,7 +142,7 @@
 					<?php echo Text::_('COM_ADMIN_MAX_INPUT_VARS'); ?>
 				</th>
 				<td>
-					<?php echo HTMLHelper::_('phpsetting.integer', $this->php_settings['max_input_vars']); ?>
+					<?php echo (int) $this->php_settings['max_input_vars']; ?>
 				</td>
 			</tr>
 		</tbody>

administrator/components/com_associations/forms/filter_associations.xml

@@ -12,6 +12,7 @@
 	<field
 		name="language"
 		type="contentlanguage"
+		label="JOPTION_SELECT_LANGUAGE"
 		filtermode="selector"
 		onchange="this.form.submit();"
 		>
@@ -30,6 +31,7 @@
 		<field
 			name="state"
 			type="status"
+			label="JOPTION_SELECT_PUBLISHED"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -38,6 +40,7 @@
 		<field
 			name="category_id"
 			type="category"
+			label="JOPTION_SELECT_CATEGORY"
 			published="0,1,2"
 			extension="dynamic"
 			onchange="this.form.submit();"
@@ -48,6 +51,7 @@
 		<field
 			name="menutype"
 			type="menu"
+			label="COM_ASSOCIATIONS_SELECT_MENU"
 			clientid="0"
 			onchange="this.form.submit();"
 			>
@@ -57,6 +61,7 @@
 		<field
 			name="access"
 			type="accesslevel"
+			label="JOPTION_SELECT_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -65,6 +70,7 @@
 		<field
 			name="level"
 			type="integer"
+			label="JOPTION_SELECT_MAX_LEVELS"
 			first="1"
 			last="10"
 			step="1"
@@ -78,6 +84,7 @@
 		<field
 			name="fullordering"
 			type="list"
+			label="JGLOBAL_SORT_BY"
 			default="id ASC"
 			onchange="this.form.submit();"
 			>
@@ -95,6 +102,7 @@
 		<field
 			name="limit"
 			type="limitbox"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
 			onchange="this.form.submit();"
 		/>

administrator/components/com_associations/services/provider.php

@@ -9,10 +9,10 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\MVCComponent;
-use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
 use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
 use Joomla\DI\Container;
@@ -37,13 +37,13 @@
 	public function register(Container $container)
 	{
 		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Associations'));
-		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Associations'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Associations'));
 
 		$container->set(
 			ComponentInterface::class,
 			function (Container $container)
 			{
-				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+				$component = new MVCComponent($container->get(ComponentDispatcherFactoryInterface::class));
 
 				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
 

administrator/components/com_associations/tmpl/association/edit.php

@@ -17,8 +17,8 @@
 HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('jquery.framework');
 
-HTMLHelper::_('script', 'com_associations/sidebyside.js', false, true);
-HTMLHelper::_('stylesheet', 'com_associations/sidebyside.css', array(), true);
+HTMLHelper::_('script', 'com_associations/sidebyside.js', ['version' => 'auto', 'relative' => true]);
+HTMLHelper::_('stylesheet', 'com_associations/sidebyside.css', ['version' => 'auto', 'relative' => true]);
 
 $options = array(
 			'layout'   => $this->app->input->get('layout', '', 'string'),