Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.0-phpcs

.drone.yml

@@ -1,5 +1,5 @@
 build:
-  image: yveshoppe/joomla-systemtests:latest
+  image: joomlaprojects/docker-systemtests:latest
   commands:
     - apt-get install nodejs npm
     - ln -s /usr/bin/nodejs /usr/bin/node

.gitignore

@@ -101,10 +101,11 @@ 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/get_oauth_token.php
+/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
 /libraries/vendor/phpmailer/phpmailer/README.md
 /libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
-/libraries/vendor/phpmailer/phpmailer/extras/README.md
-/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
 /libraries/vendor/psr/log/Psr/Log/Test
 /libraries/vendor/psr/log/.gitignore
 /libraries/vendor/psr/log/composer.json

README.md

@@ -15,13 +15,13 @@ What is this?
 
 What is Joomla?
 ---------------------
-* [Joomla](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
+* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
 * It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
-* Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
+* Joomla! is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
 
 Is Joomla! for you?
 ---------------------
-* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
+* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
 * View Joomla's [core features here](https://www.joomla.org/core-features.html).
 * Try it out for yourself in our [online demo](https://demo.joomla.org).
 
@@ -38,9 +38,9 @@ Learn Joomla!
 
 What are the benefits of Joomla?
 ---------------------
-* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
 * There are many ready-made extensions that you can download and install.
-* Check out the [Joomla! Extensions Directory (JED)](http://extensions.joomla.org).
+* Check out the [Joomla! Extensions Directory (JED)](https://extensions.joomla.org).
 
 Is it easy to change the layout display?
 ---------------------

README.txt

@@ -5,13 +5,13 @@
 	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?
-	* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
+	* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
 	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later.
 	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run.
 	You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
 
 3- Is Joomla! for you?
-	* Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
+	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
 	* See Joomla's core features - https://www.joomla.org/core-features.html
 	* Try out our online demo: https://demo.joomla.org/
 
@@ -25,9 +25,9 @@
 	* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners
 
 6- What are the benefits of Joomla?
-	* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+	* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
 	* There are many ready-made extensions that you can download and install.
-	* Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
+	* Check out the Joomla! Extensions Directory (JED): https://extensions.joomla.org
 
 7- Is it easy to change the layout display?
 	* The layout is controlled by templates that you can edit.

administrator/components/com_installer/helpers/installer.php

@@ -121,25 +121,6 @@ public static function getExtensionGroupes()
 		return $options;
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @since   1.6
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		$result = JHelperContent::getActions('com_installer');
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the application clients.
 	 *

administrator/components/com_languages/helpers/languages.php

@@ -45,24 +45,6 @@ public static function addSubmenu($vName, $client = 0)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead.
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function.
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions.
-		$result = JHelperContent::getActions('com_languages');
-
-		return $result;
-	}
-
 	/**
 	 * Method for parsing ini files.
 	 *

administrator/components/com_menus/helpers/menus.php

@@ -44,27 +44,6 @@ public static function addSubmenu($vName)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @param   integer  $parentId  The menu ID.
-	 *
-	 * @return  JObject
-	 *
-	 * @since   1.6
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions($parentId = 0)
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		$result = JHelperContent::getActions('com_menus');
-
-		return $result;
-	}
-
 	/**
 	 * Gets a standard form of a link for lookups.
 	 *

administrator/components/com_messages/helpers/messages.php

@@ -40,24 +40,6 @@ public static function addSubmenu($vName)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		$result = JHelperContent::getActions('com_messages');
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the state of a module.
 	 *

administrator/components/com_modules/helpers/modules.php

@@ -28,33 +28,6 @@ public static function addSubmenu($vName)
 		// Not used in this component.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @param   integer  $moduleId  The module ID.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions($moduleId = 0)
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		if (empty($moduleId))
-		{
-			$result = JHelperContent::getActions('com_modules');
-		}
-		else
-		{
-			$result = JHelperContent::getActions('com_modules', 'module', $moduleId);
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the state of a module.
 	 *

administrator/components/com_plugins/helpers/plugins.php

@@ -30,24 +30,6 @@ public static function addSubmenu($vName)
 		// No submenu for this component.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function.
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions.
-		$result = JHelperContent::getActions('com_plugins');
-
-		return $result;
-	}
-
 	/**
 	 * Returns an array of standard published state filter options.
 	 *

administrator/components/com_redirect/helpers/redirect.php

@@ -34,24 +34,6 @@ public static function addSubmenu($vName)
 		// No submenu for this component.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		$result = JHelperContent::getActions('com_redirect');
-
-		return $result;
-	}
-
 	/**
 	 * Returns an array of standard published state filter options.
 	 *

administrator/components/com_search/helpers/search.php

@@ -30,24 +30,6 @@ public static function addSubmenu($vName)
 		// Not required.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead.
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function.
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions.
-		$result = JHelperContent::getActions('com_search');
-
-		return $result;
-	}
-
 	/**
 	 * Sanitise search word.
 	 *
@@ -58,11 +40,10 @@ public static function getActions()
 	 */
 	public static function santiseSearchWord(&$searchword, $searchphrase)
 	{
-		$ignored = false;
-
 		$lang          = JFactory::getLanguage();
 		$tag           = $lang->getTag();
 		$search_ignore = $lang->getIgnoredSearchWords();
+		$ignored       = false;
 
 		// Deprecated in 1.6 use $lang->getIgnoredSearchWords instead.
 		$ignoreFile = $lang->getLanguagePath() . '/' . $tag . '/' . $tag . '.ignore.php';

administrator/components/com_templates/helpers/templates.php

@@ -37,24 +37,6 @@ public static function addSubmenu($vName)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		$result = JHelperContent::getActions('com_templates');
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the application clients.
 	 *

administrator/components/com_users/helpers/users.php

@@ -69,24 +69,6 @@ public static function addSubmenu($vName)
 		}
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @deprecated  3.2  Use JHelperContent::getActions() instead
-	 */
-	public static function getActions()
-	{
-		// Log usage of deprecated function
-		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
-		// Get list of actions
-		$result = JHelperContent::getActions('com_users');
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the blocked state of a user.
 	 *