Skip to content

Commit

Permalink
Merge branch '4.3-dev' into nested_tags
Browse files Browse the repository at this point in the history
  • Loading branch information
obuisard committed Sep 7, 2022
2 parents 46f47fb + 500518b commit 7ec083e
Show file tree
Hide file tree
Showing 1,925 changed files with 11,017 additions and 1,231 deletions.
48 changes: 28 additions & 20 deletions .drone.yml
Expand Up @@ -25,6 +25,11 @@ steps:
- name: npm
image: node:16-alpine
depends_on: [ phpcs ]
volumes:
- name: npm-cache
path: /tmp/npm-cache
environment:
npm_config_cache: /tmp/npm-cache
commands:
- npm ci --unsafe-perm

Expand Down Expand Up @@ -227,21 +232,21 @@ steps:
depends_on:
- phpmax-api-mysql
- phpmax-api-postgres
image: joomlaprojects/docker-images:systemtests
image: joomlaprojects/docker-images:cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
- bash tests/cypress/drone-system-run.sh "$(pwd)" cmysql mysqli mysql

- name: phpmax-system-mysql
depends_on:
- phpmax-api-mysql
- phpmax-api-postgres
image: joomlaprojects/docker-images:systemtests8.1
image: joomlaprojects/docker-images:cypress8.1
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax
- bash tests/cypress/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql

# - name: phpnext-system-mysql
# depends_on:
Expand All @@ -257,21 +262,21 @@ steps:
depends_on:
- phpmax-api-mysql
- phpmax-api-postgres
image: joomlaprojects/docker-images:systemtests
image: joomlaprojects/docker-images:cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" postgres
- bash tests/cypress/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres

- name: phpmax-system-postgres
depends_on:
- phpmax-api-mysql
- phpmax-api-postgres
image: joomlaprojects/docker-images:systemtests8.1
image: joomlaprojects/docker-images:cypress8.1
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax
- bash tests/cypress/drone-system-run.sh "$(pwd)" cpostgresmax pgsql postgres

# - name: phpnext-system-postgres
# depends_on:
Expand All @@ -287,21 +292,21 @@ steps:
depends_on:
- phpmax-system-mysql
- phpmax-system-postgres
image: joomlaprojects/docker-images:systemtests
image: joomlaprojects/docker-images:cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8
- bash tests/cypress/drone-system-run.sh "$(pwd)" cmysql8 mysqli mysql8

- name: phpmax-system-mysql8
depends_on:
- phpmax-system-mysql
- phpmax-system-postgres
image: joomlaprojects/docker-images:systemtests8.1
image: joomlaprojects/docker-images:cypress8.1
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax
- bash tests/cypress/drone-system-run.sh "$(pwd)" cmysql8max mysqli mysql8

# - name: phpnext-system-mysql8
# depends_on:
Expand All @@ -316,17 +321,17 @@ steps:
- name: artifacts-system-tests
image: cschlosser/drone-ftps
depends_on:
# - phpnext-system-mysql
# - phpnext-system-mysql8
# - phpnext-system-postgres
# - 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
# - phpnext-api-mysql
# - phpnext-api-postgres
- phpmax-api-mysql
- phpmax-api-postgres
- phpmin-api-mysql
Expand All @@ -337,7 +342,7 @@ steps:
FTP_PASSWORD:
from_secret: ftppassword
PLUGIN_HOSTNAME: ci.joomla.org:21
PLUGIN_SRC_DIR: /tests/Codeception/_output/
PLUGIN_SRC_DIR: /tests/cypress/output/
PLUGIN_DEST_DIR: /artifacts
PLUGIN_SECURE: false
PLUGIN_EXCLUDE: ^\.git/$
Expand All @@ -353,6 +358,9 @@ volumes:
- name: composer-cache
host:
path: /tmp/composer-cache
- name: npm-cache
host:
path: /tmp/npm-cache

services:
- name: mysql
Expand Down Expand Up @@ -411,7 +419,7 @@ steps:
path: /reference
when:
branch:
- 4.2-dev
- 4.3-dev

---
kind: pipeline
Expand Down Expand Up @@ -475,6 +483,6 @@ trigger:

---
kind: signature
hmac: 783273e5140ae315f2403b13eb12f4773b77995a3d44a38551b55c89b9d40350
hmac: 916fe89f8d920e8471b32aae02bfe192abf24cd035b5f1ea73452662c1c92895

...
9 changes: 9 additions & 0 deletions .gitignore
Expand Up @@ -101,3 +101,12 @@ RoboFile.ini
# Media Manager
/media/com_media/js/mediamanager.min.js.map
/media/com_media/css/mediamanager.min.css.map

#cypress
/tests/cypress/screenshots
!/tests/cypress/screenshots/.gitkeep
/tests/cypress/videos
!/tests/cypress/videos/.gitkeep

# WebAuthn FIDO metadata cache
/plugins/system/webauthn/fido.jwt
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -11,7 +11,7 @@ Overview
---------------------
* This is the source of Joomla! 4.x.
* Joomla's [Official website](https://www.joomla.org).
* Joomla! 4.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history).
* Joomla! 4.3 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.3_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.2-dev).

What is Joomla?
Expand Down
2 changes: 1 addition & 1 deletion README.txt
Expand Up @@ -3,7 +3,7 @@ Joomla! CMS™
1- Overview
* This is a Joomla! 4.x installation/upgrade package.
* Joomla! Official site: https://www.joomla.org
* Joomla! 4.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history
* Joomla! 4.3 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.3_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.2-dev

2- What is Joomla?
Expand Down
Expand Up @@ -25,6 +25,10 @@
use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
use Joomla\Utilities\ArrayHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Actionlogs list controller class.
*
Expand Down
Expand Up @@ -12,6 +12,10 @@

use Joomla\CMS\MVC\Controller\BaseController;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Plugins master display controller.
*
Expand Down
Expand Up @@ -15,6 +15,10 @@
use Joomla\CMS\Language\Text;
use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Field to load a list of all extensions that have logged actions
*
Expand Down
Expand Up @@ -12,6 +12,10 @@

use Joomla\CMS\Form\Field\ListField;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Field to load a list of all users that have logged actions
*
Expand Down
Expand Up @@ -14,6 +14,10 @@
use Joomla\CMS\Form\Field\PredefinedlistField;
use Joomla\CMS\Form\Form;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Field to show a list of range dates to sort with
*
Expand Down
Expand Up @@ -16,6 +16,10 @@
use Joomla\CMS\Language\Text;
use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Field to load a list of all users that have logged actions
*
Expand Down
Expand Up @@ -15,6 +15,10 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Information field.
*
Expand Down
Expand Up @@ -19,6 +19,10 @@
use Joomla\CMS\Router\Route;
use Joomla\String\StringHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Actionlogs component helper.
*
Expand Down
Expand Up @@ -13,6 +13,10 @@
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
use stdClass;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Model to interact with the action log configuration.
*
Expand Down
Expand Up @@ -21,6 +21,10 @@
use Joomla\Utilities\IpHelper;
use PHPMailer\PHPMailer\Exception as phpMailerException;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Methods supporting a list of Actionlog records.
*
Expand Down
Expand Up @@ -24,6 +24,10 @@
use Joomla\Utilities\ArrayHelper;
use RuntimeException;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Methods supporting a list of article records.
*
Expand Down
Expand Up @@ -13,6 +13,10 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Plugin\CMSPlugin;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Abstract Action Log Plugin
*
Expand Down
Expand Up @@ -11,7 +11,9 @@
* in the default .htaccess and web.config files.
*/


// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Notifies users of the add the nosniff headers by applying the changes from the default .htaccess or web.config file
Expand Down
Expand Up @@ -15,6 +15,10 @@
use Joomla\Registry\Registry;
use Joomla\Utilities\ArrayHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Notifies users of the new Behind Load Balancer option in Global Config, if we detect they might be behind a proxy
*
Expand Down
Expand Up @@ -11,7 +11,9 @@
* in the default .htaccess file regarding hardening against XSS in SVG's
*/


// 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 hardening against XSS in SVG's
Expand Down
Expand Up @@ -13,6 +13,10 @@

use Joomla\CMS\Factory;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Checks if the installation is affected by the issue with content languages access in 3.4.0
*
Expand Down
Expand Up @@ -10,7 +10,9 @@
* This file contains post-installation message handling for the checking minimum PHP version support
*/


// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Alerts the user we are collecting anonymous data as of Joomla 3.5.0.
Expand Down
Expand Up @@ -11,7 +11,9 @@
* in the default textfilter settings
*/


// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Notifies users the changes from the default textfilter.
Expand Down

0 comments on commit 7ec083e

Please sign in to comment.