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

# Conflicts: # administrator/components/com_admin/postinstall/eaccelerator.php # administrator/components/com_config/Controller/ApplicationController.php # administrator/components/com_config/Controller/ComponentController.php # administrator/components/com_config/tmpl/application/default_ftp.php # administrator/components/com_installer/Controller/DisplayController.php # administrator/components/com_installer/Model/InstallModel.php # administrator/components/com_joomlaupdate/Controller/DisplayController.php # administrator/components/com_joomlaupdate/Controller/UpdateController.php # administrator/components/com_joomlaupdate/Helper/Select.php # administrator/components/com_joomlaupdate/Model/UpdateModel.php # administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php # administrator/components/com_users/Controller/ProfileController.php # components/com_config/Controller/ConfigController.php # components/com_config/Controller/TemplatesController.php # components/com_users/Controller/ProfileController.php # libraries/src/Filesystem/File.php
joomla · Nov 24, 2018 · 30777de · 30777de
2 parents 20ea1fb + 0603458
commit 30777de
Show file tree

Hide file tree

Showing 941 changed files with 5,381 additions and 4,354 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -28,6 +28,7 @@ pipeline:
       # needed for system testing
       - composer update joomla/test-system --no-progress --no-suggest
       - composer update joomla-projects/selenium-server-standalone --no-progress --no-suggest
+      - composer update joomla-projects/joomla-browser --no-progress --no-suggest
       - npm install --unsafe-perm
 
   rebuild-cache:

diff --git a/.eslintignore b/.eslintignore
@@ -2,4 +2,5 @@
 # TODO: Fix the webcomponents codestyle then also allow linting on them
 *.js
 !*.es6.js
+administrator/components/com_media/node_modules/uri-js/node_modules/punycode/punycode.es6.js
 *.vue
diff --git a/administrator/components/com_admin/Model/HelpModel.php b/administrator/components/com_admin/Model/HelpModel.php
@@ -11,12 +11,12 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Help\Help;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\String\StringHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Factory;
 
 /**
  * Admin Component Help Model

diff --git a/administrator/components/com_admin/Model/ProfileModel.php b/administrator/components/com_admin/Model/ProfileModel.php
@@ -12,10 +12,10 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Users\Administrator\Model\UserModel;
-use Joomla\CMS\Factory;
 
 /**
  * User model.
@@ -27,7 +27,7 @@ class ProfileModel extends UserModel
 	/**
 	 * Method to get the record form.
 	 *
-	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   array    $data      An optional array of data for the form to interrogate.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
 	 * @return  \JForm    A \JForm object on success, false on failure

diff --git a/administrator/components/com_admin/Model/SysinfoModel.php b/administrator/components/com_admin/Model/SysinfoModel.php
@@ -168,7 +168,7 @@ class SysInfoModel extends BaseDatabaseModel
 	/**
 	 * Remove sections of data marked as private in the privateSettings
 	 *
-	 * @param   array   $dataArray  Array with data tha may contain private informati
+	 * @param   array   $dataArray  Array with data that may contain private information
 	 * @param   string  $dataType   Type of data to search for a specific section in the privateSettings array
 	 *
 	 * @return  array

diff --git a/administrator/components/com_admin/Service/HTML/PhpSetting.php b/administrator/components/com_admin/Service/HTML/PhpSetting.php
@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Log\Log;
 
 /**
  * Utility class working with phpsetting

diff --git a/administrator/components/com_admin/View/Help/HtmlView.php b/administrator/components/com_admin/View/Help/HtmlView.php
@@ -11,8 +11,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**

diff --git a/administrator/components/com_admin/View/Profile/HtmlView.php b/administrator/components/com_admin/View/Profile/HtmlView.php
@@ -11,10 +11,10 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * View class to allow users edit their own profile.

diff --git a/administrator/components/com_admin/View/Sysinfo/HtmlView.php b/administrator/components/com_admin/View/Sysinfo/HtmlView.php
@@ -12,11 +12,11 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Exception\Notallowed;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * Sysinfo View class for the Admin component

diff --git a/administrator/components/com_admin/View/Sysinfo/JsonView.php b/administrator/components/com_admin/View/Sysinfo/JsonView.php
@@ -12,9 +12,9 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Exception\Notallowed;
-use Joomla\CMS\MVC\View\AbstractView;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\AbstractView;
 
 /**
  * Sysinfo View class for the Admin component

diff --git a/administrator/components/com_admin/View/Sysinfo/TextView.php b/administrator/components/com_admin/View/Sysinfo/TextView.php
@@ -12,9 +12,9 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Exception\Notallowed;
-use Joomla\CMS\MVC\View\AbstractView;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\AbstractView;
 
 /**
  * Sysinfo View class for the Admin component

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -9,14 +9,14 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\Database\UTF8MB4SupportInterface;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Extension\ExtensionHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Log\Log;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Log\Log;
+use Joomla\Database\UTF8MB4SupportInterface;
 
 /**
  * Script file of Joomla CMS

diff --git a/administrator/components/com_admin/services/provider.php b/administrator/components/com_admin/services/provider.php
@@ -12,9 +12,9 @@
 use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
-use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactory;
 use Joomla\CMS\HTML\Registry;
-use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Component\Admin\Administrator\Extension\AdminComponent;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -37,7 +37,7 @@
 	 */
 	public function register(Container $container)
 	{
-		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Admin'));
+		$container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Admin'));
 		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Admin'));
 
 		$container->set(
@@ -46,7 +46,7 @@ function (Container $container)
 			{
 				$component = new AdminComponent($container->get(ComponentDispatcherFactoryInterface::class));
 
-				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+				$component->setMVCFactory($container->get(MVCFactoryInterface::class));
 				$component->setRegistry($container->get(Registry::class));
 
 				return $component;

diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS `#__workflow_associations` (
   `stage_id` int(10) NOT NULL COMMENT 'Foreign Key to #__workflow_stages.id',
   `extension` varchar(50) NOT NULL,
   PRIMARY KEY (`item_id`, `extension`),
-  KEY `idx_item_stage_extension` (`item_id`, `stage_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`)

diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-10-18.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-10-18.sql
@@ -0,0 +1 @@
+UPDATE `#__content_types` SET `router` = '' WHERE `type_alias` = 'com_users.user';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-10-18.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-10-18.sql
@@ -0,0 +1 @@
+UPDATE "#__content_types" SET "router" = '' WHERE "type_alias" = 'com_users.user';
diff --git a/administrator/components/com_admin/tmpl/help/default.php b/administrator/components/com_admin/tmpl/help/default.php
@@ -9,10 +9,10 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
 use Joomla\CMS\Help\Help;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
 
 ?>
 <form action="<?php echo Route::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">

diff --git a/administrator/components/com_admin/tmpl/help/langforum.php b/administrator/components/com_admin/tmpl/help/langforum.php
@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 
 Factory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR, null, false, true);
 

diff --git a/administrator/components/com_admin/tmpl/profile/edit.php b/administrator/components/com_admin/tmpl/profile/edit.php
@@ -9,9 +9,9 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\HTML\HTMLHelper;
 
 HTMLHelper::_('behavior.formvalidator');
 

diff --git a/administrator/components/com_admin/tmpl/sysinfo/default.php b/administrator/components/com_admin/tmpl/sysinfo/default.php
@@ -9,9 +9,9 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\HTML\HTMLHelper;
 
 HTMLHelper::_('behavior.tabstate');
 ?>

diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_directory.php b/administrator/components/com_admin/tmpl/sysinfo/default_directory.php
@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 
 ?>
 <fieldset class="adminform">

diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 
 ?>
 <fieldset class="adminform">

diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 
 ?>
 <fieldset class="adminform">
@@ -47,7 +47,7 @@
 				<td>
 					<?php echo $this->info['dbserver']; ?>
 				</td>
-			</tr>			
+			</tr>
 			<tr>
 				<th scope="row">
 					<?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>

diff --git a/administrator/components/com_associations/Controller/AssociationController.php b/administrator/components/com_associations/Controller/AssociationController.php
@@ -11,11 +11,11 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
+use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
 /**
  * Association edit controller class.

diff --git a/administrator/components/com_associations/Controller/AssociationsController.php b/administrator/components/com_associations/Controller/AssociationsController.php
@@ -11,10 +11,10 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
 /**
  * Associations controller class.

diff --git a/administrator/components/com_associations/Field/ItemlanguageField.php b/administrator/components/com_associations/Field/ItemlanguageField.php
@@ -13,9 +13,9 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormHelper;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\CMS\Language\LanguageHelper;
+use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
+use Joomla\Utilities\ArrayHelper;
 
 FormHelper::loadFieldClass('list');
 

diff --git a/administrator/components/com_associations/Field/ItemtypeField.php b/administrator/components/com_associations/Field/ItemtypeField.php
@@ -12,8 +12,8 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Form\FormHelper;
-use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
 FormHelper::loadFieldClass('groupedlist');
 

diff --git a/administrator/components/com_associations/Field/Modal/AssociationField.php b/administrator/components/com_associations/Field/Modal/AssociationField.php
@@ -13,9 +13,9 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\HTML\HTMLHelper;
 
 /**
  * Supports a modal item picker.
@@ -46,7 +46,7 @@ protected function getInput()
 		$value = (int) $this->value > 0 ? (int) $this->value : '';
 
 		Factory::getDocument()->addScriptOptions('modal-associations', ['itemId' => $value]);
-		HTMLHelper::_('script', 'com_associations/modal-associations.min.js', false, true);
+		HTMLHelper::_('script', 'com_associations/modal-associations.min.js', ['version' => 'auto', 'relative' => true]);
 
 		// Setup variables for display.
 		$html = array();

diff --git a/administrator/components/com_associations/Helper/AssociationsHelper.php b/administrator/components/com_associations/Helper/AssociationsHelper.php
@@ -15,12 +15,12 @@
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\Registry\Registry;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Registry\Registry;
 
 /**
  * Associations component helper.

diff --git a/administrator/components/com_associations/Model/AssociationsModel.php b/administrator/components/com_associations/Model/AssociationsModel.php
@@ -11,13 +11,13 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
-use Joomla\CMS\Language\Text;
 use Joomla\Database\Exception\ExecutionFailureException;
-use Joomla\CMS\Factory;
 
 /**
  * Methods supporting a list of article records.

diff --git a/administrator/components/com_associations/View/Association/HtmlView.php b/administrator/components/com_associations/View/Association/HtmlView.php
@@ -11,14 +11,14 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\Utilities\ArrayHelper;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Factory;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * View class for a list of articles.