Merge branch '4.3-dev' into activate_send_email

joomla · Jan 26, 2023 · 85fb799 · 85fb799
2 parents 31b6734 + c720afa
commit 85fb799
Show file tree

Hide file tree

Showing 61 changed files with 395 additions and 269 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -31,86 +31,46 @@
 
 // Only index the files in /libraries and no deeper, to prevent /libraries/vendor being indexed
 $topFilesFinder = PhpCsFixer\Finder::create()
-	->in(
-		[
-			__DIR__ . '/libraries'
-		]
-	)
-	->files()
-	->depth(0);
+    ->in(
+        [
+            __DIR__ . '/libraries'
+        ]
+    )
+    ->files()
+    ->depth(0);
 
 // Add all the core Joomla folders and append to this list the files indexed above from /libraries
 $mainFinder = PhpCsFixer\Finder::create()
-	->in(
-		[
-			__DIR__ . '/administrator',
-			__DIR__ . '/api',
-			__DIR__ . '/build',
-			__DIR__ . '/cache',
-			__DIR__ . '/cli',
-			__DIR__ . '/components',
-			__DIR__ . '/includes',
-			__DIR__ . '/installation',
-			__DIR__ . '/language',
-			__DIR__ . '/libraries/src',
-			__DIR__ . '/modules',
-			__DIR__ . '/plugins',
-			__DIR__ . '/templates',
-			__DIR__ . '/tests',
-			__DIR__ . '/layouts',
-		]
-	)
-	->append($topFilesFinder);
+    ->in(
+        [
+            __DIR__ . '/administrator',
+            __DIR__ . '/api',
+            __DIR__ . '/build',
+            __DIR__ . '/cache',
+            __DIR__ . '/cli',
+            __DIR__ . '/components',
+            __DIR__ . '/includes',
+            __DIR__ . '/installation',
+            __DIR__ . '/language',
+            __DIR__ . '/libraries/src',
+            __DIR__ . '/modules',
+            __DIR__ . '/plugins',
+            __DIR__ . '/templates',
+            __DIR__ . '/tests',
+            __DIR__ . '/layouts',
+        ]
+    )
+    ->append($topFilesFinder);
 
 $config = new PhpCsFixer\Config();
 $config
-	->setRiskyAllowed(true)
-	->setIndent("\t")
-	->setRules(
-		[
-			// psr-1
-			'encoding'                              => true,
-			// psr-2
-			'elseif'                                => true,
-			'single_blank_line_at_eof'              => true,
-			'no_spaces_after_function_name'         => true,
-			'blank_line_after_namespace'            => true,
-			'line_ending'                           => true,
-			'constant_case'                         => ['case' => 'lower'],
-			'lowercase_keywords'                    => true,
-			'method_argument_space'                 => true,
-			'single_import_per_statement'           => true,
-			'no_spaces_inside_parenthesis'          => true,
-			'single_line_after_imports'             => true,
-			'no_trailing_whitespace'                => true,
-			// symfony
-			'no_whitespace_before_comma_in_array'   => true,
-			'whitespace_after_comma_in_array'       => true,
-			'no_empty_statement'                    => true,
-			'simplified_null_return'                => true,
-			'no_extra_blank_lines'                  => true,
-			'function_typehint_space'               => true,
-			'include'                               => true,
-			'no_alias_functions'                    => true,
-			'no_trailing_comma_in_list_call'        => true,
-			'trailing_comma_in_multiline'           => ['elements' => ['arrays']],
-			'no_blank_lines_after_class_opening'    => true,
-			'phpdoc_trim'                           => true,
-			'blank_line_before_statement'           => ['statements' => ['return']],
-			'no_trailing_comma_in_singleline_array' => true,
-			'single_blank_line_before_namespace'    => true,
-			'cast_spaces'                           => true,
-			'no_unused_imports'                     => true,
-			'no_whitespace_in_blank_line'           => true,
-			// contrib
-			'concat_space'                          => ['spacing' => 'one'],
-			/**
-			 * PHP 7+ zend_try_compile_special_func compiles certain PHP Functions to opcode which is faster
-			 * @see https://github.com/php/php-src/blob/9dc947522186766db4a7e2d603703a2250797577/Zend/zend_compile.c#L4192
-			 */
-			'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true],
-		]
-	)
-	->setFinder($mainFinder);
+    ->setRiskyAllowed(true)
+    ->setRules(
+        [
+            '@PSR12' => true,
+            'array_syntax' => ['syntax' => 'short'],
+        ]
+    )
+    ->setFinder($mainFinder);
 
 return $config;
diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php
@@ -193,7 +193,7 @@ class Query
      * The dates Registry.
      *
      * @var    Registry
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $dates;
 

diff --git a/administrator/components/com_finder/src/Indexer/Token.php b/administrator/components/com_finder/src/Indexer/Token.php
@@ -120,7 +120,7 @@ class Token
      * The token required flag
      *
      * @var    boolean
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $required;
 

diff --git a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
@@ -18,15 +18,15 @@
 /**
  * MenuItem by Component field.
  *
- * @since __DEPLOY_VERSION__
+ * @since 4.3.0
  */
 class MenuItemByComponentField extends ListField
 {
     /**
      * The form field type.
      *
      * @var     string
-     * @since   __DEPLOY_VERSION__
+     * @since   4.3.0
      */
     protected $type = 'MenuItemByComponent';
 
@@ -35,7 +35,7 @@ class MenuItemByComponentField extends ListField
      *
      * @return    array  An array of JHtml options.
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.3.0
      */
     protected function getOptions()
     {

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.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>4.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</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) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.3.0-alpha3-dev</version>
-	<creationDate>2022-12</creationDate>
+	<version>4.3.0-alpha4-dev</version>
+	<creationDate>2023-01</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.3.0.1</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>4.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>4.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
@@ -53,7 +53,7 @@ class SearchModel extends ListModel
      *
      * @var string[]
      *
-     * @since __DEPLOY_VERSION__
+     * @since 4.3.0
      */
     protected $sortOrderFieldsLabels = [
         'relevance.asc' => 'COM_FINDER_SORT_BY_RELEVANCE_ASC',
@@ -326,7 +326,7 @@ protected function getListQuery()
      *
      * @throws  \Exception
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.3.0
      */
     public function getSortOrderFields()
     {
@@ -377,7 +377,7 @@ public function getSortOrderFields()
      *
      * @throws  \Exception
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.3.0
      */
     protected function getSortField(string $value, string $direction, Uri $queryUri)
     {

diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>4.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</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>

diff --git a/installation/src/Response/JsonResponse.php b/installation/src/Response/JsonResponse.php
@@ -29,55 +29,55 @@ class JsonResponse
      * The security token.
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $token;
 
     /**
      * The language tag
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $lang;
 
     /**
      * The message
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $message;
 
     /**
      * The messages array
      *
      * @var    array
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $messages;
 
     /**
      * The error message
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $error;
 
     /**
      * The header
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $header;
 
     /**
      * The data
      *
      * @var    mixed
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $data;
 

diff --git a/language/en-GB/com_content.ini b/language/en-GB/com_content.ini
@@ -82,6 +82,7 @@ COM_CONTENT_RATINGS_COUNT="Rating: %s"
 COM_CONTENT_READ_MORE="Read more &hellip;"
 COM_CONTENT_READ_MORE_TITLE="Read more: %s"
 COM_CONTENT_REGISTER_TO_READ_MORE="Register to read more &hellip;"
+COM_CONTENT_RUN_TRANSITION="Run Transition"
 COM_CONTENT_SAVE_SUCCESS="Article saved."
 COM_CONTENT_SAVE_WARNING="Alias already existed so a number was added at the end. If you want to change the alias, please contact a site administrator"
 COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
@@ -92,4 +93,5 @@ COM_CONTENT_TRANSITION="Transition"
 COM_CONTENT_VOTES="Vote"
 COM_CONTENT_VOTES_COUNT="Vote: %s"
 COM_CONTENT_WORKFLOW="Workflow"
+COM_CONTENT_WORKFLOW_STAGE="Workflow Stage"
 COM_CONTENT_WRITTEN_BY="Written by: %s"
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.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>4.3.0</version>
-	<creationDate>2022-12</creationDate>
+	<creationDate>2023-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/libraries/namespacemap.php b/libraries/namespacemap.php
@@ -255,7 +255,7 @@ private function getNamespaces(string $type): array
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.3.0
      */
     private function getExtensions(string $type): array
     {

diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
@@ -41,7 +41,7 @@ abstract class WebApplication extends AbstractWebApplication
      * The application component title.
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $JComponentTitle;
 

diff --git a/libraries/src/Cache/CacheStorage.php b/libraries/src/Cache/CacheStorage.php
@@ -82,7 +82,7 @@ class CacheStorage
      * The threshold
      *
      * @var    integer
-     * @since  __DEPLOY_VERSION__
+     * @since  4.3.0
      */
     public $_threshold;