[5.0] Upmerge 4.4 to 5.0

.appveyor.yml

@@ -54,7 +54,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
@@ -32,7 +32,7 @@ steps:
       - echo $(date)
 
   - name: phan
-    image: joomlaprojects/docker-images:php7.4-ast
+    image: joomlaprojects/docker-images:php8.1-ast
     depends_on: [ phpcs ]
     failure: ignore
     commands:
@@ -95,6 +95,7 @@ steps:
     image: node:current-alpine
     commands:
       - npm run lint:js
+      - npm run lint:testjs
 
   - name: prepare_system_tests
     depends_on:
@@ -104,86 +105,21 @@ steps:
       - name: cypress-cache
         path: /root/.cache/Cypress
     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:systemtests8.1
-    volumes:
-      - name: cypress-cache
-        path: /root/.cache/Cypress
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql mysqli mysql jos_
-
-  - name: phpmax-api-mysql
-    depends_on:
-      - prepare_system_tests
-    image: joomlaprojects/docker-images:systemtests8.2
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax mysqli mysql phpmax_
-
-  - name: phpnext-api-mysql
-    depends_on:
-      - prepare_system_tests
-    image: joomlaprojects/docker-images:systemtests8.2
-    failure: ignore
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - echo "This test is disabled because php next is not stable yet"
-      - exit 1
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext mysqli mysql phpnext_
-
-  - name: phpmin-api-postgres
-    depends_on:
-      - phpmin-api-mysql
-    image: joomlaprojects/docker-images:systemtests8.1
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres pgsql postgres jos_
-
-  - name: phpmax-api-postgres
-    depends_on:
-      - phpmax-api-mysql
-    image: joomlaprojects/docker-images:systemtests8.2
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpmax pgsql postgres phpmax_
-
-  - name: phpnext-api-postgres
-    depends_on:
-      - phpnext-api-mysql
-    image: joomlaprojects/docker-images:systemtests8.2
-    failure: ignore
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - echo "This test is disabled because php next is not stable yet"
-      - exit 1
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext pgsql postgres phpnext_
-
   - name: phpmin-system-mysql
     depends_on:
-      - phpnext-api-mysql
+      - prepare_system_tests
     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)" cmysql mysqli mysql
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysql mysqli mysql
 
   - name: phpmax-system-mysql
     depends_on:
@@ -195,7 +131,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: phpnext-system-mysql
     depends_on:
@@ -210,19 +146,19 @@ steps:
     commands:
       - echo "This test is disabled because php next is not stable yet"
       - exit 1
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql
 
   - name: phpmin-system-postgres
     depends_on:
-      - phpnext-api-postgres
+      - prepare_system_tests
     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)" cpostgres pgsql postgres
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
 
   - name: phpmax-system-postgres
     depends_on:
@@ -234,7 +170,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: phpnext-system-postgres
     depends_on:
@@ -249,39 +185,30 @@ steps:
     commands:
       - echo "This test is disabled because php next is not stable yet"
       - exit 1
-      - bash tests/cypress/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres
 
   - name: artifacts-system-tests
-    image: cschlosser/drone-ftps
+    image: joomlaprojects/docker-images:packager
     depends_on:
       - phpnext-system-mysql
       - phpnext-system-postgres
       - phpmax-system-mysql
       - phpmax-system-postgres
       - phpmin-system-mysql
       - 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
       FTP_PASSWORD:
         from_secret: ftppassword
-      PLUGIN_HOSTNAME: ci.joomla.org:21
-      PLUGIN_SRC_DIR: /tests/cypress/output/
-      PLUGIN_DEST_DIR: /artifacts
-      PLUGIN_SECURE: false
-      PLUGIN_EXCLUDE: ^\.git/$
       GITHUB_TOKEN:
         from_secret: github_token
     commands:
-      - export PLUGIN_DEST_DIR=$PLUGIN_DEST_DIR/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
+      - export PLUGIN_DEST_DIR=/artifacts/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
       - echo https://ci.joomla.org$PLUGIN_DEST_DIR
-      - /bin/upload.sh
+      - 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/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:
@@ -436,6 +363,6 @@ trigger:
 
 ---
 kind: signature
-hmac: aba444991fd9c8f79fa8d477af9bde0ff2d6f9831e3b71d69f55367cfdad2e5b
+hmac: 8cf1bf21cd6ed0fb836683510df6a44fe8b096704593aa2f30478b3d41bb0fdf
 
 ...

.github/CODEOWNERS

@@ -26,12 +26,9 @@ 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
 

.gitignore

@@ -26,13 +26,9 @@
 
 # Test Related Files
 /phpunit.xml
-selenium.log
 composer.phar
 /test-install
 /.phpunit.result.cache
-/tests/Codeception/acceptance.suite.yml
-/tests/Codeception/_output/
-/tests/Codeception/api.suite.yml
 
 
 # Vendor directory handling
@@ -103,10 +99,10 @@ RoboFile.ini
 /media/com_media/css/mediamanager.min.css.map
 
 #cypress
-/tests/cypress/output/screenshots
-!/tests/cypress/output/screenshots/.gitkeep
-/tests/cypress/output/videos
-!/tests/cypress/output/videos/.gitkeep
+/tests/System/output/screenshots
+!/tests/System/output/screenshots/.gitkeep
+/tests/System/output/videos
+!/tests/System/output/videos/.gitkeep
 cypress.config.js
 
 # WebAuthn FIDO metadata cache

administrator/components/com_admin/postinstall/htaccesssetce.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in the default .htaccess file regarding setting the Content-Encoding header.
+ */
+
+// 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 setting the Content-Encoding header
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   4.2.9
+ */
+function admin_postinstall_htaccesssetce_condition()
+{
+    return true;
+}

administrator/components/com_admin/script.php

@@ -537,7 +537,7 @@ protected function updateManifestCaches()
         $extensions = ExtensionHelper::getCoreExtensions();
 
         // If we have the search package around, it may not have a manifest cache entry after upgrades from 3.x, so add it to the list
-        if (File::exists(JPATH_ROOT . '/administrator/manifests/packages/pkg_search.xml')) {
+        if (is_file(JPATH_ROOT . '/administrator/manifests/packages/pkg_search.xml')) {
             $extensions[] = ['package', 'pkg_search', '', 0];
         }
 
@@ -1022,7 +1022,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
         $status['folders_checked'] = $folders;
 
         foreach ($files as $file) {
-            if ($fileExists = File::exists(JPATH_ROOT . $file)) {
+            if ($fileExists = is_file(JPATH_ROOT . $file)) {
                 $status['files_exist'][] = $file;
 
                 if ($dryRun === false) {
@@ -1060,8 +1060,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
          * but an update has put the files back. In that case it exists even if they don't believe in it!
          */
         if (
-            !File::exists(JPATH_ROOT . '/administrator/components/com_search/search.php')
-            && File::exists(JPATH_ROOT . '/administrator/manifests/packages/pkg_search.xml')
+            !is_file(JPATH_ROOT . '/administrator/components/com_search/search.php')
+            && is_file(JPATH_ROOT . '/administrator/manifests/packages/pkg_search.xml')
         ) {
             File::delete(JPATH_ROOT . '/administrator/manifests/packages/pkg_search.xml');
         }

administrator/components/com_banners/src/Service/Html/Banner.php

@@ -104,7 +104,7 @@ public function pinned($value, $i, $enabled = true, $checkbox = 'cb')
             1 => [
                 'sticky_unpublish',
                 'COM_BANNERS_BANNERS_PINNED',
-                'COM_BANNERS_BANNERS_HTML_PIN_BANNER',
+                'COM_BANNERS_BANNERS_HTML_UNPIN_BANNER',
                 'COM_BANNERS_BANNERS_PINNED',
                 true,
                 'publish',
@@ -113,7 +113,7 @@ public function pinned($value, $i, $enabled = true, $checkbox = 'cb')
             0 => [
                 'sticky_publish',
                 'COM_BANNERS_BANNERS_UNPINNED',
-                'COM_BANNERS_BANNERS_HTML_UNPIN_BANNER',
+                'COM_BANNERS_BANNERS_HTML_PIN_BANNER',
                 'COM_BANNERS_BANNERS_UNPINNED',
                 true,
                 'unpublish',

administrator/components/com_banners/tmpl/download/default.php

@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 

administrator/components/com_config/src/Dispatcher/Dispatcher.php

@@ -21,7 +21,7 @@
 /**
  * ComponentDispatcher class for com_config
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.2.9
  */
 class Dispatcher extends ComponentDispatcher
 {
@@ -30,7 +30,7 @@ class Dispatcher extends ComponentDispatcher
      *
      * @return  void
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  4.2.9
      *
      * @throws  \Exception
      */

administrator/components/com_config/src/Field/ConfigComponentsField.php

@@ -11,7 +11,6 @@
 namespace Joomla\Component\Config\Administrator\Field;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
@@ -60,7 +59,7 @@ protected function getOptions()
                 // Load language
                 $extension = $item->value;
 
-                if (File::exists(JPATH_ADMINISTRATOR . '/components/' . $extension . '/config.xml')) {
+                if (is_file(JPATH_ADMINISTRATOR . '/components/' . $extension . '/config.xml')) {
                     $source = JPATH_ADMINISTRATOR . '/components/' . $extension;
                     $lang->load("$extension.sys", JPATH_ADMINISTRATOR)
                     || $lang->load("$extension.sys", $source);

administrator/components/com_config/src/Helper/ConfigHelper.php

@@ -68,7 +68,7 @@ public static function hasComponentConfig($component)
      *
      * @return  boolean
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.2.9
      */
     public static function canChangeComponentConfig(string $component)
     {