Merge branch '4.1-dev' into font-aw

.appveyor.yml

@@ -30,7 +30,7 @@ services:
 ## Install PHP and composer, and run the appropriate composer command
 install:
     - IF EXIST C:\tools\php (SET PHP=0)
-    # TODO: This is a workaround for https://github.com/chocolatey/choco/issues/1843. Once this is fixed we
+    # @todo: This is a workaround for https://github.com/chocolatey/choco/issues/1843. Once this is fixed we
     #       should go back to latest version in appveyor saving ourselves test time
     - ps: choco upgrade chocolatey -y --version 0.10.13 --allow-downgrade --no-progress
     - ps: >-
@@ -71,7 +71,7 @@ install:
     - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini
     - IF %PHP%==1 echo extension=php_ldap.dll >> php.ini
     - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-    - IF %PHP%==1 php -r "readfile('https://getcomposer.org/composer-1.phar');" > composer.phar
+    - IF %PHP%==1 appveyor-retry appveyor DownloadFile https://getcomposer.org/download/latest-1.x/composer.phar
     - cd C:\projects\joomla-cms
     - appveyor-retry composer install --no-progress --profile
 before_test:

.drone.yml

@@ -53,11 +53,18 @@ steps:
   - name: php80-unit
     depends_on: [ phpcs ]
     image: joomlaprojects/docker-images:php8.0
-    failure: ignore
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
+#  - name: php81-unit
+#    depends_on: [ phpcs ]
+#    image: joomlaprojects/docker-images:php8.1
+#    failure: ignore
+#    commands:
+#      - php -v
+#      - ./libraries/vendor/bin/phpunit --testsuite Unit
+
   - name: php72-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php7.2
@@ -87,6 +94,20 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration
 
+  - name: php81-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.1
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
+  - name: php82-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
   - name: php72-integration-pgsql
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php7.2
@@ -116,6 +137,20 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
 
+  - name: php81-integration-pgsql
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.1
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
+  - name: php82-integration-pgsql
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
   - name: scss-cs
     depends_on: [ npm ]
     image: node:current-alpine
@@ -128,41 +163,175 @@ steps:
     commands:
       - npm run lint:js
 
-  - name: system-tests-mysql
-    depends_on: [ javascript-cs ]
+  - name: phpmin-api-mysql
+    depends_on:
+      - javascript-cs
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql
 
-  - name: system-tests-mysql8
-    depends_on: [ system-tests-mysql ]
+  - name: phpmax-api-mysql
+    depends_on:
+      - phpmin-api-mysql
+    image: joomlaprojects/docker-images:systemtests8.1
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql
+
+#  - name: phpnext-api-mysql
+#    depends_on:
+#      - phpmin-api-mysql
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext
+
+  - name: phpmin-api-postgres
+    depends_on:
+ #     - phpnext-api-mysql
+      - phpmin-api-mysql
     image: joomlaprojects/docker-images:systemtests
+    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
+
+#  - name: phpnext-api-postgres
+#    depends_on:
+#      - phpmin-api-postgres
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext
+
+  - name: phpmax-api-postgres
+    depends_on:
+#      - phpnext-api-postgres
+      - phpmin-api-postgres
+    image: joomlaprojects/docker-images:systemtests8.1
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
 
-  - name: system-tests-postgres
-    depends_on: [ system-tests-mysql8 ]
+  - name: phpmin-system-mysql
+    depends_on:
+      - javascript-cs
+      - phpmax-api-postgres
     image: joomlaprojects/docker-images:systemtests
+    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
+
+#  - name: phpnext-system-mysql
+#    depends_on:
+#      - phpmin-system-mysql
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
+
+  - name: phpmax-system-mysql
+    depends_on:
+#      - phpnext-system-mysql
+      - phpmin-system-mysql
+    image: joomlaprojects/docker-images:systemtests8.1
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax
+
+#  - name: phpnext-system-mysql8
+#    depends_on:
+#      - phpmax-system-mysql
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
+
+  - name: phpmax-system-mysql8
+    depends_on:
+#      - phpnext-system-mysql
+      - phpmax-system-mysql
+    image: joomlaprojects/docker-images:systemtests8.1
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax
+
+#  - name: phpnext-system-postgres
+#    depends_on:
+#      - phpmax-system-mysql8
+#    image: joomlaprojects/docker-images:systemtests8.2
+#    failure: ignore
+#    environment:
+#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+#    commands:
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext
+
+  - name: phpmax-system-postgres
+    depends_on:
+#      - phpnext-system-mysql8
+      - phpmax-system-mysql8
+    image: joomlaprojects/docker-images:systemtests8.1
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax
 
-  - name: api-tests
-    depends_on: [ system-tests-postgres ]
+  - name: phpmin-system-mysql8
+    depends_on: [ phpmax-system-postgres ]
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)"
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
+
+  - name: phpmin-system-postgres
+    depends_on: [ phpmin-system-mysql8 ]
+    image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
 
   - name: artifacts-system-tests
     image: cschlosser/drone-ftps
-    depends_on: [ api-tests ]
+    depends_on:
+#      - phpnext-system-mysql
+#      - phpnext-system-mysql8
+#      - phpnext-system-postgres
+      - phpmax-system-mysql
+      - phpmax-system-mysql8
+      - phpmax-system-postgres
+      - phpmin-system-mysql
+      - phpmin-system-mysql8
+      - phpmin-system-postgres
+#      - phpnext-api-mysql
+#      - phpnext-api-postgres
+      - phpmax-api-mysql
+      - phpmax-api-postgres
+      - phpmin-api-mysql
+      - phpmin-api-postgres
     environment:
       FTP_USERNAME:
         from_secret: ftpusername
@@ -181,31 +350,13 @@ steps:
       status:
         - failure
 
-  - name: analysis4x
-    image: rips/rips-cli:3.2.2
-    depends_on: [ api-tests ]
-    when:
-      repo:
-        - joomla/joomla-cms
-      branch:
-        - 4.0-dev
-    commands:
-      - export RIPS_BASE_URI='https://api.rips.joomla.org'
-      - rips-cli rips:list --table=scans --parameter filter='{"__and":[{"__lessThan":{"percent":100}}]}'
-      - rips-cli rips:scan:start --progress --application=2 --threshold=0 --path=$(pwd) --remove-code --remove-upload --tag=$DRONE_REPO_NAMESPACE-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; }
-    environment:
-      RIPS_EMAIL:
-        from_secret: RIPS_EMAIL
-      RIPS_PASSWORD:
-        from_secret: RIPS_PASSWORD
-
 branches:
   exclude: [ l10n_* ]
 
 volumes:
-- name: composer-cache
-  host:
-    path: /tmp/composer-cache
+  - name: composer-cache
+    host:
+      path: /tmp/composer-cache
 
 services:
   - name: mysql
@@ -264,11 +415,11 @@ steps:
         path: /reference
     when:
       branch:
-        - 4.0-dev
+        - 4.1-dev
 
 
 ---
 kind: signature
-hmac: f99784b6fd6bf3707a600f262bb9e59aa7b5f97e54df8976e459096de4344ef3
+hmac: a6f3f2ed21261b612d052724e5f43a5dd55168f98cbaa48eeaa358816bb255df
 
 ...

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig is awesome: http://EditorConfig.org
+# EditorConfig is awesome: https://EditorConfig.org
 
 # top-most EditorConfig file
 root = true

.github/CODEOWNERS

@@ -17,7 +17,7 @@ plugins/finder/*  @hackwar
 plugins/editors/codemirror/*  @okonomiyaki3000
 
 # Statistics Server
-plugins/system/stats/*  @mbabker @wilsonge
+plugins/system/stats/*  @wilsonge
 
 # Release Tools
 build.xml  @wilsonge
@@ -45,8 +45,6 @@ RoboFile.php  @rdeutz @hackwar
 
 # CSP Tooling
 plugins/system/httpheaders/*  @zero-24
-administrator/components/com_csp/* @zero-24
-components/com_csp/* @zero-24
 
 # Web Authentication (WebAuthn)
 plugins/system/webauthn/*   @nikosdion
@@ -68,3 +66,14 @@ libraries/src/MVC/Model/Workflow*	@bembelimen @hleithner
 libraries/src/Workflow/*	@bembelimen @hleithner
 build/media_source/com_workflow/*	@bembelimen @hleithner
 plugins/workflow/*	@bembelimen @hleithner
+
+# Joomla! Accessibility Team
+administrator/*/components/*/tmpl/* @chmst
+administrator/*/modules/*/tmpl/* @chmst
+administrator/templates/atum/* @chmst
+components/*/tmpl/* @chmst
+modules/*/tmpl/* @chmst
+plugins/*/tmpl/* @chmst
+templates/cassiopeia/* @chmst
+layouts/* @chmst
+installation/tmpl/* @chmst

.github/CONTRIBUTING.md

@@ -6,19 +6,19 @@ You are welcome to submit a contribution for review and possible inclusion in th
 
 2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
 
-3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. 
+3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible.
 If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
 
 4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
 
 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 `staging` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.0-dev` branch as this contains the most recent version of the code.
 There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
-| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. |
-| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
-| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |
+| 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.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. |
+| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. |

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,11 +8,11 @@ Pull Request for Issue # .
 
 
 
-### Expected result
+### Actual result BEFORE applying this Pull Request
 
 
 
-### Actual result
+### Expected result AFTER applying this Pull Request