Merge branch '4.2-dev' into fix_ldap_ssl

.editorconfig

@@ -15,6 +15,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{js,json,scss,css,vue}]
+[*.{js,json,scss,css,yml,vue}]
 indent_style = space
 indent_size = 2

.github/CONTRIBUTING.md

@@ -14,11 +14,12 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-PRs should usually be made to the `4.1-dev` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.2-dev` branch as this contains the most recent version of the code.
 There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
-| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. |
-| 4.1-dev | Branch for the current minor Joomla version. Commits to 3.10-dev will be applied to this branch as well. |
-| 4.2-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.1-dev will be applied to this branch as well. |
+| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
+| 4.2-dev | Branch for the current minor Joomla version.|
+| 4.3-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.2-dev will be applied to this branch as well. |
+| 5.0-dev | Branch for the next major Joomla version. |

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,5 +16,10 @@ Pull Request for Issue # .
 
 
 
-### Documentation Changes Required
+### Link to documentations
+Please select:
+- [ ] Documentation link for docs.joomla.org: <link>
+- [ ] No documentation changes for docs.joomla.org needed
 
+- [ ] Pull Request link for manual.joomla.org: <link>
+- [ ] No documentation changes for manual.joomla.org needed

.github/workflows/cacert-update.yml

@@ -7,8 +7,14 @@ on:
     # Runs on the first day of every month at 03:00
     - cron:  '0 3 1 * *'
 
+permissions:
+  contents: read
+
 jobs:
   build:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     if: (github.event_name == 'schedule' && github.repository == 'joomla/joomla-cms') || (github.event_name != 'schedule')
 
     runs-on: ubuntu-latest

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

@@ -1,75 +1,77 @@
-name: Create translation pull request
-
-on:
-  push:
-    branches: [ translation ]
-
-  workflow_dispatch:
-
-  schedule:
-    # Run daily at 7:26
-    - cron:  '26 7 * * *'
-
+name: Create translation pull request
+
+on:
+  push:
+    branches: [ translation ]
+
+  workflow_dispatch:
+
+  schedule:
+    # Run daily at 7:26
+    - cron:  '27 7 * * *'
+
 permissions:
   contents: read
 
-jobs:
-  build:
+jobs:
+  build:
     permissions:
       contents: write  # for Git to git push
-    runs-on: ubuntu-latest
-    # Only run this action the translation-bot repository in the translation branch
-    if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation' }}
-
-    steps:
-      - uses: actions/checkout@v2
-        # We need the full depth to create / update the pull request against the main repo
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-
-      - name: Fetch latest cms changes
-        run: |
-          git config user.name Translation Bot
-          git config user.email release+translation-bot@joomla.org
-          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.1-dev
-
-      - name: Fetch and extract translations
-        run: |
-          cd ..
-          wget -nv "https://github.com/joomla/core-translations/archive/refs/heads/main.zip"
-          unzip main.zip
-
-      - name: Syncing directories
-        # We use a simple copy paste syntax here if needed customization for different directories
-        run: |
-          cd ..
-          SYNC_VERSION="v4"
-          
-          SYNC_PATH="installation/language/"
-          echo ${SYNC_PATH}
-          rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_${SYNC_VERSION}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH} 
-          
-      - name: Update static error pages
-        run: |
-          npm ci --ignore-scripts && node build/build.js --build-pages
-          
-      - name: Create commit
-        run: |
-          git config user.name Translation Bot
-          git config user.email release+translation-bot@joomla.org
-          git add .
-          git commit -m "Language update"
-          git push --force
-          
-      - name: Create pull request
-        env:
-          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.1-dev
+    runs-on: ubuntu-latest
+    # Only run this action the translation-bot repository in the translation branch
+    if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation' }}
+
+    steps:
+      - uses: actions/checkout@v2
+        # We need the full depth to create / update the pull request against the main repo
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Fetch latest cms changes
+        run: |
+          git config user.name Translation Bot
+          git config user.email release+translation-bot@joomla.org
+          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
+
+      - name: Fetch and extract translations
+        run: |
+          cd ..
+          wget -nv "https://github.com/joomla/core-translations/archive/refs/heads/main.zip"
+          unzip main.zip
+
+      - name: Syncing directories
+        # We use a simple copy paste syntax here if needed customization for different directories
+        run: |
+          cd ..
+          SYNC_VERSION="v4"
+
+          SYNC_PATH="installation/language/"
+          echo ${SYNC_PATH}
+          rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_${SYNC_VERSION}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}
+
+      - name: Update static error pages
+        run: |
+          npm ci --ignore-scripts && node build/build.js --build-pages
+
+      - name: Create commit
+        continue-on-error: true
+        run: |
+          git config user.name Translation Bot
+          git config user.email release+translation-bot@joomla.org
+          git add .
+          git commit -m "Language update"
+          git push --force
+
+      - name: Create pull request
+        if: ${{ success() }}
+        env:
+          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

.gitignore

@@ -101,3 +101,6 @@ RoboFile.ini
 # Media Manager
 /media/com_media/js/mediamanager.min.js.map
 /media/com_media/css/mediamanager.min.css.map
+
+# WebAuthn FIDO metadata cache
+/plugins/system/webauthn/fido.jwt

README.md

@@ -5,7 +5,7 @@ Build Status
 ---------------------
 | Drone-CI      | AppVeyor      | PHP           |  Node         | npm           |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------

administrator/components/com_actionlogs/src/Controller/ActionlogsController.php

@@ -25,6 +25,10 @@
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
 use Joomla\Utilities\ArrayHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Actionlogs list controller class.
  *

administrator/components/com_actionlogs/src/Controller/DisplayController.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\MVC\Controller\BaseController;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Plugins master display controller.
  *

administrator/components/com_actionlogs/src/Field/ExtensionField.php

@@ -15,6 +15,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to load a list of all extensions that have logged actions
  *

administrator/components/com_actionlogs/src/Field/LogcreatorField.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\Form\Field\ListField;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to load a list of all users that have logged actions
  *

administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php

@@ -14,6 +14,10 @@
 use Joomla\CMS\Form\Field\PredefinedlistField;
 use Joomla\CMS\Form\Form;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to show a list of range dates to sort with
  *

administrator/components/com_actionlogs/src/Field/LogtypeField.php

@@ -16,6 +16,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to load a list of all users that have logged actions
  *

administrator/components/com_actionlogs/src/Field/PlugininfoField.php

@@ -15,6 +15,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Information field.
  *

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

@@ -19,6 +19,10 @@
 use Joomla\CMS\Router\Route;
 use Joomla\String\StringHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Actionlogs component helper.
  *

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

@@ -13,6 +13,10 @@
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use stdClass;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Model to interact with the action log configuration.
  *

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

@@ -21,6 +21,10 @@
 use Joomla\Utilities\IpHelper;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Methods supporting a list of Actionlog records.
  *

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

@@ -24,6 +24,10 @@
 use Joomla\Utilities\ArrayHelper;
 use RuntimeException;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Methods supporting a list of article records.
  *

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

@@ -13,6 +13,10 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Abstract Action Log Plugin
  *

administrator/components/com_admin/postinstall/addnosniff.php

@@ -11,7 +11,9 @@
  * in the default .htaccess and web.config files.
  */
 
-
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Notifies users of the add the nosniff headers by applying the changes from the default .htaccess or web.config file

administrator/components/com_admin/postinstall/behindproxy.php

@@ -15,6 +15,10 @@
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Notifies users of the new Behind Load Balancer option in Global Config, if we detect they might be behind a proxy
  *

administrator/components/com_admin/postinstall/htaccesssvg.php

@@ -11,7 +11,9 @@
  * in the default .htaccess file regarding hardening against XSS in SVG's
  */
 
-
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Notifies users of a change in the default .htaccess file regarding hardening against XSS in SVG's

administrator/components/com_admin/postinstall/languageaccess340.php

@@ -13,6 +13,10 @@
 
 use Joomla\CMS\Factory;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Checks if the installation is affected by the issue with content languages access in 3.4.0
  *