Merge branch '4.3-dev' of https://github.com/joomla/joomla-cms into 4…

….2-phpcs-phpversion # Conflicts: # .drone.yml # composer.lock
joomla · Oct 22, 2022 · f6dd944 · f6dd944
2 parents 6bd0afa + 6f6d110
commit f6dd944
Show file tree

Hide file tree

Showing 191 changed files with 10,268 additions and 5,891 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -53,8 +53,15 @@ steps:
       - ./libraries/vendor/bin/phpcs --extensions=php -p --standard=ruleset.xml .
       - echo $(date)
 
+  - name: phan
+    image: joomlaprojects/docker-images:php7.4-ast
+    depends_on: [ phpcs ]
+    failure: ignore
+    commands:
+      - ./libraries/vendor/bin/phan
+
   - name: npm
-    image: node:16-alpine
+    image: node:16-bullseye-slim
     depends_on: [ phpcs ]
     volumes:
       - name: npm-cache
@@ -195,135 +202,117 @@ steps:
     commands:
       - npm run lint:js
 
-  - name: prepare_codeception_tests
+  - name: prepare_system_tests
     depends_on:
       - npm
     image: joomlaprojects/docker-images:systemtests
+    volumes:
+      - name: cypress-cache
+        path: /root/.cache/Cypress
     commands:
-      - sed -i 's/tests\\/Codeception\\/_output/\\/drone\\/src\\/tests\\/Codeception\\/_output/' codeception.yml
+      - sed -i 's/tests\\/Codeception\\/_output/\\/drone\\/src\\/tests\\/cypress\\/output/' codeception.yml
       - php libraries/vendor/bin/codecept build
+      - npx cypress install
+      - npx cypress verify
 
   - name: phpmin-api-mysql
     depends_on:
-      - prepare_codeception_tests
+      - 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
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql mysqli mysql jos_
 
-  - name: phpmax-api-mysql
+  - name: phpmin-api-postgres
     depends_on:
-      - prepare_codeception_tests
-    image: joomlaprojects/docker-images:systemtests8.1
+      - prepare_system_tests
+    image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
-      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax
-
-#  - name: phpnext-api-mysql
-#    depends_on:
-#      - phpmax-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
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres pgsql postgres jos_
 
-  - name: phpmin-api-postgres
+  - name: phpmax-api-mysql
     depends_on:
-      - prepare_codeception_tests
-    image: joomlaprojects/docker-images:systemtests
+      - 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)" postgres
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpmax mysqli mysql phpmax_
 
   - name: phpmax-api-postgres
     depends_on:
-      - prepare_codeception_tests
+      - 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
-
-#  - 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
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpmax pgsql postgres phpmax_
 
   - name: phpmin-system-mysql
     depends_on:
       - phpmax-api-mysql
       - phpmax-api-postgres
     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
 
-  - name: phpmax-system-mysql
+  - name: phpmin-system-postgres
     depends_on:
       - phpmax-api-mysql
       - phpmax-api-postgres
-    image: joomlaprojects/docker-images:cypress8.1
+    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)" cmysqlmax mysqli mysql
-
-#  - 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)" mysqlphpnext
+      - bash tests/cypress/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres
 
-  - name: phpmin-system-postgres
+  - name: phpmax-system-mysql
     depends_on:
-      - phpmax-api-mysql
-      - phpmax-api-postgres
-    image: joomlaprojects/docker-images:cypress
+      - phpmin-system-mysql
+      - phpmin-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)" cpostgres pgsql postgres
+      - bash tests/cypress/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql
 
   - name: phpmax-system-postgres
     depends_on:
-      - phpmax-api-mysql
-      - phpmax-api-postgres
+      - phpmin-system-mysql
+      - phpmin-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)" cpostgresmax pgsql postgres
 
-#  - name: phpnext-system-postgres
-#    depends_on:
-#      - 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: phpmin-system-mysql8
     depends_on:
       - phpmax-system-mysql
       - phpmax-system-postgres
     image: joomlaprojects/docker-images:cypress
+    volumes:
+      - name: cypress-cache
+        path: /root/.cache/Cypress
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
@@ -334,35 +323,23 @@ steps:
       - 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
 
-#  - 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
     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
@@ -389,6 +366,9 @@ volumes:
   - name: composer-cache
     host:
       path: /tmp/composer-cache
+  - name: cypress-cache
+    host:
+      path: /tmp/cypress-cache
   - name: npm-cache
     host:
       path: /tmp/npm-cache
@@ -517,6 +497,6 @@ trigger:
 
 ---
 kind: signature
-hmac: c850e892dfbe03549fe506a436dcafe7880cff3c78e9a3130582abbe7c13c3f9
+hmac: 824f98a6e4e05eea6d469af34ea3c9f9a47649b4fdda22438df692e3958d60fe
 
 ...
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,5 +16,10 @@ Pull Request for Issue # .
 
 
 
-### Documentation Changes Required
+### Link to documentations
+Please select:
+- [ ] Documentation link for docs.joomla.org: <link>
+- [ ] No documentation changes for docs.joomla.org needed
 
+- [ ] Pull Request link for manual.joomla.org: <link>
+- [ ] No documentation changes for manual.joomla.org needed