Merge branch '4.0-dev' into sunday_2

.drone.yml

@@ -15,6 +15,7 @@ steps:
 
   - name: restore-cache
     image: drillster/drone-volume-cache
+    depends_on: [ phpcs ]
     settings:
       restore: true
       mount:
@@ -28,6 +29,7 @@ steps:
 
   - name: prepare
     image: joomlaprojects/docker-tools:develop
+    depends_on: [ restore-cache ]
     commands:
       - composer install --no-progress --no-suggest
       # needed for system testing
@@ -39,6 +41,7 @@ steps:
 
   - name: rebuild-cache
     image: drillster/drone-volume-cache
+    depends_on: [ prepare ]
     settings:
       rebuild: true
       mount:
@@ -51,24 +54,25 @@ steps:
         path: /cache
 
   - name: php70-unit
-    group: unit
+    depends_on: [ rebuild-cache ]
     image: joomlaprojects/docker-php70:develop
     commands:
       - ./libraries/vendor/bin/phpunit
 
   - name: php71-unit
-    group: unit
+    depends_on: [ rebuild-cache ]
     image: joomlaprojects/docker-php71:develop
     commands:
       - ./libraries/vendor/bin/phpunit
 
   - name: php72-unit
-    group: unit
+    depends_on: [ rebuild-cache ]
     image: joomlaprojects/docker-php72:develop
     commands:
       - ./libraries/vendor/bin/phpunit
 
   - name: javascript-cs
+    depends_on: [ rebuild-cache ]
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - export DISPLAY=:0
@@ -78,6 +82,7 @@ steps:
       - npm run lint:js
 
   - name: javascript-tests
+    depends_on: [ rebuild-cache ]
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - export DISPLAY=:0
@@ -87,17 +92,20 @@ steps:
       - npm run test
 
   - name: system-tests
+    depends_on: [ javascript-tests ]
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
 
   - name: api-tests
+    depends_on: [ system-tests ]
     image: joomlaprojects/docker-systemtests:latest
     commands:
       - bash libraries/vendor/joomla/test-api/drone-run.sh "$(pwd)"
 
   - name: analysis4x
     image: rips/rips-cli:1.2.1
+    depends_on: [ api-tests ]
     when:
       branch: 4.0-dev
     commands:
@@ -139,6 +147,6 @@ services:
 
 ---
 kind: signature
-hmac: 8aa5446bfea3fbb295ae9ca362c72f82738cca714f5670f9bf70da1c02d1ad45
+hmac: 820e2021962202c01514b4ffe5eb893640c83fb5542345a70c4ca01e4ccfd43c
 
 ...

administrator/components/com_actionlogs/helpers/actionlogs.php

@@ -82,6 +82,7 @@ public static function loadTranslationFiles($extension)
 		}
 
 		$lang   = JFactory::getLanguage();
+		$source = '';
 
 		switch (substr($extension, 0, 3))
 		{
@@ -100,7 +101,11 @@ public static function loadTranslationFiles($extension)
 
 			case 'plg':
 				$parts = explode('_', $extension, 3);
-				$source = JPATH_PLUGINS . '/' . $parts[1] . '/' . $parts[2];
+
+				if (count($parts) > 2)
+				{
+					$source = JPATH_PLUGINS . '/' . $parts[1] . '/' . $parts[2];
+				}
 				break;
 
 			case 'pkg':

administrator/components/com_actionlogs/models/fields/extension.php

@@ -9,7 +9,12 @@
 
 defined('_JEXEC') or die;
 
-JFormHelper::loadFieldClass('list');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
+FormHelper::loadFieldClass('list');
 JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
 
 /**
@@ -36,7 +41,7 @@ class JFormFieldExtension extends JFormFieldList
 	 */
 	public function getOptions()
 	{
-		$db = JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true)
 			->select('DISTINCT ' . $db->quoteName('extension'))
 			->from($db->quoteName('#__action_logs'))
@@ -59,7 +64,7 @@ public function getOptions()
 			foreach ($extensions as $extension)
 			{
 				ActionlogsHelper::loadTranslationFiles($extension);
-				$options[] = JHtml::_('select.option', $extension, JText::_($extension));
+				$options[] = HTMLHelper::_('select.option', $extension, Text::_($extension));
 			}
 		}
 

administrator/components/com_actionlogs/views/actionlogs/tmpl/default.php

@@ -9,18 +9,24 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+
 /** @var ActionlogsViewActionlogs $this */
 
 JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
 
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+HTMLHelper::_('bootstrap.tooltip');
+HTMLHelper::_('behavior.multiselect');
+HTMLHelper::_('formbehavior.chosen', 'select');
 
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 
-JFactory::getDocument()->addScriptDeclaration('
+Factory::getDocument()->addScriptDeclaration('
 	Joomla.submitbutton = function(task)
 	{
 		if (task == "actionlogs.exportLogs")
@@ -49,38 +55,38 @@
 	};
 ');
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="j-main-container">
-		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-warning">
-				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
 			<table class="table table-striped table-hover" id="logsList">
 				<thead>
 					<th width="1%" class="center">
-						<?php echo JHtml::_('grid.checkall'); ?>
+						<?php echo HTMLHelper::_('grid.checkall'); ?>
 					</th>
 					<th>
-						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_ACTION', 'a.message', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_ACTIONLOGS_ACTION', 'a.message', $listDirn, $listOrder); ?>
 					</th>
 					<th width="15%" class="nowrap">
-						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_EXTENSION', 'a.extension', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_ACTIONLOGS_EXTENSION', 'a.extension', $listDirn, $listOrder); ?>
 					</th>
 					<th width="15%" class="nowrap">
-						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_DATE', 'a.log_date', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_ACTIONLOGS_DATE', 'a.log_date', $listDirn, $listOrder); ?>
 					</th>
 					<th width="10%" class="nowrap">
-						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_NAME', 'a.user_id', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_ACTIONLOGS_NAME', 'a.user_id', $listDirn, $listOrder); ?>
 					</th>
 					<?php if ($this->showIpColumn) : ?>
 						<th width="10%" class="nowrap">
-							<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_IP_ADDRESS', 'a.ip_address', $listDirn, $listOrder); ?>
+							<?php echo HTMLHelper::_('searchtools.sort', 'COM_ACTIONLOGS_IP_ADDRESS', 'a.ip_address', $listDirn, $listOrder); ?>
 						</th>
 					<?php endif; ?>
 					<th width="1%" class="nowrap hidden-phone">
-						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</thead>
 				<tfoot>
@@ -96,25 +102,25 @@
 						ActionlogsHelper::loadTranslationFiles($extension); ?>
 						<tr class="row<?php echo $i % 2; ?>">
 							<td class="center">
-								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+								<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 							</td>
 							<td>
 								<?php echo ActionlogsHelper::getHumanReadableLogMessage($item); ?>
 							</td>
 							<td>
-								<?php echo $this->escape(JText::_($extension)); ?>
+								<?php echo $this->escape(Text::_($extension)); ?>
 							</td>
 							<td>
-								<span class="hasTooltip" title="<?php echo JHtml::_('date', $item->log_date, JText::_('DATE_FORMAT_LC6')); ?>">
-									<?php echo JHtml::_('date.relative', $item->log_date); ?>
+								<span class="hasTooltip" title="<?php echo HTMLHelper::_('date', $item->log_date, Text::_('DATE_FORMAT_LC6')); ?>">
+									<?php echo HTMLHelper::_('date.relative', $item->log_date); ?>
 								</span>
 							</td>
 							<td>
 								<?php echo $item->name; ?>
 							</td>
 							<?php if ($this->showIpColumn) : ?>
 								<td>
-									<?php echo JText::_($this->escape($item->ip_address)); ?>
+									<?php echo Text::_($this->escape($item->ip_address)); ?>
 								</td>
 							<?php endif;?>
 							<td class="hidden-phone">
@@ -127,11 +133,11 @@
 		<?php endif;?>
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 </form>
-<form action="<?php echo JRoute::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">
+<form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">
 	<input type="hidden" name="task" value="" />
 	<input type="hidden" name="cids" value="" />
-	<?php echo JHtml::_('form.token'); ?>
+	<?php echo HTMLHelper::_('form.token'); ?>
 </form>

administrator/components/com_associations/Field/Modal/AssociationField.php

@@ -59,20 +59,21 @@ protected function getInput()
 		$urlSelect = $linkAssociations . '&' . Session::getFormToken() . '=1';
 
 		// Select custom association button
-		$html[] = '<a'
+		$html[] = '<button'
+			. ' type="button"'
 			. ' id="select-change"'
 			. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 			. ' data-toggle="modal"'
 			. ' data-select="' . Text::_('COM_ASSOCIATIONS_SELECT_TARGET') . '"'
 			. ' data-change="' . Text::_('COM_ASSOCIATIONS_CHANGE_TARGET') . '"'
-			. ' role="button"'
-			. ' href="#associationSelect' . $this->id . 'Modal">'
+			. ' data-target="#associationSelect' . $this->id . 'Modal">'
 			. '<span class="icon-file" aria-hidden="true"></span> '
 			. '<span id="select-change-text"></span>'
-			. '</a>';
+			. '</button>';
 
 		// Clear association button
 		$html[] = '<button'
+			. ' type="button"'
 			. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
 			. ' onclick="return Joomla.submitbutton(\'undo-association\');"'
 			. ' id="remove-assoc">'
@@ -93,7 +94,7 @@ protected function getInput()
 				'width'       => '800px',
 				'bodyHeight'  => 70,
 				'modalWidth'  => 80,
-				'footer'      => '<button type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
+				'footer'      => '<button type="button" class="btn btn-secondary" data-dismiss="modal">'
 						. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
 			)
 		);

administrator/components/com_banners/Table/ClientTable.php

@@ -35,6 +35,8 @@ public function __construct(DatabaseDriver $db)
 		$this->typeAlias        = 'com_banners.client';
 		$this->checked_out_time = $db->getNullDate();
 
+		$this->setColumnAlias('published', 'state');
+
 		parent::__construct('#__banner_clients', 'id', $db);
 	}
 

administrator/components/com_categories/Field/Modal/CategoryField.php

@@ -237,8 +237,8 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 					'width'       => '800px',
 					'bodyHeight'  => 70,
 					'modalWidth'  => 80,
-					'footer'      => '<a role="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
-										. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+					'footer'      => '<button type="button" class="btn btn-secondary" data-dismiss="modal">'
+										. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 				)
 			);
 		}
@@ -259,15 +259,15 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 					'width'       => '800px',
 					'bodyHeight'  => 70,
 					'modalWidth'  => 80,
-					'footer'      => '<a role="button" class="btn btn-secondary" aria-hidden="true"'
+					'footer'      => '<button type="button" class="btn btn-secondary"'
 							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'category\', \'cancel\', \'item-form\'); return false;">'
-							. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
-							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
+							. '<button type="button" class="btn btn-primary"'
 							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'category\', \'save\', \'item-form\'); return false;">'
-							. Text::_('JSAVE') . '</a>'
-							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. Text::_('JSAVE') . '</button>'
+							. '<button type="button" class="btn btn-success"'
 							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'category\', \'apply\', \'item-form\'); return false;">'
-							. Text::_('JAPPLY') . '</a>',
+							. Text::_('JAPPLY') . '</button>',
 				)
 			);
 		}
@@ -288,15 +288,15 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
 					'width'       => '800px',
 					'bodyHeight'  => 70,
 					'modalWidth'  => 80,
-					'footer'      => '<a role="button" class="btn btn-secondary" aria-hidden="true"'
+					'footer'      => '<button type="button" class="btn btn-secondary"'
 							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'category\', \'cancel\', \'item-form\'); return false;">'
-							. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
-							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
+							. '<button type="button" class="btn btn-primary"'
 							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'category\', \'save\', \'item-form\'); return false;">'
-							. Text::_('JSAVE') . '</a>'
-							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. Text::_('JSAVE') . '</button>'
+							. '<button type="button" class="btn btn-success"'
 							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'category\', \'apply\', \'item-form\'); return false;">'
-							. Text::_('JAPPLY') . '</a>',
+							. Text::_('JAPPLY') . '</button>',
 				)
 			);
 		}

administrator/components/com_checkin/Model/CheckinModel.php

@@ -108,7 +108,7 @@ public function checkin($ids = array())
 
 			$query = $db->getQuery(true)
 				->update($db->quoteName($tn))
-				->set('checked_out = 0')
+				->set('checked_out = DEFAULT')
 				->set('checked_out_time = ' . $db->quote($nullDate))
 				->where('checked_out > 0');
 

administrator/components/com_config/forms/application.xml

@@ -266,7 +266,7 @@
 			type="radio"
 			label="COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC"
-			class="btn-group btn-group-yesno"
+			class="switcher"
 			default="1"
 			filter="integer"
 			showon="debug_lang:1"
@@ -817,13 +817,13 @@
 			type="radio"
 			label="COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC"
-			class="btn-group btn-group-yesno"
+			class="switcher"
 			default="1"
 			filter="integer"
 			showon="session_handler:redis"
 			>
-			<option value="1">JYES</option>
 			<option value="0">JNO</option>
+			<option value="1">JYES</option>
 		</field>
 
 		<field