Merge remote-tracking branch 'upstream/5.0-dev' into userdel/5.0-dev

.appveyor.yml

@@ -8,7 +8,8 @@ clone_folder: C:\projects\joomla-cms
 environment:
   PHPBuild: "x64"
   matrix:
-  - php_ver_target: 8.0
+  - php_ver_target: 8.1
+
 
 init:
   - SET PATH=C:\Tools\php;%PATH%
@@ -40,7 +41,8 @@ install:
     - choco install composer
     - cd C:\projects\joomla-cms
     - refreshenv
-    - composer install --no-progress --profile --ignore-platform-req=ext-sodium
+    - echo "TODO Ignore platform reqs till all composer dependencies are compatible with php 8.1"
+    - composer install --no-progress --profile --ignore-platform-req=ext-sodium --ignore-platform-reqs
 
 hosts:
   openldap: 127.0.0.1

.drone.yml

@@ -20,7 +20,7 @@ steps:
         path: /tmp/composer-cache
     commands:
       - composer validate --no-check-all --strict
-      - composer install --no-progress --no-suggest
+      - composer install --no-progress --ignore-platform-reqs
 
   - name: phpcs
     image: joomlaprojects/docker-images:php8.1
@@ -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:
@@ -49,69 +49,13 @@ steps:
     commands:
       - npm ci --unsafe-perm
 
-  - name: php72-unit
-    depends_on: [ phpcs ]
-    image: joomlaprojects/docker-images:php7.2
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Unit
-
-  - name: php73-unit
-    depends_on: [ phpcs ]
-    image: joomlaprojects/docker-images:php7.3
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Unit
-
-  - name: php74-unit
-    depends_on: [ phpcs ]
-    image: joomlaprojects/docker-images:php7.4
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Unit
-
-  - name: php80-unit
-    depends_on: [ phpcs ]
-    image: joomlaprojects/docker-images:php8.0
-    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 ]
-    image: joomlaprojects/docker-images:php7.2
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration
-
-  - name: php73-integration
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php7.3
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration
-
-  - name: php74-integration
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php7.4
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration
-
-  - name: php80-integration
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php8.0
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration
-
   - name: php81-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.1
@@ -126,34 +70,6 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration
 
-  - name: php72-integration-pgsql
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php7.2
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
-
-  - name: php73-integration-pgsql
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php7.3
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
-
-  - name: php74-integration-pgsql
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php7.4
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
-
-  - name: php80-integration-pgsql
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:php8.0
-    commands:
-      - 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
@@ -184,7 +100,7 @@ steps:
   - name: prepare_system_tests
     depends_on:
       - npm
-    image: joomlaprojects/docker-images:systemtests
+    image: joomlaprojects/docker-images:systemtests8.1
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
@@ -196,7 +112,7 @@ steps:
   - name: phpmin-system-mysql
     depends_on:
       - prepare_system_tests
-    image: joomlaprojects/docker-images:cypress
+    image: joomlaprojects/docker-images:cypress8.1
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
@@ -205,78 +121,80 @@ steps:
     commands:
       - bash tests/System/drone-system-run.sh "$(pwd)" cmysql mysqli mysql
 
-  - name: phpmin-system-postgres
+  - name: phpmax-system-mysql
     depends_on:
-      - prepare_system_tests
-    image: joomlaprojects/docker-images:cypress
+      - phpmin-system-mysql
+    image: joomlaprojects/docker-images:cypress8.2
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
 
-  - name: phpmax-system-mysql
+  - name: phpnext-system-mysql
     depends_on:
-      - phpmin-system-mysql
-      - phpmin-system-postgres
-    image: joomlaprojects/docker-images:cypress8.1
+      - phpmax-system-mysql
+    image: joomlaprojects/docker-images:cypress8.2
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    failure: ignore
     commands:
-      - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
+      - echo "This test is disabled because php next is not stable yet"
+      - exit 1
+      - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql
 
-  - name: phpmax-system-postgres
+  - name: phpmin-system-postgres
     depends_on:
-      - phpmin-system-mysql
-      - phpmin-system-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/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
 
-  - name: phpmin-system-mysql8
+  - name: phpmax-system-postgres
     depends_on:
-      - phpmax-system-mysql
-      - phpmax-system-postgres
-    image: joomlaprojects/docker-images:cypress
+      - phpmin-system-postgres
+    image: joomlaprojects/docker-images:cypress8.2
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/System/drone-system-run.sh "$(pwd)" cmysql8 mysqli mysql8
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres
 
-  - name: phpmax-system-mysql8
+  - name: phpnext-system-postgres
     depends_on:
-      - phpmax-system-mysql
       - phpmax-system-postgres
-    image: joomlaprojects/docker-images:cypress8.1
+    image: joomlaprojects/docker-images:cypress8.2
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    failure: ignore
     commands:
-      - bash tests/System/drone-system-run.sh "$(pwd)" cmysql8max mysqli mysql8
+      - echo "This test is disabled because php next is not stable yet"
+      - exit 1
+      - bash tests/System/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres
 
   - name: artifacts-system-tests
     image: joomlaprojects/docker-images:packager
     depends_on:
+      - phpnext-system-mysql
+      - phpnext-system-postgres
       - phpmax-system-mysql
-      - phpmax-system-mysql8
       - phpmax-system-postgres
       - phpmin-system-mysql
-      - phpmin-system-mysql8
       - phpmin-system-postgres
     environment:
       FTP_USERNAME:
@@ -312,14 +230,6 @@ volumes:
 
 services:
   - name: mysql
-    image: mysql:5.7
-    environment:
-      MYSQL_USER: joomla_ut
-      MYSQL_PASSWORD: joomla_ut
-      MYSQL_ROOT_PASSWORD: joomla_ut
-      MYSQL_DATABASE: test_joomla
-
-  - name: mysql8
     image: mysql:8
     command: ["--default-authentication-plugin=mysql_native_password"]
     environment:
@@ -329,7 +239,7 @@ services:
       MYSQL_DATABASE: test_joomla
 
   - name: postgres
-    image: postgres:11-alpine
+    image: postgres:12-alpine
     ports:
       - 5432
     environment:
@@ -388,8 +298,8 @@ steps:
       - name: reference
         path: /reference
     when:
-      branch:
-        - 4.4-dev
+      repo:
+        - joomla/joomla-cms
 
 ---
 kind: pipeline
@@ -404,7 +314,7 @@ steps:
       - 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
+      - php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --exclude-bzip2 --disable-patch-packages
       - mv build/tmp/packages/* transfer/
 
   - name: upload
@@ -453,6 +363,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 3457679ef0cd23bde8dd9900016aba663a279aa0c32049c8e37db56676cadd38
+hmac: 8cf1bf21cd6ed0fb836683510df6a44fe8b096704593aa2f30478b3d41bb0fdf
 
 ...

README.md

@@ -1,18 +1,21 @@
 Joomla! CMS™
 ====================
 
+The Joomla! 5.0 branch is under heavy development and not all links in this document are available yet
+------------------------------------------------------------------------------------------------------
+
 Build Status
 ---------------------
-| Drone-CI      | AppVeyor      | PHP           |  Node         | npm           |
-| ------------- | ------------- | ------------- | ------------- | ------------- |
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.4-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.4-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/) |
+| Drone-CI                                                                                                                                 | AppVeyor                                                                                                                                                           | PHP                                                                           |  Node         | npm           |
+|------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| ------------- | ------------- |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-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
 ---------------------
-* This is the source of Joomla! 4.x.
+* This is the source of Joomla! 5.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 4.4 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.4_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.4-dev).
+* Joomla! 5.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.0_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.0-dev).
 
 What is Joomla?
 ---------------------
@@ -28,7 +31,7 @@ Joomla is not installable out of the box from this repository, please use:
 
 How to get a working installation from the source
 ---------------------
-For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J4.x:Setting_Up_Your_Local_Environment
+For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J5.x:Setting_Up_Your_Local_Environment
 
 You will need:
 - PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Special:MyLanguage/Configuring_a_LAMPP_server_for_PHP_development)
@@ -45,9 +48,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 4.4-dev branch:
+- Go to the 5.0-dev branch:
 ```bash
-git checkout 4.4-dev
+git checkout 5.0-dev
 ```
 - Install all the needed composer packages:
 ```bash