Merge branch 'staging' into patch-110

.appveyor.yml

@@ -43,6 +43,9 @@ services:
 ## Install PHP and composer, and run the appropriate composer command
 install:
     - IF EXIST C:\tools\php (SET PHP=0)
+    # TODO: This is a workaround for https://github.com/chocolatey/choco/issues/1843. Once this is fixed we
+    #       should go back to latest version in appveyor saving ourselves test time
+    - ps: choco upgrade chocolatey -y --version 0.10.13 --allow-downgrade
     - ps: >-
         If ($env:php_ver_target -eq "5.6") {
           appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y --forcex86 php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')

.drone.yml

@@ -7,10 +7,10 @@ clone:
 
 steps:
   - name: phpcs
-    image: joomlaprojects/docker-phpcs
+    image: joomlaprojects/docker-images:phpcs1.5
     commands:
       - echo $(date)
-      - /root/.composer/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
+      - /usr/local/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
       - echo $(date)
 
   - name: restore-cache
@@ -25,7 +25,7 @@ steps:
         path: /cache
 
   - name: javascript
-    image: joomlaprojects/docker-systemtests:latest
+    image: joomlaprojects/docker-images:systemtests
     commands:
       - echo $(date)
       - export DISPLAY=:0
@@ -50,16 +50,17 @@ steps:
         path: /cache
 
   - name: analysis3x
-    image: rips/rips-cli:1.2.1
+    image: rips/rips-cli:3.2.2
     when:
       branch: staging
     commands:
       - export RIPS_BASE_URI='https://api.rips.joomla.org'
       - if [ $DRONE_REPO_NAMESPACE != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-      - rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -R -k -T $DRONE_REPO_NAMESPACE-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+      - rips-cli rips:list --table=scans -n -p filter='{"__and":[{"__lessThan":{"percent":100}}]}'
+      - rips-cli rips:scan:start -G -a 1 -t 1 -p $(pwd) -t 1 -R -k -T $DRONE_REPO_NAMESPACE-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
     environment:
-      RIPS_USERNAME:
-        from_secret: RIPS_USERNAME
+      RIPS_EMAIL:
+        from_secret: RIPS_EMAIL
       RIPS_PASSWORD:
         from_secret: RIPS_PASSWORD
 
@@ -72,6 +73,6 @@ branches:
   exclude: [ l10n_* ]
 ---
 kind: signature
-hmac: e3e6739c960a689e78ec07c0ea193818796cdcf3c3dab9781f7f07b7e3e6b674
+hmac: 7d1fbc23a21067e251bb5d22a875c5db23c88520d0384f1913a73aa0c992d017
 
 ...

.gitignore

@@ -70,9 +70,11 @@ Desktop.ini
 # Extra files installed by Composer not needed in the CMS environment
 # This should only ignore files like unit testing or READMEs, production
 # code must remain to ensure all libraries properly function
+/libraries/vendor/brumann/polyfill-unserialize/.gitattributes
 /libraries/vendor/brumann/polyfill-unserialize/.gitignore
 /libraries/vendor/brumann/polyfill-unserialize/.travis.yml
 /libraries/vendor/brumann/polyfill-unserialize/composer.json
+/libraries/vendor/brumann/polyfill-unserialize/composer.lock
 /libraries/vendor/brumann/polyfill-unserialize/LICENSE
 /libraries/vendor/brumann/polyfill-unserialize/phpunit.xml.dist
 /libraries/vendor/brumann/polyfill-unserialize/README.md
@@ -155,6 +157,7 @@ Desktop.ini
 /libraries/vendor/phpmailer/phpmailer/.travis.yml
 /libraries/vendor/phpmailer/phpmailer/changelog.md
 /libraries/vendor/phpmailer/phpmailer/composer.json
+/libraries/vendor/phpmailer/phpmailer/composer.lock
 /libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
 /libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
 /libraries/vendor/phpmailer/phpmailer/README.md
@@ -227,4 +230,3 @@ composer.phar
 
 # Build related
 RoboFile.ini
-

.travis.yml

@@ -26,25 +26,31 @@ matrix:
       env:
         - INSTALL_APCU="no"
         - INSTALL_MEMCACHE="yes"
+      dist: trusty
     - php: 5.5
       env:
         - INSTALL_MEMCACHE="yes"
+      dist: trusty
     - php: 5.6
       env:
         - INSTALL_MEMCACHE="yes"
+      dist: trusty
     - php: 7.0
     - php: 7.1
     - php: 7.2
     - php: 7.3
+    - php: 7.4snapshot
     - php: nightly
   allow_failures:
-    - php: 7.3
+    - php: 7.4snapshot
     - php: nightly
 
 services:
   - memcache
   - memcached
   - redis-server
+  - mysql
+  - postgresql
 
 before_script:
   # Make sure all dev dependencies are installed

CODE_OF_CONDUCT.md

@@ -32,7 +32,7 @@ People on every project come and go, and Joomla is no different. When you leave
 Check your e-mails regularly and answer them promptly—even if it's "I'll get back to you."
 ## Be Honest
 
-Sometimes the hardest thing to say is "no" or admit you've forgotten do something. Be honest with each other and yourself with regards to what you say and what you can realistically commit to.
+Sometimes the hardest thing to say is "no" or admit you've forgotten to do something. Be honest with each other and yourself with regards to what you say and what you can realistically commit to.
 ## Follow the Rules
 
 Volunteers are expected to uphold Joomla's licensing and trademark requirements including, but not limited to, compliance on their own or affiliate Web sites and extensions. Make sure you have sought the appropriate approvals for domain name, name and logo usage prior to volunteering and that any extensions you distribute comply with the Joomla license.

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

@@ -4,7 +4,7 @@
  * @subpackage  com_actionlogs
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;

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

@@ -4,7 +4,7 @@
  * @subpackage  com_actionlogs
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;

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

@@ -4,7 +4,7 @@
  * @subpackage  com_actionlogs
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;

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

@@ -4,7 +4,7 @@
  * @subpackage  System.actionlogs
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;

administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml

@@ -4,7 +4,7 @@
 		<field
 			name="search"
 			type="text"
-			label="COM_ACTIONLOGS_FILTER_SEARCH_DESC"
+			description="COM_ACTIONLOGS_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
 		<field
@@ -41,6 +41,7 @@
 			description="COM_ACTIONLOGS_LIST_FULL_ORDERING_DESC"
 			onchange="this.form.submit();"
 			default="a.id DESC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.message ASC">COM_ACTIONLOGS_ACTION_ASC</option>

administrator/components/com_admin/postinstall/joomla40checks.php

@@ -20,6 +20,7 @@
  *
  * @link    https://developer.joomla.org/news/658-joomla4-manifesto.html
  * @link    https://developer.joomla.org/news/704-looking-forward-with-joomla-4.html
+ * @link    https://developer.joomla.org/news/788-joomla-4-on-the-move.html
  */
 function admin_postinstall_joomla40checks_condition()
 {
@@ -33,15 +34,27 @@ function admin_postinstall_joomla40checks_condition()
 		return true;
 	}
 
-	if ($serverType == 'postgresql' && version_compare($serverVersion, '9.2', 'lt'))
+	if ($serverType == 'postgresql' && version_compare($serverVersion, '11.0', 'lt'))
 	{
-		// PostgreSQL minimum version is 9.2
+		// PostgreSQL minimum version is 11.0
 		return true;
 	}
 
-	if ($serverType == 'mysql' && version_compare($serverVersion, '5.5.3', 'lt'))
+	// Check whether we have a MariaDB version string and extract the proper version from it
+	if ($serverType == 'mysql' && stripos($serverVersion, 'mariadb') !== false)
 	{
-		// MySQL minimum version is 5.5.3
+		$serverVersion = preg_replace('/^5\.5\.5-/', '', $serverVersion);
+
+		// MariaDB minimum version is 10.1
+		if (version_compare($serverVersion, '10.1', 'lt'))
+		{
+			return true;
+		}
+	}
+
+	if ($serverType == 'mysql' && version_compare($serverVersion, '5.6', 'lt'))
+	{
+		// MySQL minimum version is 5.6.0
 		return true;
 	}
 
@@ -57,6 +70,6 @@ function admin_postinstall_joomla40checks_condition()
 		return true;
 	}
 
-	// PHP minimum version is 7.0
-	return version_compare(PHP_VERSION, '7.0', 'lt');
+	// PHP minimum version is 7.2.5
+	return version_compare(PHP_VERSION, '7.2.5', 'lt');
 }

administrator/components/com_admin/script.php

@@ -2267,6 +2267,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/filesystem/support',
 			'/libraries/joomla/filesystem/wrapper',
 			'/libraries/joomla/filesystem',
+			'/libraries/vendor/phpmailer/phpmailer/composer.lock',
 		);
 
 		jimport('joomla.filesystem.file');

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

@@ -94,6 +94,7 @@
 			type="list"
 			default="id ASC"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="state ASC">JSTATUS_ASC</option>

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

@@ -75,6 +75,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

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

@@ -44,6 +44,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.state ASC">JSTATUS_ASC</option>

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

@@ -64,7 +64,6 @@
 			format="%Y-%m-%d"
 			size="10"
 			filter="user_utc"
-			onchange="this.form.submit();"
 		/>
 
 		<field
@@ -76,7 +75,6 @@
 			format="%Y-%m-%d"
 			size="10"
 			filter="user_utc"
-			onchange="this.form.submit();"
 		/>
     </fields>
 	<fields name="list">
@@ -87,6 +85,7 @@
 			description="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="b.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="b.name ASC">COM_BANNERS_HEADING_NAME_ASC</option>

administrator/components/com_banners/models/tracks.php

@@ -401,9 +401,9 @@ protected function getCategoryName()
 	}
 
 	/**
-	 * Get the category name
+	 * Get the client name
 	 *
-	 * @return  string  The category name.
+	 * @return  string  The client name.
 	 *
 	 * @since   1.6
 	 */

administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php

@@ -12,6 +12,6 @@
 <button type="button" class="btn" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-client-id').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo JText::_('JCANCEL'); ?>
 </button>
-<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('banner.batch');">
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('banner.batch');return false;">
 	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>

administrator/components/com_cache/models/forms/filter_cache.xml

@@ -27,6 +27,7 @@
 			description="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="group ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="group ASC">COM_CACHE_HEADING_GROUP_ASC</option>

administrator/components/com_categories/models/fields/categoryedit.php

@@ -32,7 +32,7 @@ class JFormFieldCategoryEdit extends JFormFieldList
 	 * Optional prefix for new categories.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.11
 	 */
 	protected $customPrefix;
 

administrator/components/com_categories/models/forms/filter_categories.xml

@@ -78,6 +78,7 @@
 			default="a.lft ASC"
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>

administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php

@@ -12,6 +12,6 @@
 <button type="button" class="btn" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo JText::_('JCANCEL'); ?>
 </button>
-<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('category.batch');">
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('category.batch');return false;">
 	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>

administrator/components/com_checkin/models/forms/filter_checkin.xml

@@ -18,6 +18,7 @@
 			description="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="table ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="table ASC">COM_CHECKIN_DATABASE_TABLE_ASC</option>

administrator/components/com_config/model/application.php

@@ -59,6 +59,9 @@ public function getData()
 		$config = new JConfig;
 		$data   = ArrayHelper::fromObject($config);
 
+		// Get the correct driver at runtime
+		$data['dbtype'] = JFactory::getDbo()->getName();
+
 		// Prime the asset_id for the rules.
 		$data['asset_id'] = 1;
 

administrator/components/com_contact/models/forms/filter_contacts.xml

@@ -89,6 +89,7 @@
 			description="COM_CONTACT_LIST_FULL_ORDERING_DESC"
 			default="a.name ASC"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

administrator/components/com_contact/views/contacts/tmpl/default_batch.php

@@ -57,7 +57,7 @@
 		<button type="button" class="btn" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
 			<?php echo JText::_('JCANCEL'); ?>
 		</button>
-		<button type="submit" class="btn btn-primary" onclick="Joomla.submitbutton('contact.batch');">
+		<button type="submit" class="btn btn-primary" onclick="Joomla.submitbutton('contact.batch');return false;">
 			<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
 		</button>
 	</div>

administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php

@@ -12,6 +12,6 @@
 <button type="button" class="btn" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
 	<?php echo JText::_('JCANCEL'); ?>
 </button>
-<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('contact.batch');">
+<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('contact.batch');return false;">
 	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>