Merge branch '4.4-dev' into patch-1

.appveyor.yml

@@ -52,7 +52,7 @@ services:
 before_test:
 #  Run openldap docker image
   - ps: docker pull bitnami/openldap:2.6.3
-  - ps: docker run --rm --name openldap --publish 1389:1389 --publish 1636:1636 -v ${pwd}\tests\Codeception\_data\certs:/certificates --env LDAP_ADMIN_USERNAME=admin --env LDAP_ADMIN_PASSWORD=adminpassword --env LDAP_USERS=customuser --env LDAP_PASSWORDS=custompassword --env LDAP_ENABLE_TLS=yes --env LDAP_TLS_CERT_FILE=/certificates/openldap.crt --env LDAP_TLS_KEY_FILE=/certificates/openldap.key --env LDAP_TLS_CA_FILE=/certificates/CA.crt --env BITNAMI_DEBUG=true --env LDAP_CONFIG_ADMIN_ENABLED=yes --env LDAP_CONFIG_ADMIN_USERNAME=admin --env LDAP_CONFIG_ADMIN_PASSWORD=configpassword -d bitnami/openldap:2.6.3
+  - ps: docker run --rm --name openldap --publish 1389:1389 --publish 1636:1636 -v ${pwd}\tests\certs:/certificates --env LDAP_ADMIN_USERNAME=admin --env LDAP_ADMIN_PASSWORD=adminpassword --env LDAP_USERS=customuser --env LDAP_PASSWORDS=custompassword --env LDAP_ENABLE_TLS=yes --env LDAP_TLS_CERT_FILE=/certificates/openldap.crt --env LDAP_TLS_KEY_FILE=/certificates/openldap.key --env LDAP_TLS_CA_FILE=/certificates/CA.crt --env BITNAMI_DEBUG=true --env LDAP_CONFIG_ADMIN_ENABLED=yes --env LDAP_CONFIG_ADMIN_USERNAME=admin --env LDAP_CONFIG_ADMIN_PASSWORD=configpassword -d bitnami/openldap:2.6.3
 #  Database setup for MySQL via PowerShell tools
   - >
     "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;"

.drone.yml

@@ -11,7 +11,7 @@ steps:
       - name: certificates
         path: /certificates
     commands:
-      - cp -v tests/Codeception/_data/certs/* /certificates/
+      - cp -v tests/certs/* /certificates/
 
   - name: composer
     image: joomlaprojects/docker-images:php8.2
@@ -39,7 +39,7 @@ steps:
       - ./libraries/vendor/bin/phan
 
   - name: npm
-    image: node:16-bullseye-slim
+    image: node:18-bullseye-slim
     depends_on: [ phpcs ]
     volumes:
       - name: npm-cache
@@ -84,6 +84,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
+  - name: php82-unit
+    depends_on: [ phpcs ]
+    image: joomlaprojects/docker-images:php8.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
+
   - name: php72-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php7.2
@@ -179,6 +186,7 @@ steps:
     image: node:current-alpine
     commands:
       - npm run lint:js
+      - npm run lint:testjs
 
   - name: prepare_system_tests
     depends_on:
@@ -187,76 +195,36 @@ steps:
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
+    environment:
+      CYPRESS_VERIFY_TIMEOUT: 100000
     commands:
-      - sed -i 's/tests\\/Codeception\\/_output/\\/drone\\/src\\/tests\\/cypress\\/output/' codeception.yml
       - mv cypress.config.dist.js cypress.config.js
-      - php libraries/vendor/bin/codecept build
       - npx cypress install
       - npx cypress verify
 
-  - name: phpmin-api-mysql
-    depends_on:
-      - prepare_system_tests
-    image: joomlaprojects/docker-images:systemtests
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql mysqli mysql jos_
-
-  - name: phpmin-api-postgres
-    depends_on:
-      - prepare_system_tests
-    image: joomlaprojects/docker-images:systemtests
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres pgsql postgres jos_
-
-  - name: phpmax-api-mysql
-    depends_on:
-      - phpmin-api-mysql
-      - phpmin-api-postgres
-    image: joomlaprojects/docker-images:systemtests8.1
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax mysqli mysql phpmax_
-
-  - name: phpmax-api-postgres
-    depends_on:
-      - phpmin-api-mysql
-      - phpmin-api-postgres
-    image: joomlaprojects/docker-images:systemtests8.1
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpmax pgsql postgres phpmax_
-
   - name: phpmin-system-mysql
     depends_on:
-      - phpmax-api-mysql
-      - phpmax-api-postgres
+      - prepare_system_tests
     image: joomlaprojects/docker-images:cypress
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cmysql mysqli mysql
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysql mysqli mysql
 
   - name: phpmin-system-postgres
     depends_on:
-      - phpmax-api-mysql
-      - phpmax-api-postgres
+      - prepare_system_tests
     image: joomlaprojects/docker-images:cypress
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
 
   - name: phpmax-system-mysql
     depends_on:
@@ -269,7 +237,7 @@ steps:
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
 
   - name: phpmax-system-postgres
     depends_on:
@@ -282,7 +250,7 @@ steps:
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
 
   - name: phpmin-system-mysql8
     depends_on:
@@ -295,19 +263,20 @@ steps:
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cmysql8 mysqli mysql8
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysql8 mysqli mysql8
 
   - name: phpmax-system-mysql8
     depends_on:
-      - phpmin-system-mysql8
+      - phpmax-system-mysql
+      - phpmax-system-postgres
     image: joomlaprojects/docker-images:cypress8.1
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cmysql8max mysqli mysql8
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysql8max mysqli mysql8
 
   - name: artifacts-system-tests
     image: joomlaprojects/docker-images:packager
@@ -318,10 +287,6 @@ steps:
       - phpmin-system-mysql
       - phpmin-system-mysql8
       - phpmin-system-postgres
-      - phpmax-api-mysql
-      - phpmax-api-postgres
-      - phpmin-api-mysql
-      - phpmin-api-postgres
     environment:
       FTP_USERNAME:
         from_secret: ftpusername
@@ -334,7 +299,7 @@ steps:
       - echo https://ci.joomla.org$PLUGIN_DEST_DIR
       - rclone config create artifacts ftp host ci.joomla.org user $FTP_USERNAME port 21 pass $FTP_PASSWORD
       - rclone mkdir artifacts:$PLUGIN_DEST_DIR
-      - rclone copy tests/cypress/output/ artifacts:$PLUGIN_DEST_DIR
+      - rclone copy tests/System/output/ artifacts:$PLUGIN_DEST_DIR
       - 'curl -X POST "https://api.github.com/repos/$DRONE_REPO/statuses/$DRONE_COMMIT" -H "Content-Type: application/json" -H "Authorization: token $GITHUB_TOKEN" -d "{\"state\":\"failure\", \"context\": \"Artifacts from Failure\", \"description\": \"You can find artifacts from the failure of the build here:\", \"target_url\": \"https://ci.joomla.org$PLUGIN_DEST_DIR\"}" > /dev/null'
     when:
       status:
@@ -411,29 +376,39 @@ steps:
   - name: packager
     image: joomlaprojects/docker-images:packager
     environment:
-      FTP_USERNAME:
-        from_secret: ftpusername
-      FTP_PASSWORD:
-        from_secret: ftppassword
-      FTP_HOSTNAME: ci.joomla.org
-      FTP_PORT: "21"
-      FTP_DEST_DIR: /artifacts
-      FTP_VERIFY: "false"
-      FTP_SECURE: "true"
-      HTTP_ROOT: "https://ci.joomla.org/artifacts"
+      HTTP_ROOT: "https://artifacts.joomla.org/drone"
       DRONE_PULL_REQUEST: DRONE_PULL_REQUEST
       DRONE_COMMIT: DRONE_COMMIT
+    commands:
+      - /bin/drone_build.sh
+
+  - name: upload
+    image: joomlaprojects/docker-images:packager
+    environment:
+      package_key:
+        from_secret: package_key
+      package_user:
+        from_secret: package_user
+      package_host:
+        from_secret: package_host
+      package_root:
+        from_secret: package_root
       GITHUB_TOKEN:
         from_secret: github_token
     commands:
-      - if [ $DRONE_REPO_NAME != 'joomla-cms' ]; then echo "The packager only runs on the joomla/joomla-cms repo"; exit 0; fi
-      - /bin/drone_build.sh
-    volumes:
-      - name: reference
-        path: /reference
-    when:
-      branch:
-        - 4.3-dev
+      - mkdir -p ~/.ssh
+      - eval $(ssh-agent -s)
+      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+      - echo "$package_key" > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+      - ssh-add
+      - rclone config create package sftp host $package_host user $package_user port 22
+      - rclone copy ./upload/ package:$package_root/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/downloads/$DRONE_BUILD_NUMBER
+      - /bin/add_github_status.sh "Download" "Prebuilt packages are available for download." "https://artifacts.joomla.org/drone/${DRONE_REPO}/${DRONE_BRANCH}/${DRONE_PULL_REQUEST}/downloads/${DRONE_BUILD_NUMBER}"
+
+trigger:
+  repo:
+    - joomla/joomla-cms
 
 ---
 kind: pipeline
@@ -460,8 +435,8 @@ steps:
         from_secret: nightly_user
       nightly_host:
         from_secret: nightly_host
-      RINGCENTRAL_WEBHOOK:
-        from_secret: notification_url
+      MATTERMOST_NIGHTLY_HOOK:
+        from_secret: mattermost_nightly_hook
     commands:
       - export MINORVERSION=${DRONE_BRANCH%-*}
       - mkdir -p ~/.ssh
@@ -474,20 +449,19 @@ steps:
       - 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
+      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 4.4](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
 
   - name: buildfailure
     image: joomlaprojects/docker-images:packager
     environment:
-      RINGCENTRAL_WEBHOOK:
-        from_secret: notification_url
+      MATTERMOST_NIGHTLY_HOOK:
+        from_secret: mattermost_nightly_hook
     commands:
-      - /bin/notify
+      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 4.4](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
     when:
       status:
         - failure
 
-
 trigger:
   event:
     - cron
@@ -497,6 +471,6 @@ trigger:
 
 ---
 kind: signature
-hmac: c9d665d46d44aaa66798ce2e9bf7122e7824ba6dd5ebe4a4e7aff05e4e7c7816
+hmac: aba8f50a67f4c8a11e5e179dd2313fdd9a884111f594e21a6b921daa60133534
 
 ...

.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/CODEOWNERS

@@ -1,11 +1,3 @@
-# Custom Fields
-administrator/components/com_fields/*  @laoneo
-components/com_fields/*  @laoneo
-plugins/content/fields/*  @laoneo
-plugins/editors-xtd/fields/*  @laoneo
-plugins/fields/*  @laoneo
-plugins/systems/fields/*  @laoneo
-
 # Smart Search
 administrator/components/com_finder/*  @hackwar
 components/com_finder/*  @hackwar
@@ -14,26 +6,23 @@ plugins/content/finder/*  @hackwar
 plugins/finder/*  @hackwar
 
 # Release Tools
-build.xml  @wilsonge
-build/build.php  @rdeutz @wilsonge
-build/bump.php  @rdeutz @wilsonge
-build/deleted_file_check.php  @rdeutz @wilsonge
+build.xml  @fancyFranci
+build/build.php  @rdeutz
+build/bump.php  @rdeutz
+build/deleted_file_check.php  @rdeutz
 
 # Core/Extension Install/Update Tools
 administrator/components/com_joomlaupdate/*  @rdeutz @zero-24
 libraries/src/Installer/*  @rdeutz @zero-24
 libraries/src/Updater/*  @rdeutz @zero-24
 
 # Automated Testing
-tests/*  @hackwar
-tests/Codeception/*  @rdeutz
-tests/javascript/*  @rdeutz
-tests/Unit/*  @rdeutz
-.appveyor.yml  @rdeutz @hackwar
-.drone.yml  @rdeutz @hackwar
-codeception.yml  @rdeutz @hackwar
-phpunit.xml.dist  @rdeutz @hackwar
-phpunit-pgsql.xml.dist  @rdeutz @hackwar
+tests/*  @hackwar @fancyFranci
+tests/Unit/*  @rdeutz @fancyFranci
+.appveyor.yml  @rdeutz @hackwar @fancyFranci
+.drone.yml  @rdeutz @hackwar @fancyFranci
+phpunit.xml.dist  @rdeutz @hackwar @fancyFranci
+phpunit-pgsql.xml.dist  @rdeutz @hackwar @fancyFranci
 
 # HttpHeaders Plugin
 plugins/system/httpheaders/*  @zero-24

.github/CONTRIBUTING.md

@@ -14,12 +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.2-dev` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.3-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 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. |
+| 4.3-dev | Branch for the current minor Joomla version.|
+| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
+| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |

.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