Merge tag 'psr12anchor' into psr12/merge/37174

.appveyor.yml

@@ -44,7 +44,7 @@ install:
     - choco install composer
     - cd C:\projects\joomla-cms
     - refreshenv
-    - composer install --no-progress --profile
+    - composer install --no-progress --profile --ignore-platform-req=ext-sodium
 before_test:
 #  Database setup for MySQL via PowerShell tools
   - >

.drone.yml

@@ -12,7 +12,7 @@ steps:
         path: /tmp/composer-cache
     commands:
       - composer validate --no-check-all --strict
-      - composer install --no-progress
+      - composer install --no-progress --no-suggest
 
   - name: phpcs
     image: joomlaprojects/docker-images:php7.2
@@ -23,7 +23,7 @@ steps:
       - echo $(date)
 
   - name: npm
-    image: node:14-alpine
+    image: node:16-alpine
     depends_on: [ phpcs ]
     commands:
       - npm ci --unsafe-perm
@@ -56,13 +56,12 @@ steps:
       - 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: php81-unit
+    depends_on: [ phpcs ]
+    image: joomlaprojects/docker-images:php8.1
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php72-integration
     depends_on: [ npm ]
@@ -88,7 +87,6 @@ steps:
   - name: php80-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.0
-    failure: ignore
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration
@@ -131,7 +129,6 @@ steps:
   - name: php80-integration-pgsql
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.0
-    failure: ignore
     commands:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
@@ -162,9 +159,17 @@ steps:
     commands:
       - npm run lint:js
 
+  - name: prepare_codeception_tests
+    depends_on:
+      - npm
+    image: joomlaprojects/docker-images:systemtests
+    commands:
+      - sed -i 's/tests\\/Codeception\\/_output/\\/drone\\/src\\/tests\\/Codeception\\/_output/' codeception.yml
+      - php libraries/vendor/bin/codecept build
+
   - name: phpmin-api-mysql
     depends_on:
-      - javascript-cs
+      - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
@@ -173,17 +178,16 @@ steps:
 
   - name: phpmax-api-mysql
     depends_on:
-      - phpmin-api-mysql
+      - prepare_codeception_tests
     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
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax
 
 #  - name: phpnext-api-mysql
 #    depends_on:
-#      - phpmin-api-mysql
+#      - phpmax-api-mysql
 #    image: joomlaprojects/docker-images:systemtests8.2
 #    failure: ignore
 #    environment:
@@ -193,15 +197,22 @@ steps:
 
   - name: phpmin-api-postgres
     depends_on:
- #     - phpnext-api-mysql
-      - phpmin-api-mysql
+      - prepare_codeception_tests
     image: joomlaprojects/docker-images:systemtests
-    failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
 
+  - name: phpmax-api-postgres
+    depends_on:
+      - prepare_codeception_tests
+    image: joomlaprojects/docker-images:systemtests8.1
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpmax
+
 #  - name: phpnext-api-postgres
 #    depends_on:
 #      - phpmin-api-postgres
@@ -212,106 +223,95 @@ steps:
 #    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: phpmin-system-mysql
     depends_on:
-      - javascript-cs
+      - phpmax-api-mysql
       - 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)" 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
+      - phpmax-api-mysql
+      - phpmax-api-postgres
     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
+#  - name: phpnext-system-mysql
 #    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
+#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
 
-  - name: phpmax-system-mysql8
+  - name: phpmin-system-postgres
     depends_on:
-#      - phpnext-system-mysql
-      - phpmax-system-mysql
+      - phpmax-api-mysql
+      - phpmax-api-postgres
+    image: joomlaprojects/docker-images:systemtests
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
+
+  - name: phpmax-system-postgres
+    depends_on:
+      - phpmax-api-mysql
+      - phpmax-api-postgres
     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
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax
 
 #  - name: phpnext-system-postgres
 #    depends_on:
-#      - phpmax-system-mysql8
+#      - phpmax-system-postgres
 #    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: phpmin-system-mysql8
-    depends_on: [ phpmax-system-postgres ]
+    depends_on:
+      - phpmax-system-mysql
+      - phpmax-system-postgres
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
 
-  - name: phpmin-system-postgres
-    depends_on: [ phpmin-system-mysql8 ]
-    image: joomlaprojects/docker-images:systemtests
+  - name: phpmax-system-mysql8
+    depends_on:
+      - phpmax-system-mysql
+      - phpmax-system-postgres
+    image: joomlaprojects/docker-images:systemtests8.1
     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)" mysql8phpmax
+
+#  - name: phpnext-system-mysql8
+#    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)" mysql8phpnext
 
   - name: artifacts-system-tests
     image: cschlosser/drone-ftps
@@ -349,9 +349,6 @@ steps:
       status:
         - failure
 
-branches:
-  exclude: [ l10n_* ]
-
 volumes:
   - name: composer-cache
     host:
@@ -414,11 +411,70 @@ steps:
         path: /reference
     when:
       branch:
-        - 4.1-dev
+        - 4.2-dev
+
+---
+kind: pipeline
+name: nightly_build
+
+steps:
+  - name: prepare
+    image: joomlaprojects/docker-images:packager
+    commands:
+      - export MINORVERSION=${DRONE_BRANCH%-*}
+      - composer --version
+      - mkdir -p transfer
+      - date +%s > transfer/$MINORVERSION-time.txt
+      - git rev-parse origin/$MINORVERSION-dev > transfer/$MINORVERSION.txt
+      - php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --exclude-bzip2
+      - mv build/tmp/packages/* transfer/
+
+  - name: upload
+    image: joomlaprojects/docker-images:packager
+    environment:
+      nightly_key:
+        from_secret: nightly_key
+      nightly_user:
+        from_secret: nightly_user
+      nightly_host:
+        from_secret: nightly_host
+      RINGCENTRAL_WEBHOOK:
+        from_secret: notification_url
+    commands:
+      - export MINORVERSION=${DRONE_BRANCH%-*}
+      - mkdir -p ~/.ssh
+      - eval $(ssh-agent -s)
+      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+      - echo "$nightly_key" > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+      - ssh-add
+      - rclone config create nightly sftp host $nightly_host user $nightly_user port 22
+      - rclone delete nightly:/home/devj/public_html/nightlies/ --include "Joomla_$MINORVERSION.*"
+      - rclone delete nightly:/home/devj/public_html/cache/com_content/
+      - rclone copy ./transfer/ nightly:/home/devj/public_html/nightlies/
+      - /bin/notify
+
+  - name: buildfailure
+    image: joomlaprojects/docker-images:packager
+    environment:
+      RINGCENTRAL_WEBHOOK:
+        from_secret: notification_url
+    commands:
+      - /bin/notify
+    when:
+      status:
+        - failure
+
 
+trigger:
+  event:
+    - cron
+    - custom
+  repo:
+    - joomla/joomla-cms
 
 ---
 kind: signature
-hmac: 15e1abb49597a83c250c8785948aa9fa0c6d93ec88b03e45c30d8050b338ea5d
+hmac: d5db8148323f0205a8c0cd165da3934f5a77b25f73862d09ead95d3c42f1df01
 
 ...

.github/CODEOWNERS

@@ -38,12 +38,6 @@ phpunit-pgsql.xml.dist  @rdeutz @hackwar
 # HttpHeaders Plugin
 plugins/system/httpheaders/*  @zero-24
 
-# Web Authentication (WebAuthn)
-plugins/system/webauthn/*   @nikosdion
-media/plg_system_webauthn/*   @nikosdion
-administrator/language/en-GB/plg_system_webauthn.ini   @nikosdion
-administrator/language/en-GB/plg_system_webauthn.sys.ini   @nikosdion
-
 # Workflow
 administrator/components/com_workflow/*	@bembelimen @hleithner
 administrator/language/en-GB/com_workflow.ini	@bembelimen @hleithner
@@ -72,3 +66,6 @@ installation/tmpl/* @chmst
 
 # Translation GitHub Actions
 .github/workflows/create-translation-pull-request-v4.yml @hleithner
+
+# Libraries
+libraries/src/* @laoneo