Merge branch '4.0-dev' into 4.0-dev

joomla · May 16, 2019 · e7b1f7c · e7b1f7c
2 parents c68fb64 + cfb1138
commit e7b1f7c
Show file tree

Hide file tree

Showing 63 changed files with 229 additions and 228 deletions.
diff --git a/administrator/components/com_contact/Table/ContactTable.php b/administrator/components/com_contact/Table/ContactTable.php
@@ -31,7 +31,7 @@ class ContactTable extends Table
 	 * Indicates that columns fully support the NULL value in the database
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $_supportNullValue = true;
 

diff --git a/administrator/components/com_finder/Indexer/Adapter.php b/administrator/components/com_finder/Indexer/Adapter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_finder/Indexer/Helper.php b/administrator/components/com_finder/Indexer/Helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_finder/Indexer/Indexer.php b/administrator/components/com_finder/Indexer/Indexer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_finder/Indexer/Parser.php b/administrator/components/com_finder/Indexer/Parser.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_finder/Indexer/Query.php b/administrator/components/com_finder/Indexer/Query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -111,7 +111,7 @@ class Query
 	 * Allow empty searches
 	 *
 	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public $empty;
 

diff --git a/administrator/components/com_finder/Indexer/Result.php b/administrator/components/com_finder/Indexer/Result.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -422,7 +422,7 @@ public function addTaxonomy($branch, $title, $state = 1, $access = 1, $language
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function addNestedTaxonomy($branch, ImmutableNodeInterface $contentNode, $state = 1, $access = 1, $language = '')
 	{
@@ -462,7 +462,7 @@ public function setLanguage()
 	 *
 	 * @return  string  The serialised data
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function serialize()
 	{
@@ -519,7 +519,7 @@ public function serialize()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function unserialize($serialized)
 	{

diff --git a/administrator/components/com_finder/Indexer/Taxonomy.php b/administrator/components/com_finder/Indexer/Taxonomy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,15 +26,15 @@ class Taxonomy
 	 * An internal cache of taxonomy data.
 	 *
 	 * @var    object[]
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public static $taxonomies = array();
 
 	/**
 	 * An internal cache of branch data.
 	 *
 	 * @var    object[]
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	public static $branches = array();
 
@@ -111,7 +111,7 @@ public static function addNode($branch, $title, $state = 1, $access = 1, $langua
 	 *
 	 * @return  integer  The id of the node.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function addNestedNode($branch, NodeInterface $node, $state = 1, $access = 1, $language = '', $branchId = null)
 	{
@@ -150,7 +150,7 @@ public static function addNestedNode($branch, NodeInterface $node, $state = 1, $
 	 *
 	 * @return  integer  The id of the inserted node.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	protected static function storeNode($node, $parent_id)
 	{
@@ -387,7 +387,7 @@ public static function removeOrphanNodes()
 	 *
 	 * @return  object|array  A taxonomy object or an array of all taxonomies
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function getTaxonomy($id = 0)
 	{
@@ -424,7 +424,7 @@ public static function getTaxonomy($id = 0)
 	 *
 	 * @return  object|array  The object with the branch data or an array of all branches
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public static function getBranch($title = '')
 	{

diff --git a/administrator/components/com_finder/Indexer/Token.php b/administrator/components/com_finder/Indexer/Token.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_menus/Table/MenuTable.php b/administrator/components/com_menus/Table/MenuTable.php
@@ -55,7 +55,7 @@ public function delete($pk = null, $children = false)
 	 * @return  boolean  True on success, false on failure
 	 *
 	 * @see     JTable::check
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function check()
 	{

diff --git a/administrator/components/com_modules/Field/ModulesPositioneditField.php b/administrator/components/com_modules/Field/ModulesPositioneditField.php
@@ -42,7 +42,7 @@ class ModulesPositioneditField extends FormField
 	 * Client name.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	protected $client;
 
@@ -53,7 +53,7 @@ class ModulesPositioneditField extends FormField
 	 *
 	 * @return  mixed  The property value or null.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function __get($name)
 	{
@@ -74,7 +74,7 @@ public function __get($name)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function __set($name, $value)
 	{
@@ -101,7 +101,7 @@ public function __set($name, $value)
 	 * @return  boolean  True on success.
 	 *
 	 * @see     FormField::setup()
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function setup(\SimpleXMLElement $element, $value, $group = null)
 	{

diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.9" client="administrator">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>April 2019</creationDate>
+	<creationDate>May 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.0.0</version>
-	<creationDate>April 2019</creationDate>
+	<creationDate>May 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.0.0-alpha9-dev</version>
-	<creationDate>April 2019</creationDate>
+	<version>4.0.0-alpha10-dev</version>
+	<creationDate>May 2019</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>4.0.0.1</version>
-	<creationDate>April 2019</creationDate>
+	<creationDate>May 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
@@ -4,7 +4,7 @@
 	client="installation">
 	<name>English (United Kingdom)</name>
 	<version>4.0.0</version>
-	<creationDate>April 2019</creationDate>
+	<creationDate>May 2019</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.9" client="site">
 	<name>English (en-GB)</name>
 	<version>4.0.0</version>
-	<creationDate>April 2019</creationDate>
+	<creationDate>May 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.0.0</version>
-	<creationDate>April 2019</creationDate>
+	<creationDate>May 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/layouts/joomla/toolbar/dropdown.php b/layouts/joomla/toolbar/dropdown.php
@@ -10,11 +10,11 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
 $direction = Factory::getLanguage()->isRtl() ? 'dropdown-menu-right' : '';
 
-
 /**
  * @var  string  $id
  * @var  string  $onclick
@@ -32,6 +32,7 @@
 extract($displayData, EXTR_OVERWRITE);
 ?>
 <?php if ($hasButtons && trim($button) !== ''): ?>
+	<?php HTMLHelper::_('bootstrap.framework'); ?>
 	<div id="<?php echo $id; ?>" class="btn-group dropdown-<?php echo $name ?? ''; ?>" role="group">
 		<?php echo $button; ?>
 

diff --git a/libraries/src/Application/ConsoleApplication.php b/libraries/src/Application/ConsoleApplication.php
@@ -285,7 +285,7 @@ public function setSession(SessionInterface $session): self
 	 *
 	 * @return  null
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function getMenu($name = null, $options = array())
 	{

diff --git a/libraries/src/Extension/DummyPlugin.php b/libraries/src/Extension/DummyPlugin.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Placeholder plugin.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 class DummyPlugin extends CMSPlugin
 {

diff --git a/libraries/src/Extension/ExtensionManagerInterface.php b/libraries/src/Extension/ExtensionManagerInterface.php
@@ -48,7 +48,7 @@ public function bootModule($module, $applicationName): ModuleInterface;
 	 *
 	 * @return  PluginInterface
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function bootPlugin($plugin, $type): PluginInterface;
 }
diff --git a/libraries/src/Extension/ExtensionManagerTrait.php b/libraries/src/Extension/ExtensionManagerTrait.php
@@ -80,7 +80,7 @@ public function bootModule($module, $applicationName): ModuleInterface
 	 *
 	 * @return  PluginInterface
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function bootPlugin($plugin, $type): PluginInterface
 	{
@@ -194,7 +194,7 @@ private function loadExtension($type, $extensionName, $extensionPath)
 	 *
 	 * @return  CMSPlugin
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	private function loadPluginFromFilesystem(string $plugin, string $type)
 	{

diff --git a/libraries/src/Extension/PluginInterface.php b/libraries/src/Extension/PluginInterface.php
@@ -2,7 +2,7 @@
 /**
  * Joomla! Content Management System
  *
- * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 /**
  * Access to plugin specific services.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.0.0
  */
 interface PluginInterface extends DispatcherAwareInterface
 {
@@ -24,7 +24,7 @@ interface PluginInterface extends DispatcherAwareInterface
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   4.0.0
 	 */
 	public function registerListeners();
 }