diff --git a/administrator/components/com_categories/Field/CategoryeditField.php b/administrator/components/com_categories/Field/CategoryeditField.php index 8c15fd384dd65..93189d5619b7c 100644 --- a/administrator/components/com_categories/Field/CategoryeditField.php +++ b/administrator/components/com_categories/Field/CategoryeditField.php @@ -44,7 +44,7 @@ class CategoryeditField extends ListField * Name of the layout being used to render the field * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $layout = 'joomla.form.field.categoryedit'; diff --git a/administrator/components/com_content/Extension/ContentComponent.php b/administrator/components/com_content/Extension/ContentComponent.php index f6373f4a37648..c227c293cd0e8 100644 --- a/administrator/components/com_content/Extension/ContentComponent.php +++ b/administrator/components/com_content/Extension/ContentComponent.php @@ -186,7 +186,7 @@ protected function getTableNameForSection(string $section = null) * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getWorkflowTableBySection(string $section = null) : string { diff --git a/administrator/components/com_content/Model/ArticleModel.php b/administrator/components/com_content/Model/ArticleModel.php index de486743deafa..fa33040fbb4b9 100644 --- a/administrator/components/com_content/Model/ArticleModel.php +++ b/administrator/components/com_content/Model/ArticleModel.php @@ -457,7 +457,7 @@ protected function prepareTable($table) * * @return boolean True on success. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function publish(&$pks, $value = 1) { diff --git a/administrator/components/com_cpanel/Entities/SystemHeader.php b/administrator/components/com_cpanel/Entities/SystemHeader.php index d49cd5b776c4b..829bd825f05d1 100644 --- a/administrator/components/com_cpanel/Entities/SystemHeader.php +++ b/administrator/components/com_cpanel/Entities/SystemHeader.php @@ -14,7 +14,7 @@ /** * Class representing a section in the system view. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ class SystemHeader { @@ -23,7 +23,7 @@ class SystemHeader * * @var string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ private $icon; @@ -32,7 +32,7 @@ class SystemHeader * * @var string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ private $title; @@ -41,7 +41,7 @@ class SystemHeader * * @var SystemItem[] * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ private $items = []; @@ -51,7 +51,7 @@ class SystemHeader * @param string $title The title of the header * @param string $icon The class for an icon to display for the header * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function __construct($title, $icon) { @@ -66,7 +66,7 @@ public function __construct($title, $icon) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function addItem(SystemItem $item) { @@ -78,7 +78,7 @@ public function addItem(SystemItem $item) * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getIcon() { @@ -90,7 +90,7 @@ public function getIcon() * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getTitle() { @@ -102,7 +102,7 @@ public function getTitle() * * @return SystemItem[] * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getItems() { @@ -114,7 +114,7 @@ public function getItems() * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function hasItems() { diff --git a/administrator/components/com_cpanel/Entities/SystemItem.php b/administrator/components/com_cpanel/Entities/SystemItem.php index 94e52d94ab50a..ffbe29a8fdaaa 100644 --- a/administrator/components/com_cpanel/Entities/SystemItem.php +++ b/administrator/components/com_cpanel/Entities/SystemItem.php @@ -14,7 +14,7 @@ /** * Class representing a item in the system view. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ class SystemItem { @@ -46,7 +46,7 @@ class SystemItem * @param string $link The link for the item * @param string $badge The optional badge for the item * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function __construct($title, $link, $badge = '') { @@ -64,7 +64,7 @@ public function __construct($title, $link, $badge = '') * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getTitle() { @@ -76,7 +76,7 @@ public function getTitle() * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getLink() { @@ -88,7 +88,7 @@ public function getLink() * * @return string|null * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getBadge() { diff --git a/administrator/components/com_cpanel/Model/SystemModel.php b/administrator/components/com_cpanel/Model/SystemModel.php index 235feba18e524..6edfce0ac1006 100644 --- a/administrator/components/com_cpanel/Model/SystemModel.php +++ b/administrator/components/com_cpanel/Model/SystemModel.php @@ -20,7 +20,7 @@ /** * Model to get a list of system icons. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ class SystemModel extends BaseDatabaseModel { @@ -29,7 +29,7 @@ class SystemModel extends BaseDatabaseModel * * @return array * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getItems() { diff --git a/administrator/components/com_modules/Field/ModulesPositioneditField.php b/administrator/components/com_modules/Field/ModulesPositioneditField.php index 7688cbe806e50..1889dbe48f138 100644 --- a/administrator/components/com_modules/Field/ModulesPositioneditField.php +++ b/administrator/components/com_modules/Field/ModulesPositioneditField.php @@ -18,7 +18,7 @@ /** * Edit Modules Position field. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ class ModulesPositioneditField extends FormField { @@ -26,7 +26,7 @@ class ModulesPositioneditField extends FormField * The form field type. * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $type = 'ModulesPositionedit'; @@ -34,7 +34,7 @@ class ModulesPositioneditField extends FormField * Name of the layout being used to render the field * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $layout = 'joomla.form.field.modulespositionedit'; @@ -43,7 +43,7 @@ class ModulesPositioneditField extends FormField * * @return string The field input markup. * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected function getInput() { diff --git a/administrator/components/com_workflow/Model/StagesModel.php b/administrator/components/com_workflow/Model/StagesModel.php index 0768a6235c780..ed694bee8ccf8 100644 --- a/administrator/components/com_workflow/Model/StagesModel.php +++ b/administrator/components/com_workflow/Model/StagesModel.php @@ -191,7 +191,7 @@ public function getListQuery() * * @return object The workflow * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getWorkflow() { diff --git a/administrator/components/com_workflow/Model/TransitionsModel.php b/administrator/components/com_workflow/Model/TransitionsModel.php index 3f5912415e07e..777fe535f2832 100644 --- a/administrator/components/com_workflow/Model/TransitionsModel.php +++ b/administrator/components/com_workflow/Model/TransitionsModel.php @@ -238,7 +238,7 @@ public function getFilterForm($data = array(), $loadData = true) * * @return object The workflow * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getWorkflow() { diff --git a/administrator/components/com_workflow/View/Stages/HtmlView.php b/administrator/components/com_workflow/View/Stages/HtmlView.php index 1f44be6f09b49..7bfb3805e33cc 100644 --- a/administrator/components/com_workflow/View/Stages/HtmlView.php +++ b/administrator/components/com_workflow/View/Stages/HtmlView.php @@ -77,7 +77,7 @@ class HtmlView extends BaseHtmlView * The current workflow * * @var object - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $workflow; diff --git a/administrator/components/com_workflow/View/Transitions/HtmlView.php b/administrator/components/com_workflow/View/Transitions/HtmlView.php index bcb3be576c19e..7c6efd2d05ce9 100644 --- a/administrator/components/com_workflow/View/Transitions/HtmlView.php +++ b/administrator/components/com_workflow/View/Transitions/HtmlView.php @@ -75,7 +75,7 @@ class HtmlView extends BaseHtmlView * The current workflow * * @var object - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $workflow; diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index a7e56a007697e..3c0e391259ea5 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - November 2018 + December 2018 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 3d9576eca7476..b025673ca64ad 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - November 2018 + December 2018 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index adb38b97931ca..979f947820ec6 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2018 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 4.0.0-alpha6-dev - November 2018 + 4.0.0-alpha6 + December 2018 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 8bb8a0d4bb97b..4f2f53e3f71cd 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 4.0.0.1 - November 2018 + December 2018 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index 76fc1dfe10152..b221c511eff7a 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -4,7 +4,7 @@ client="installation"> English (United Kingdom) 4.0.0 - November 2018 + December 2018 Joomla! Project Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 05fb25ec47e01..a81c9f1bb404d 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - November 2018 + December 2018 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 0777295329dfd..8fb50bcf44ac3 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - November 2018 + December 2018 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Form/Field/AccesslevelField.php b/libraries/src/Form/Field/AccesslevelField.php index d505a22d93966..8892ae8fbc75b 100644 --- a/libraries/src/Form/Field/AccesslevelField.php +++ b/libraries/src/Form/Field/AccesslevelField.php @@ -32,7 +32,7 @@ class AccesslevelField extends ListField * Name of the layout being used to render the field * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $layout = 'joomla.form.field.accesslevel'; } diff --git a/libraries/src/Form/Field/ListField.php b/libraries/src/Form/Field/ListField.php index c08b7c3d285c1..4ae875a722d0c 100644 --- a/libraries/src/Form/Field/ListField.php +++ b/libraries/src/Form/Field/ListField.php @@ -40,7 +40,7 @@ class ListField extends FormField * Name of the layout being used to render the field * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $layout = 'joomla.form.field.list'; diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php index 63bf8579c594b..5a13bbf9a1e84 100644 --- a/libraries/src/Form/Field/TagField.php +++ b/libraries/src/Form/Field/TagField.php @@ -51,7 +51,7 @@ class TagField extends ListField * Name of the layout being used to render the field * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $layout = 'joomla.form.field.tag'; @@ -289,7 +289,7 @@ public function allowCustom() * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function isRemoteSearch() { diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php index 823400084e3a4..b7f0a73d7bb34 100644 --- a/libraries/src/MVC/Model/AdminModel.php +++ b/libraries/src/MVC/Model/AdminModel.php @@ -82,7 +82,7 @@ abstract class AdminModel extends FormModel * The event to trigger before changing the published state of the data. * * @var string - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $event_before_change_state = null; diff --git a/libraries/src/Version.php b/libraries/src/Version.php index dfbe84d66918f..8490f0ee059c2 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'alpha6-dev'; + const EXTRA_VERSION = 'alpha7-dev'; /** * Development status. @@ -84,7 +84,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '4-November-2018'; + const RELDATE = '27-December-2018'; /** * Release time. @@ -92,7 +92,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '23:23'; + const RELTIME = '17:58'; /** * Release timezone. diff --git a/libraries/src/Workflow/WorkflowServiceInterface.php b/libraries/src/Workflow/WorkflowServiceInterface.php index cbd3defa8f92a..398b05a0cbd50 100644 --- a/libraries/src/Workflow/WorkflowServiceInterface.php +++ b/libraries/src/Workflow/WorkflowServiceInterface.php @@ -59,7 +59,7 @@ public static function getConditions($extension): array; * * @return string * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getWorkflowTableBySection(string $section = null) : string; } diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php index 1f0492e38a26f..3488881299aba 100644 --- a/plugins/content/joomla/joomla.php +++ b/plugins/content/joomla/joomla.php @@ -36,7 +36,7 @@ class PlgContentJoomla extends CMSPlugin * Database Driver Instance * * @var \Joomla\Database\DatabaseDriver - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ protected $db; @@ -50,7 +50,7 @@ class PlgContentJoomla extends CMSPlugin * * @return void * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function onContentBeforeSave($context, $table, $isNew, $data) { @@ -195,7 +195,7 @@ public function onContentBeforeDelete($context, $data) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function onContentBeforeChangeState($context, $pks, $value) { @@ -304,7 +304,7 @@ private function _canDeleteCategories($data) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ private function _canDeleteWorkflow($pk) { @@ -367,7 +367,7 @@ private function _canDeleteWorkflow($pk) * * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ private function _canDeleteStage($pk) { @@ -463,7 +463,7 @@ private function _countItemsInCategory($table, $catid) * * @return bool * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ private function _countItemsInStage(array $stage_ids, string $extension) : bool { diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index 727bb0d77831a..c116d0595bd35 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -6,7 +6,7 @@ Joomla: Environment Setup Incomplete - +