Merge branch '4.0-dev' into drop_server_config_files

joomla · Aug 23, 2019 · 82630e3 · 82630e3
2 parents 14a5e2c + 921913f
commit 82630e3
Show file tree

Hide file tree

Showing 87 changed files with 653 additions and 606 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -56,29 +56,29 @@ steps:
 
   - name: php72-unit
     depends_on: [ phpcs ]
-    image: php:7.2
+    image: joomlaprojects/docker-images:php7.2
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php73-unit
     depends_on: [ phpcs ]
-    image: php:7.3
+    image: joomlaprojects/docker-images:php7.3
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php74-unit
     depends_on: [ phpcs ]
-    image: phpdaily/php:7.4-dev
+    image: joomlaprojects/docker-images:php7.4
     failure: ignore
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php80-unit
     depends_on: [ phpcs ]
-    image: phpdaily/php:8.0-dev
+    image: joomlaprojects/docker-images:php8.0
     failure: ignore
     commands:
       - php -v
@@ -270,6 +270,6 @@ services:
 
 ---
 kind: signature
-hmac: af5f0783363fae3f8876585fff87e08dd470ee9a81599f20e4c0e8d2d0836801
+hmac: 9462caf361ab517c63d66d10ba0c934ead624ecf116828ab71ddc889f1b0a137
 
 ...
diff --git a/administrator/components/com_actionlogs/Model/ActionlogsModel.php b/administrator/components/com_actionlogs/Model/ActionlogsModel.php
@@ -426,7 +426,7 @@ public function getFilterForm($data = array(), $loadData = true)
 		// Add ip sort options to sort dropdown
 		if ($form && $ipLogging)
 		{
-			/* @var JFormFieldList $field */
+			/* @var \Joomla\CMS\Form\Field\ListField $field */
 			$field = $form->getField('fullordering', 'list');
 			$field->addOption(Text::_('COM_ACTIONLOGS_IP_ADDRESS_ASC'), array('value' => 'a.ip_address ASC'));
 			$field->addOption(Text::_('COM_ACTIONLOGS_IP_ADDRESS_DESC'), array('value' => 'a.ip_address DESC'));

diff --git a/administrator/components/com_associations/Field/ItemtypeField.php b/administrator/components/com_associations/Field/ItemtypeField.php
@@ -11,18 +11,16 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\GroupedlistField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
-FormHelper::loadFieldClass('groupedlist');
-
 /**
  * A drop down containing all component item types that implement associations.
  *
  * @since  3.7.0
  */
-class ItemtypeField extends \JFormFieldGroupedList
+class ItemtypeField extends GroupedlistField
 {
 	/**
 	 * The form field type.

diff --git a/administrator/components/com_categories/Model/CategoryModel.php b/administrator/components/com_categories/Model/CategoryModel.php
@@ -384,7 +384,7 @@ protected function loadFormData()
 	 *
 	 * @return  mixed
 	 *
-	 * @see     \JFormField
+	 * @see     \Joomla\CMS\Form\FormField
 	 * @since   1.6
 	 * @throws  \Exception if there is an error in the form event.
 	 */

diff --git a/administrator/components/com_config/tmpl/application/default_filters.php b/administrator/components/com_config/tmpl/application/default_filters.php
@@ -14,6 +14,6 @@
 
 $this->name = Text::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
 $this->fieldsname = 'filters';
-$this->formclass = 'options-grid-form options-grid-form-half';
+$this->formclass = 'options-grid-form options-grid-form-full';
 
 echo LayoutHelper::render('joomla.content.text_filters', $this);
diff --git a/administrator/components/com_config/tmpl/application/default_permissions.php b/administrator/components/com_config/tmpl/application/default_permissions.php
@@ -15,7 +15,7 @@
 $this->name        = Text::_('COM_CONFIG_PERMISSION_SETTINGS');
 $this->description = '';
 $this->fieldsname  = 'permissions';
-$this->formclass   = 'form-no-margin options-grid-form options-grid-form-half';
+$this->formclass   = 'form-no-margin options-grid-form options-grid-form-full';
 $this->showlabel   = false;
 
 echo LayoutHelper::render('joomla.content.options_default', $this);
diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php
@@ -85,7 +85,7 @@
 					?>
 
 					<?php if (!$isGrandchild && $hasParent) : ?>
-						<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-half">
+						<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-full">
 							<legend><?php echo Text::_($fieldSet->label); ?></legend>
 							<div>
 					<?php elseif (!$hasParent) : ?>
@@ -106,7 +106,7 @@
 
 						<?php if (!$hasChildren) : ?>
 
-						<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-half">
+						<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-full">
 							<legend><?php echo Text::_($fieldSet->label); ?></legend>
 							<div>
 						<?php $opentab = 2; ?>

diff --git a/administrator/components/com_content/Field/VoteradioField.php b/administrator/components/com_content/Field/VoteradioField.php
@@ -11,17 +11,15 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\RadioField;
 use Joomla\CMS\Plugin\PluginHelper;
 
-FormHelper::loadFieldClass('radio');
-
 /**
  * Voteradio Field class.
  *
  * @since  3.8.0
  */
-class VoteradioField extends \JFormFieldRadio
+class VoteradioField extends RadioField
 {
 	/**
 	 * The form field type.

diff --git a/administrator/components/com_content/Model/ArticleModel.php b/administrator/components/com_content/Model/ArticleModel.php
@@ -724,7 +724,7 @@ protected function loadFormData()
 	 *
 	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
 	 *
-	 * @see     JFormRule
+	 * @see     \Joomla\CMS\Form\FormRule
 	 * @see     JFilterInput
 	 * @since   3.7.0
 	 */

diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
@@ -56,7 +56,7 @@
 			type="accesslevel"
 			label="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			layout="joomla.form.field.accesslevel-fancy-select"
+			layout="joomla.form.field.list-fancy-select"
 			hint="JOPTION_SELECT_ACCESS"
 			onchange="this.form.submit();"
 		/>

diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
@@ -46,7 +46,7 @@
 			type="accesslevel"
 			label="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			layout="joomla.form.field.accesslevel-fancy-select"
+			layout="joomla.form.field.list-fancy-select"
 			hint="JOPTION_SELECT_ACCESS"
 			onchange="this.form.submit();"
 		/>

diff --git a/administrator/components/com_fields/Model/FieldModel.php b/administrator/components/com_fields/Model/FieldModel.php
@@ -904,7 +904,7 @@ protected function loadFormData()
 	 *
 	 * @return  void
 	 *
-	 * @see     \JFormField
+	 * @see     \Joomla\CMS\Form\FormField
 	 * @since   3.7.0
 	 * @throws  \Exception if there is an error in the form event.
 	 */

diff --git a/administrator/components/com_menus/Field/MenuItemByTypeField.php b/administrator/components/com_menus/Field/MenuItemByTypeField.php
@@ -140,7 +140,7 @@ public function __set($name, $value)
 	 *
 	 * @return  boolean  True on success.
 	 *
-	 * @see     JFormField::setup()
+	 * @see     \Joomla\CMS\Form\FormField::setup()
 	 * @since   3.8.0
 	 */
 	public function setup(\SimpleXMLElement $element, $value, $group = null)

diff --git a/administrator/components/com_menus/forms/itemadmin_alias.xml b/administrator/components/com_menus/forms/itemadmin_alias.xml
@@ -29,9 +29,10 @@
 			/>
 
 			<field
-				name="menu-anchor_css"
+				name="menu_icon"
 				type="text"
-				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
 			/>
 
 			<field
@@ -40,9 +41,9 @@
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 			/>
 
-			<field 
+			<field
 				name="menu_image_css"
-				type="text" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
 			/>
 
@@ -51,7 +52,7 @@
 				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				class="switcher"
-				default="1" 
+				default="1"
 				filter="integer"
 				>
 				<option value="0">JNO</option>

diff --git a/administrator/components/com_menus/forms/itemadmin_component.xml b/administrator/components/com_menus/forms/itemadmin_component.xml
@@ -6,36 +6,37 @@
 			class="options-grid-form-half"
 		>
 
-			<field 
+			<field
-				name="menu-anchor_title" 
+				name="menu-anchor_title"
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
 			/>
 
 			<field
-				name="menu-anchor_css" 
+				name="menu_icon"
 				type="text"
-				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
 			/>
 
-			<field 
+			<field
-				name="menu_image" 
+				name="menu_image"
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 			/>
 
 			<field
 				name="menu_image_css"
-				type="text" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
 			/>
 
-			<field 
+			<field
 				name="menu_text"
 				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				class="switcher"
-				default="1" 
+				default="1"
 				filter="integer"
 				>
 				<option value="0">JNO</option>

diff --git a/administrator/components/com_menus/forms/itemadmin_container.xml b/administrator/components/com_menus/forms/itemadmin_container.xml
@@ -26,9 +26,10 @@
 			/>
 
 			<field
-				name="menu-anchor_css"
+				name="menu_icon"
 				type="text"
-				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
 			/>
 
 			<field
@@ -37,9 +38,9 @@
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 			/>
 
-			<field 
+			<field
 				name="menu_image_css"
-				type="text" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
 			/>
 

diff --git a/administrator/components/com_menus/forms/itemadmin_heading.xml b/administrator/components/com_menus/forms/itemadmin_heading.xml
@@ -26,9 +26,10 @@
 			/>
 
 			<field
-				name="menu-anchor_css"
+				name="menu_icon"
 				type="text"
-				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
 			/>
 
 			<field

diff --git a/administrator/components/com_menus/forms/itemadmin_url.xml b/administrator/components/com_menus/forms/itemadmin_url.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fields name="params">
-		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
+		<fieldset name="menu-options"
-			<field 
+			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+			class="options-grid-form-half"
+		>
+			<field
 				name="menu-anchor_title"
-				type="text" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
-				class="options-grid-form-half"
-			/>
-
-			<field 
-				name="menu-anchor_css"
-				type="text" 
-				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
 			/>
 
-			<field 
+			<field
-				name="menu-anchor_rel" 
+				name="menu-anchor_rel"
 				type="list"
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL"
 				default=""
@@ -36,19 +32,30 @@
 				<option value="tag"/>
 			</field>
 
-			<field 
+			<field
-				name="menu_image" 
+				name="menu_icon"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
+			/>
+
+			<field
+				type="spacer"
+			/>
+
+			<field
+				name="menu_image"
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 			/>
 
 			<field
 				name="menu_image_css"
-				type="text" 
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
 			/>
 
-			<field 
+			<field
 				name="menu_text"
 				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"

diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml
@@ -134,11 +134,11 @@
 			type="separator"
 			title="JSITE"
 			hidden="false"
-			sql_select="a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:mod_languages/', l.image, '.gif') END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
+			sql_select="a.id, a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:', l.lang_code) END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
 			sql_from="#__menu_types AS a"
 			sql_where="a.client_id = 0"
 			sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
-			sql_group="a.id, a.title, a.menutype, m.language, l.image"
+			sql_group="a.id, a.title, a.menutype, m.language, l.lang_code"
 			sql_order="a.id DESC"
 			>
 			<menuitem

diff --git a/administrator/components/com_menus/presets/menus.xml b/administrator/components/com_menus/presets/menus.xml
@@ -36,11 +36,11 @@
 		title="JSITE"
 		icon="desktop"
 		hidden="false"
-		sql_select="a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:mod_languages/', l.image, '.gif') END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
+		sql_select="a.id, a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:', l.lang_code) END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
 		sql_from="#__menu_types AS a"
 		sql_where="a.client_id = 0"
 		sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
-		sql_group="a.id, a.title, a.menutype, m.language, l.image"
+		sql_group="a.id, a.title, a.menutype, m.language, l.lang_code"
 		sql_order="a.id DESC"
 		sql_target="self"
 		>