Merge branch '4.0-dev' into 4.0-dev

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

@@ -69,11 +69,11 @@ protected function getInput()
 
 		// Clear association button
 		$html[] = '<button'
- 				. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
- 				. ' onclick="return Joomla.submitbutton(\'undo-association\');"'
- 				. ' id="remove-assoc">'
- 				. '<span class="icon-remove" aria-hidden="true"></span> ' . \JText::_('JCLEAR')
- 				. '</button>';
+            . ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
+            . ' onclick="return Joomla.submitbutton(\'undo-association\');"'
+            . ' id="remove-assoc">'
+            . '<span class="icon-remove" aria-hidden="true"></span> ' . \JText::_('JCLEAR')
+            . '</button>';
 
 		$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . $value . '">';
 

administrator/components/com_config/Field/FiltersField.php

@@ -55,16 +55,13 @@ protected function getInput()
 		$html[] = '			<span class="acl-action">' . \JText::_('JGLOBAL_FILTER_GROUPS_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
-		$html[] = '			<span class="acl-action" title="' . \JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '">'
-				. \JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '</span>';
+		$html[] = '			<span class="acl-action">' . \JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
-		$html[] = '			<span class="acl-action" title="' . \JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '">'
-				. \JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '</span>';
+		$html[] = '			<span class="acl-action">' . \JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
-		$html[] = '			<span class="acl-action" title="' . \JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '">'
-				. \JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
+		$html[] = '			<span class="acl-action">' . \JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '	</tr>';
 		$html[] = '	</thead>';
@@ -111,7 +108,6 @@ protected function getInput()
 				. ' name="' . $this->name . '[' . $group->value . '][filter_tags]"'
 				. ' type="text"'
 				. ' id="' . $this->id . $group->value . '_filter_tags" class="novalidate form-control"'
-				. ' title="' . \JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '"'
 				. ' value="' . $group_filter['filter_tags'] . '"'
 				. '>';
 			$html[] = '		</td>';
@@ -120,7 +116,6 @@ protected function getInput()
 				. ' name="' . $this->name . '[' . $group->value . '][filter_attributes]"'
 				. ' type="text"'
 				. ' id="' . $this->id . $group->value . '_filter_attributes" class="novalidate form-control"'
-				. ' title="' . \JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '"'
 				. ' value="' . $group_filter['filter_attributes'] . '"'
 				. '>';
 			$html[] = '		</td>';

administrator/components/com_config/Model/ApplicationModel.php

@@ -730,7 +730,6 @@ public function storePermissions($permission = null)
 			return false;
 		}
 
-
 		// All checks done.
 		$result = array(
 			'text'    => '',

administrator/components/com_content/services/provider.php

@@ -19,7 +19,6 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Component\Content\Administrator\Helper\AssociationsHelper;
-use Joomla\Component\Content\Administrator\Service\Provider\Component;
 use Joomla\Component\Content\Site\Service\Category;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;

administrator/components/com_content/tmpl/article/edit.php

@@ -21,7 +21,7 @@
 $this->ignore_fieldsets = array('jmetadata', 'item_associations');
 
 // Create shortcut to parameters.
-$params = clone($this->state->get('params'));
+$params = clone $this->state->get('params');
 $params->merge(new Registry($this->item->attribs));
 
 $app = JFactory::getApplication();

administrator/components/com_fields/Plugin/FieldsListPlugin.php

@@ -65,7 +65,7 @@ public function getOptionsFromField($field)
 		$data = array();
 
 		// Fetch the options from the plugin
-		$params = clone($this->params);
+		$params = clone $this->params;
 		$params->merge($field->fieldparams);
 
 		foreach ($params->get('options', array()) as $option)

administrator/components/com_languages/Model/OverrideModel.php

@@ -48,7 +48,7 @@ public function getForm($data = array(), $loadData = true)
 
 		if (!$langName)
 		{
-			// If a language only exists in frontend, it's meta data cannot be
+			// If a language only exists in frontend, its metadata cannot be
 			// loaded in backend at the moment, so fall back to the language tag.
 			$langName = $language;
 		}

administrator/components/com_menus/layouts/joomla/menu/edit_modules.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @package     Joomla.Site
+ * @package     Joomla.Administrator
  * @subpackage  Layout
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.

administrator/components/com_menus/models/fields/menuitembytype.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * @package     Joomla.Libraries
- * @subpackage  Form
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_menus/tmpl/menus/default.php

@@ -149,7 +149,7 @@
 															<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
 													<?php else : ?>
                                                         <a href="#" class="disabled" disabled="disabled">
-														    <span class="dropdown-item"><?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></span>
+                                                            <span class="dropdown-item"><?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></span>
                                                         </a>
 													<?php endif; ?>
 												<?php endforeach; ?>

administrator/components/com_plugins/forms/plugin.xml

@@ -37,7 +37,7 @@
 
 		<field
 			name="ordering"
-			type="Pluginordering"
+			type="pluginordering"
 			label="JFIELD_ORDERING_LABEL"
 		/>
 

administrator/components/com_redirect/layouts/toolbar/batch.php

@@ -15,6 +15,6 @@
 
 ?>
 <button data-toggle="modal" onclick="{jQuery( '#collapseModal' ).modal('show'); return true;}" class="btn btn-sm btn-primary">
-	<span class="icon-checkbox-partial" aria-hidden="true" title="<?php echo $title; ?>"></span>
+	<span class="icon-checkbox-partial" aria-hidden="true"></span>
 	<?php echo $title; ?>
 </button>

administrator/components/com_templates/tmpl/template/default_modal_delete_body.php

@@ -11,8 +11,8 @@
 ?>
 <div id="template-manager-delete" class="container-fluid">
 	<div class="mt-2">
-        <div class="col-md-12">
-            <p><?php echo JText::sprintf('COM_TEMPLATES_MODAL_FILE_DELETE', $this->fileName); ?></p>
-        </div>
+		<div class="col-md-12">
+			<p><?php echo JText::sprintf('COM_TEMPLATES_MODAL_FILE_DELETE', $this->fileName); ?></p>
+		</div>
 	</div>
 </div>

administrator/components/com_users/tmpl/users/default_batch_body.php

@@ -25,23 +25,21 @@
 ?>
 
 <div class="container">
-	<div class="row">
-		<div id="batch-choose-action" class="combo control-group">
-			<label id="batch-choose-action-lbl" class="control-label" for="batch-choose-action">
+	<form>
+		<div class="form-group">
+			<label id="batch-choose-action-lbl" class="control-label" for="batch-group-id">
 				<?php echo JText::_('COM_USERS_BATCH_GROUP'); ?>
 			</label>
-		</div>
-		<div id="batch-choose-action" class="combo controls">
-			<div class="control-group">
-				<select class="custom-select" name="batch[group_id]" id="batch-group-id">
-					<option value=""><?php echo JText::_('JSELECT'); ?></option>
-					<?php echo JHtml::_('select.options', JHtml::_('user.groups')); ?>
-				</select>
+			<div id="batch-choose-action" class="combo controls">
+                <select class="custom-select" name="batch[group_id]" id="batch-group-id">
+                    <option value=""><?php echo JText::_('JSELECT'); ?></option>
+                    <?php echo JHtml::_('select.options', JHtml::_('user.groups')); ?>
+                </select>
 			</div>
 		</div>
-		<label><?php echo JText::_('COM_USERS_REQUIRE_PASSWORD_RESET'); ?></label>
-		<div class="control-group radio">
-			<?php echo JHtml::_('select.radiolist', $resetOptions, 'batch[reset_id]', '', 'value', 'text', ''); ?>
-		</div>
-	</div>
+        <div class="form-group">
+            <label><?php echo JText::_('COM_USERS_REQUIRE_PASSWORD_RESET'); ?></label>
+            <?php echo JHtml::_('select.radiolist', $resetOptions, 'batch[reset_id]', '', 'value', 'text', ''); ?>
+        </div>
+	</form>
 </div>

administrator/language/en-GB/en-GB.com_finder.ini

@@ -17,7 +17,7 @@ COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_LABEL="OpenSearch Name"
 COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
 COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
 COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_LABEL="Memory Table Limit"
-COM_FINDER_CONFIG_META_MULTIPLIER_LABEL="Meta Data Weight Multiplier"
+COM_FINDER_CONFIG_META_MULTIPLIER_LABEL="Metadata Weight Multiplier"
 COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL="Misc. Text Weight Multiplier"
 COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL="Path Text Weight Multiplier"
 COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL="Advanced Search"

administrator/language/en-GB/en-GB.com_menus.ini

@@ -74,7 +74,7 @@ COM_MENUS_HTML_UNPUBLISH_URL="Unpublish the URL menu item"
 COM_MENUS_INTEGRATION_FIELDSET_LABEL="Integration"
 COM_MENUS_ITEM_DETAILS="Details"
 COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL="Menu Item"
-COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL="Link CSS Style"
+COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL="Link Class"
 COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL="Link Title Attribute"
 COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL="Link Rel Attribute"
 COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL=" Menu"

administrator/language/en-GB/en-GB.lib_joomla.ini

@@ -387,6 +387,7 @@ JLIB_HTML_BEHAVIOR_HOLD_MOUSE="- Hold mouse button on any of the buttons above f
 JLIB_HTML_BEHAVIOR_MONTH_SELECT="- Use the < and > buttons to select month\n"
 JLIB_HTML_BEHAVIOR_NEXT_MONTH_HOLD_FOR_MENU="Select to move to the next month. Select and hold for a list of the months."
 JLIB_HTML_BEHAVIOR_NEXT_YEAR_HOLD_FOR_MENU="Select to move to the next year. Select and hold for a list of years."
+JLIB_HTML_BEHAVIOR_OPEN_CALENDAR="Open the calendar"
 JLIB_HTML_BEHAVIOR_PREV_MONTH_HOLD_FOR_MENU="Select to move to the previous month. Select and hold for a list of the months."
 JLIB_HTML_BEHAVIOR_PREV_YEAR_HOLD_FOR_MENU="Select to move to the previous year. Select and hold for a list of years."
 JLIB_HTML_BEHAVIOR_SELECT_DATE="Select a date."

administrator/language/en-GB/en-GB.plg_fields_sql.ini

@@ -10,5 +10,5 @@ PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple"
 ; In the string below the terms 'value' and 'text' should not be translated
 PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' containing the text in the dropdown list."
 PLG_FIELDS_SQL_PARAMS_QUERY_LABEL="Query"
-PLG_FIELDS_SQL_RULES_ADAPTED="For increased security the edit permission for this SQL fields was set to denied for all non Super Users."
+PLG_FIELDS_SQL_RULES_ADAPTED="For increased security the edit permission for this SQL field was set to denied for all non Super Users."
 PLG_FIELDS_SQL_XML_DESCRIPTION="This plugin lets you create new fields of type 'sql' in any extensions where custom fields are supported."

build/stubGenerator.php

@@ -57,23 +57,34 @@ class StubGenerator extends CliApplication
 	 */
 	public function doExecute()
 	{
-		// Get the aliased class names via Reflection as the property is protected
-		$refl = new ReflectionClass('JLoader');
-		$property = $refl->getProperty('classAliases');
-		$property->setAccessible(true);
-		$aliases = $property->getValue();
-
 		$file = "<?php\n";
 
 		// Loop the aliases to generate the stubs data
-		foreach ($aliases as $oldName => $newName)
+		foreach (JLoader::getDeprecatedAliases() as $alias)
 		{
+			$oldName           = $alias['old'];
+			$newName           = $alias['new'];
+			$deprecatedVersion = $alias['version'];
+
 			// Figure out if the alias is for a class or interface
 			$reflection = new ReflectionClass($newName);
-			$type = $reflection->isInterface() ? 'interface' : 'class';
-			$modifier = ($reflection->isAbstract() && !$reflection->isInterface()) ? 'abstract ' : '';
+			$type       = $reflection->isInterface() ? 'interface' : 'class';
+			$modifier   = (!$reflection->isInterface() && $reflection->isFinal()) ? 'final ' : '';
+			$modifier   = ($reflection->isAbstract() && !$reflection->isInterface()) ? $modifier . 'abstract ' : $modifier;
+
+			// If a deprecated version is available, write a stub class doc block with a deprecated tag
+			if ($deprecatedVersion !== false)
+			{
+				$file .= <<<PHP
+/**
+ * @deprecated $deprecatedVersion Use $newName instead.
+ */
+
+PHP;
+
+			}
 
-			$file .= "$modifier$type $oldName extends $newName {}\n";
+			$file .= "$modifier$type $oldName extends $newName {}\n\n";
 		}
 
 		// And save the file locally

components/com_config/Controller/ModulesController.php

@@ -48,7 +48,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	/**
 	 * Method to handle cancel
 	 *
-	 * @return  boolean  True on success.
+	 * @return  void
 	 *
 	 * @since   3.2
 	 */
@@ -61,7 +61,7 @@ public function cancel()
 	/**
 	 * Method to save module editing.
 	 *
-	 * @return  bool	True on success.
+	 * @return  void
 	 *
 	 * @since   3.2
 	 */

components/com_config/Model/TemplatesModel.php

@@ -40,7 +40,7 @@ protected function populateState()
 	 * @param   array    $data      An optional array of data for the form to interogate.
 	 * @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
+	 * @return  \JForm|bool    A JForm object on success, false on failure
 	 *
 	 * @since   3.2
 	 */

components/com_config/tmpl/modules/default.php

@@ -62,11 +62,11 @@
 			<legend><?php echo JText::_('COM_CONFIG_MODULES_SETTINGS_TITLE'); ?></legend>
 
 			<div>
-				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_NAME') ?>
-				<span class="badge badge-secondary"><?php echo $this->item['title'] ?></span>
+				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_NAME'); ?>
+				<span class="badge badge-secondary"><?php echo $this->item['title']; ?></span>
 				&nbsp;&nbsp;
-				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_TYPE') ?>
-				<span class="badge badge-secondary"><?php echo $this->item['module'] ?></span>
+				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_TYPE'); ?>
+				<span class="badge badge-secondary"><?php echo $this->item['module']; ?></span>
 			</div>
 			<hr>