Skip to content

Commit

Permalink
Merge branch '4.3-dev' of https://github.com/joomla/joomla-cms into 4…
Browse files Browse the repository at this point in the history
….3-dev
  • Loading branch information
obuisard committed Nov 28, 2022
2 parents 9276728 + e1812a9 commit eddd32d
Show file tree
Hide file tree
Showing 42 changed files with 89 additions and 89 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function sticky_publish()
*
* @return string The JSON-encoded amount of published banners
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getQuickiconContent()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public function getModel($name = 'Contact', $prefix = 'Administrator', $config =
*
* @return string The JSON-encoded amount of published contacts
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getQuickiconContent()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function getModel($name = 'Feature', $prefix = 'Administrator', $config =
*
* @return string The JSON-encoded amount of published featured articles
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getQuickiconContent()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function getModel($name = 'Language', $prefix = 'Administrator', $config
*
* @return string The JSON-encoded amount of published languages
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getQuickiconContent()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function getModel($name = 'Newsfeed', $prefix = 'Administrator', $config
*
* @return string The JSON-encoded amount of published newsfeeds
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getQuickiconContent()
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="administrator">
<name>English (en-GB)</name>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>4.3.0-dev</version>
<creationDate>2022-07</creationDate>
<version>4.3.0-alpha2-dev</version>
<creationDate>2022-11</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/packages/pkg_en-GB.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>4.3.0.1</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion api/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion api/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="api">
<name>English (en-GB)</name>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion components/com_tags/src/Helper/RouteHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class RouteHelper extends CMSRouteHelper
* Lookup-table for menu items
*
* @var array
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected static $lookup;

Expand Down
6 changes: 3 additions & 3 deletions components/com_tags/src/Service/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Router extends RouterBase
* Lookup array of the menu items
*
* @var array
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected $lookup = [];

Expand Down Expand Up @@ -74,7 +74,7 @@ public function __construct(SiteApplication $app, AbstractMenu $menu, ?CategoryF
*
* @return array The URL arguments to use to assemble the subsequent URL.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function preprocess($query)
{
Expand Down Expand Up @@ -255,7 +255,7 @@ public function parse(&$segments)
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected function buildLookup()
{
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (United Kingdom)</name>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
36 changes: 18 additions & 18 deletions installation/src/Application/CliInstallationApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/**
* Joomla! Installation Application class.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
final class CliInstallationApplication extends Application implements CMSApplicationInterface
{
Expand All @@ -51,29 +51,29 @@ final class CliInstallationApplication extends Application implements CMSApplica
* The application input object.
*
* @var Input
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public $input;

/**
* The application language object.
*
* @var Language
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected $language;

/**
* @var MVCFactory
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected $mvcFactory;

/**
* Object to imitate the session object
*
* @var Registry
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected $session;

Expand All @@ -91,7 +91,7 @@ final class CliInstallationApplication extends Application implements CMSApplica
* application's client object, otherwise a default client object is created.
* @param Container|null $container Dependency injection container.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function __construct(
?InputInterface $input = null,
Expand Down Expand Up @@ -131,7 +131,7 @@ public function __construct(
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function enqueueMessage($msg, $type = 'info')
{
Expand All @@ -143,7 +143,7 @@ public function enqueueMessage($msg, $type = 'info')
*
* @return Registry
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getConfig()
{
Expand All @@ -155,7 +155,7 @@ public function getConfig()
*
* @return \Joomla\Console\Command\AbstractCommand[]
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected function getDefaultCommands(): array
{
Expand Down Expand Up @@ -184,7 +184,7 @@ public function getInput(): Input
*
* @return Language The language object
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getLanguage()
{
Expand All @@ -196,7 +196,7 @@ public function getLanguage()
*
* @return boolean False on failure, array on success.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getLocalise()
{
Expand All @@ -210,7 +210,7 @@ public function getLocalise()
*
* @return array Array with installed language packs in admin and site area.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getLocaliseAdmin(DatabaseInterface $db = null)
{
Expand Down Expand Up @@ -240,7 +240,7 @@ public function getLocaliseAdmin(DatabaseInterface $db = null)
*
* @return array The system message queue.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getMessageQueue()
{
Expand All @@ -252,7 +252,7 @@ public function getMessageQueue()
*
* @return MVCFactory MVC Factory of the installation application
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getMVCFactory()
{
Expand All @@ -268,7 +268,7 @@ public function getMVCFactory()
*
* @return SessionInterface Object imitating the session object
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function getSession()
{
Expand All @@ -282,7 +282,7 @@ public function getSession()
*
* @return $this
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function setSession(SessionInterface $session): self
{
Expand All @@ -298,7 +298,7 @@ public function setSession(SessionInterface $session): self
*
* @return boolean True if this application is of the given type client interface.
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
public function isClient($identifier)
{
Expand All @@ -312,7 +312,7 @@ public function isClient($identifier)
*
* @return boolean
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
* @deprecated 5.0 Will be removed without replacements
*/
public function isCli()
Expand Down
16 changes: 8 additions & 8 deletions installation/src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
/**
* Console command for installing Joomla
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
class InstallCommand extends AbstractCommand
{
/**
* The default command name
*
* @var string
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected static $defaultName = 'install';

/**
* @var SymfonyStyle
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected $ioStyle;

/**
* @var InputInterface
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected $cliInput;

Expand All @@ -61,7 +61,7 @@ class InstallCommand extends AbstractCommand
*
* @return integer The command exit code
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected function doExecute(InputInterface $input, OutputInterface $output): int
{
Expand Down Expand Up @@ -194,7 +194,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
* @return array Array of configuration options
*
* @throws \Exception
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected function getCLIOptions()
{
Expand Down Expand Up @@ -261,7 +261,7 @@ protected function getCLIOptions()
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected function configure(): void
{
Expand Down Expand Up @@ -331,7 +331,7 @@ protected function configure(): void
* @return string
*
* @throws \Exception
* @since __DEPLOY_VERSION__
* @since 4.3.0
*/
protected function getStringFromOption($option, $question, FormField $field): string
{
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="site">
<name>English (en-GB)</name>
<version>4.3.0</version>
<creationDate>2022-07</creationDate>
<creationDate>2022-11</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
Loading

0 comments on commit eddd32d

Please sign in to comment.