Merge branch '5.0-dev' into captcha-event2

Author: Fedik

.git-blame-ignore-revs

@@ -0,0 +1,9 @@
+# Short array syntax change https://github.com/joomla/joomla-cms/pull/39616
+10f250f418851674c2e4104b6b39b9b665496544
+
+# Code style fixes from PHP CS fixer https://github.com/joomla/joomla-cms/pull/39745
+1e7527b60ec42032abe7bfb9c000bacf38f65845
+
+# PSR 12
+dd91072a956a19a43798515239892edd2b49ac7b
+e7f5cc182bb1cd39c7f085d529888ac4fa6fc77e

.github/workflows/create-translation-pull-request-v4.yml

@@ -37,7 +37,7 @@ jobs:
           git remote add upstream https://github.com/joomla/joomla-cms.git
           git fetch upstream
           git checkout --progress --force -B translation refs/remotes/origin/translation
-          git merge upstream/4.2-dev
+          git merge upstream/4.3-dev
 
       - name: Fetch and extract translations
         run: |
@@ -74,4 +74,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
         run: |
           gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
-            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.2-dev
+            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.3-dev

administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php

@@ -155,7 +155,10 @@ public static function loadTranslationFiles($extension)
      *
      * @since   3.9.0
      *
-     * @deprecated  5.0 Use the action log config model instead
+     * @deprecated  4.3 will be removed in 6.0
+     *              Use the action log config model instead
+     *              Example: Factory::getApplication()->bootComponent('actionlogs')->getMVCFactory()
+     *                       ->createModel('ActionlogConfig', 'Administrator')->getLogContentTypeParams($context);
      */
     public static function getLogContentTypeParams($context)
     {
@@ -316,7 +319,7 @@ public static function loadActionLogPluginsLanguage()
             }
 
             $lang->load($extension, JPATH_ADMINISTRATOR)
-            || $lang->load($extension, JPATH_PLUGINS . '/' . $type . '/' . $name);
+                || $lang->load($extension, JPATH_PLUGINS . '/' . $type . '/' . $name);
         }
 
         // Load plg_system_actionlogs too

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -17,6 +17,8 @@
 use Joomla\CMS\Mail\Exception\MailDisabledException;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 use Joomla\Utilities\IpHelper;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
@@ -30,8 +32,10 @@
  *
  * @since  3.9.0
  */
-class ActionlogModel extends BaseDatabaseModel
+class ActionlogModel extends BaseDatabaseModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Function to add logs to the database
      * This method adds a record to #__action_logs contains (message_language_key, message, date, context, user)
@@ -45,9 +49,13 @@ class ActionlogModel extends BaseDatabaseModel
      *
      * @since   3.9.0
      */
-    public function addLog($messages, $messageLanguageKey, $context, $userId = null)
+    public function addLog($messages, $messageLanguageKey, $context, $userId = 0)
     {
-        $user   = Factory::getUser($userId);
+        if (!is_numeric($userId)) {
+            @trigger_error(sprintf('User ID must be an integer in %s.', __METHOD__), E_USER_DEPRECATED);
+        }
+
+        $user   = $userId ? $this->getUserFactory()->loadUserById($userId) : $this->getCurrentUser();
         $db     = $this->getDatabase();
         $date   = Factory::getDate();
         $params = ComponentHelper::getComponent('com_actionlogs')->getParams();

administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php

@@ -64,7 +64,7 @@ abstract class ActionLogPlugin extends CMSPlugin
      */
     protected function addLog($messages, $messageLanguageKey, $context, $userId = null)
     {
-        $user = Factory::getUser();
+        $user = $this->app->getIdentity();
 
         foreach ($messages as $index => $message) {
             if (!\array_key_exists('userid', $message)) {

administrator/components/com_admin/postinstall/behindproxy.php

@@ -9,9 +9,9 @@
  */
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
+use Joomla\Filesystem\File;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 

administrator/components/com_admin/script.php

@@ -20,7 +20,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**

administrator/components/com_admin/src/Extension/AdminComponent.php

@@ -58,7 +58,7 @@ class HelpModel extends BaseDatabaseModel
      * @var    array
      * @since  1.6
      */
-    protected $toc = null;
+    protected $toc = [];
 
     /**
      * URL for the latest version check
@@ -128,7 +128,7 @@ public function getLangTag()
      */
     public function &getToc()
     {
-        if (!\is_null($this->toc)) {
+        if (\count($this->toc)) {
             return $this->toc;
         }
 
@@ -152,8 +152,7 @@ public function &getToc()
         }
 
         // Get Help files
-        $files     = Folder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
-        $this->toc = [];
+        $files = Folder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
 
         foreach ($files as $file) {
             $buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);

administrator/components/com_admin/src/Model/HelpModel.php

@@ -336,7 +336,9 @@ public function &getInfo(): array
      */
     public function phpinfoEnabled(): bool
     {
-        return !\in_array('phpinfo', explode(',', ini_get('disable_functions')));
+        // remove any spaces from the ini value before exploding it
+        $disabledFunctions = str_replace(' ', '', ini_get('disable_functions'));
+        return !\in_array('phpinfo', explode(',', $disabledFunctions));
     }
 
     /**