Merge remote-tracking branch 'remotes/upstream/4.0-dev' into j4/appli…

…cation-interface

# Conflicts:
#	libraries/vendor/composer/installed.json

Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'scss_lint', '~> 0.52.0'
+gem 'scss_lint', '~> 0.53.0'

administrator/components/com_admin/models/forms/profile.xml

@@ -1,46 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="user_details">
-		<field name="name" type="text"
-			description="COM_ADMIN_USER_FIELD_NAME_DESC"
+		<field 
+			name="name" 
+			type="text"
 			label="COM_ADMIN_USER_HEADING_NAME"
+			description="COM_ADMIN_USER_FIELD_NAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="username" type="text"
-			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
+		<field 
+			name="username" 
+			type="text"
 			label="COM_ADMIN_USER_FIELD_USERNAME_LABEL"
+			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="password2" type="password"
+		<field 
+			name="password2" 
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
 			field="password"
 			filter="raw"
-			label="JGLOBAL_PASSWORD"
 			message="COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE"
 			size="30"
 			validate="equals"
 		/>
 
-		<field name="password" type="password"
+		<field 
+			name="password" 
+			type="password"
+			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
+			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			filter="raw"
-			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
 			size="30"
 			validate="password"
 		/>
 
-		<field name="email" type="email"
-			class="validate-email"
-			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+		<field 
+			name="email" 
+			type="email"
 			label="JGLOBAL_EMAIL"
+			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+			class="validate-email"
 			required="true"
 			size="30"
 			validate="email"
@@ -49,9 +59,9 @@
 		<field
 			name="registerDate"
 			type="calendar"
-			class="readonly"
 			label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL"
 			description="COM_ADMIN_USER_FIELD_REGISTERDATE_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -62,9 +72,9 @@
 		<field
 			name="lastvisitDate"
 			type="calendar"
-			class="readonly"
 			label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL"
 			description="COM_ADMIN_USER_FIELD_LASTVISIT_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -75,13 +85,13 @@
 		<field
 			name="id"
 			type="text"
-			class="readonly"
 			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
 			default="0"
 			readonly="true"
 			filter="unset"
-			/>
+		/>
 
 	</fieldset>
 
@@ -90,48 +100,61 @@
 		<!--  Basic user account settings. -->
 		<fieldset name="settings" label="COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL">
 
-			<field name="admin_style" type="templatestyle"
-				client="administrator"
-				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+			<field 
+				name="admin_style" 
+				type="templatestyle"
 				label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="admin_language" type="language"
-				client="administrator"
-				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+			<field 
+				name="admin_language" 
+				type="language"
 				label="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="language" type="language"
-				client="site"
-				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+			<field 
+				name="language"
+				type="language"
 				label="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="editor" type="plugins" folder="editors"
-				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+			<field 
+				name="editor" 
+				type="plugins" 
 				label="COM_ADMIN_USER_FIELD_EDITOR_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="helpsite" type="helpsite"
+			<field 
+				name="helpsite" 
+				type="helpsite"
 				label="COM_ADMIN_USER_FIELD_HELPSITE_LABEL"
 				description="COM_ADMIN_USER_FIELD_HELPSITE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="timezone" type="timezone"
+			<field 
+				name="timezone" 
+				type="timezone"
 				label="COM_ADMIN_USER_FIELD_TIMEZONE_LABEL"
 				description="COM_ADMIN_USER_FIELD_TIMEZONE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 		</fieldset>

administrator/components/com_admin/script.php

@@ -1783,6 +1783,10 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/filter/input.php',
 			'/libraries/cms/filter/output.php',
 			'/libraries/cms/filter/wrapper/output.php',
+			'/libraries/cms/form/field/media.php',
+			'/libraries/cms/form/rule/captcha.php',
+			'/libraries/cms/form/rule/notequals.php',
+			'/libraries/cms/form/rule/password.php',
 			'/libraries/cms/help/help.php',
 			'/libraries/cms/helper/content.php',
 			'/libraries/cms/helper/contenthistory.php',
@@ -1887,6 +1891,22 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/cache/storage/xcache.php',
 			'/libraries/joomla/date/date.php',
 			'/libraries/joomla/environment/browser.php',
+			'/libraries/joomla/form/field.php',
+			'/libraries/joomla/form/form.php',
+			'/libraries/joomla/form/helper.php',
+			'/libraries/joomla/form/rule.php',
+			'/libraries/joomla/form/rule/boolean.php',
+			'/libraries/joomla/form/rule/calendar.php',
+			'/libraries/joomla/form/rule/color.php',
+			'/libraries/joomla/form/rule/email.php',
+			'/libraries/joomla/form/rule/equals.php',
+			'/libraries/joomla/form/rule/number.php',
+			'/libraries/joomla/form/rule/options.php',
+			'/libraries/joomla/form/rule/rules.php',
+			'/libraries/joomla/form/rule/tel.php',
+			'/libraries/joomla/form/rule/url.php',
+			'/libraries/joomla/form/rule/username.php',
+			'/libraries/joomla/form/wrapper/helper.php',
 			'/libraries/joomla/language/helper.php',
 			'/libraries/joomla/language/language.php',
 			'/libraries/joomla/language/stemmer.php',
@@ -1905,6 +1925,8 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/log/logger/messagequeue.php',
 			'/libraries/joomla/log/logger/syslog.php',
 			'/libraries/joomla/log/logger/w3c.php',
+			'/libraries/joomla/microdata/microdata.php',
+			'/libraries/joomla/microdata/types.json',
 			'/libraries/joomla/profiler/profiler.php',
 			'/libraries/joomla/session/session.php',
 			'/libraries/joomla/table/asset.php',
@@ -1937,6 +1959,11 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/model/item.php',
 			'/libraries/legacy/model/legacy.php',
 			'/libraries/legacy/model/list.php',
+			'/libraries/legacy/table/category.php',
+			'/libraries/legacy/table/content.php',
+			'/libraries/legacy/table/menu.php',
+			'/libraries/legacy/table/menu/type.php',
+			'/libraries/legacy/table/module.php',
 			'/libraries/legacy/view/categories.php',
 			'/libraries/legacy/view/category.php',
 			'/libraries/legacy/view/categoryfeed.php',
@@ -2079,6 +2106,7 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/component',
 			'/libraries/cms/editor',
 			'/libraries/cms/error',
+			'/libraries/cms/form/rule',
 			'/libraries/cms/help',
 			'/libraries/cms/helper',
 			'/libraries/cms/installer/adapter',
@@ -2116,10 +2144,13 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/environment',
 			'/libraries/joomla/filter/wrapper',
 			'/libraries/joomla/filter',
+			'/libraries/joomla/form/rule',
+			'/libraries/joomla/form/wrapper',
 			'/libraries/joomla/language/stemmer',
 			'/libraries/joomla/language/wrapper',
 			'/libraries/joomla/log/logger',
 			'/libraries/joomla/log',
+			'/libraries/joomla/microdata',
 			'/libraries/joomla/profiler',
 			'/libraries/joomla/table',
 			'/libraries/joomla/uri',

administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-19-03.sql

@@ -1 +1 @@
-ALTER TABLE `#__extensions` ADD namespace VARCHAR(500) NULL DEFAULT NULL AFTER params;
+ALTER TABLE `#__extensions` ADD namespace VARCHAR(500) NOT NULL DEFAULT '' AFTER params;

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-19.sql

@@ -1 +1 @@
-ALTER TABLE ""#__extensions" ADD "namespace"" VARCHAR(500) NULL DEFAULT NULL AFTER "params";
+ALTER TABLE ""#__extensions" ADD "namespace"" VARCHAR(500) NOT NULL DEFAULT '' AFTER "params";

administrator/components/com_associations/models/forms/association.xml

@@ -6,7 +6,7 @@
 			type="itemlanguage"
 			label="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_LABEL"
 			description="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_DESC"
-		>
+			>
 			<option value="">COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE</option>
 		</field>
 

administrator/components/com_associations/models/forms/filter_associations.xml

@@ -7,18 +7,18 @@
 		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
 		filtermode="selector"
 		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
-	>
+		>
 		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
 	</field>
 
 	<field
 		name="language"
 		type="contentlanguage"
 		label="JOPTION_FILTER_LANGUAGE"
-		filtermode="selector"
 		description="JOPTION_FILTER_LANGUAGE_DESC"
+		filtermode="selector"
 		onchange="this.form.submit();"
-	>
+		>
 		<option value="">JOPTION_SELECT_LANGUAGE</option>
 	</field>
 
@@ -37,7 +37,7 @@
 			label="JOPTION_FILTER_PUBLISHED"
 			description="JOPTION_FILTER_PUBLISHED_DESC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 
@@ -49,7 +49,7 @@
 			published="0,1,2"
 			extension="dynamic"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
 
@@ -60,7 +60,7 @@
 			description="COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC"
 			clientid="0"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
 		</field>
 
@@ -70,7 +70,7 @@
 			label="JOPTION_FILTER_ACCESS"
 			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
 
@@ -83,7 +83,7 @@
 			last="10"
 			step="1"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>
@@ -94,7 +94,7 @@
 			type="list"
 			default="id ASC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="state ASC">JSTATUS_ASC</option>
 			<option value="state DESC">JSTATUS_DESC</option>

administrator/components/com_associations/tmpl/associations/modal.php

@@ -104,7 +104,7 @@
 				<tr class="row<?php echo $i % 2; ?>">
 					<?php if (!empty($this->typeSupports['state'])) : ?>
 						<td class="center">
-							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>" aria-hidden="true"></span>
 						</td>
 					<?php endif; ?>
 					<td class="nowrap has-context">

administrator/components/com_banners/models/forms/download.xml

@@ -18,8 +18,8 @@
 		<field
 			name="basename"
 			type="text"
-			size="40"
 			label="COM_BANNERS_FIELD_BASENAME_LABEL"
+			size="40"
 		/>
 
 		<field

administrator/components/com_categories/tmpl/categories/modal.php

@@ -105,7 +105,7 @@
 						?>
 						<tr class="row<?php echo $i % 2; ?>">
 							<td class="text-center">
-								<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>"></span>
+								<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
 							</td>
 							<td>
 								<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>