Skip to content

Commit 2cb9c21

Browse files
ishanvyas22ishanvyas22
committed
Merge remote-tracking branch 'pro/common' into feature/PB-39712_V5-Merge-pro-common-into-ce-release
2 parents e229b30 + 0a78841 commit 2cb9c21

File tree

1,040 files changed

+15543
-10340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,040 files changed

+15543
-10340
lines changed

‎.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml

+22-96
Original file line numberDiff line numberDiff line change
@@ -122,36 +122,16 @@
122122
##
123123
## CUSTOM COMBINATIONS
124124
##
125-
seq-php7.4-mysql5.7:
125+
seq-php8.2-mysql5.7:
126126
variables:
127-
PHP_VERSION: "7.4"
127+
PHP_VERSION: "8.2"
128128
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
129129
extends:
130130
- .mysql-template
131131
- .test-template
132132
rules:
133133
- if: "$TEST_DISABLED == null"
134134

135-
seq-php8.0-postgres13:
136-
variables:
137-
PHP_VERSION: "8.0"
138-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
139-
extends:
140-
- .postgres-template
141-
- .test-template
142-
rules:
143-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
144-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
145-
146-
seq-php8.1-postgres15:
147-
variables:
148-
PHP_VERSION: "8.1"
149-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:15-alpine"
150-
extends:
151-
- .postgres-template
152-
- .test-template
153-
allow_failure: true
154-
155135
#seq-php7.4-postgres12.11:
156136
# variables:
157137
# PHP_VERSION: "7.4"
@@ -177,9 +157,9 @@ seq-php8.1-postgres15:
177157
# - if: '$TEST_DISABLED == null'
178158

179159
## DEBIAN 11 BULLSEYE
180-
seq-php7.4-mariadb10.5:
160+
seq-php8.2-mariadb10.5:
181161
variables:
182-
PHP_VERSION: "7.4"
162+
PHP_VERSION: "8.2"
183163
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
184164
extends:
185165
- .mysql-template
@@ -200,18 +180,6 @@ seq-php7.4-mariadb10.5:
200180
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
201181
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
202182

203-
## UBUNTU 20.04 LTS FOCAL
204-
seq-php7.4-mysql8:
205-
variables:
206-
PHP_VERSION: "7.4"
207-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
208-
extends:
209-
- .mysql-template
210-
- .test-template
211-
rules:
212-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
213-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
214-
215183
#seq-php7.4-postgres12.11:
216184
# variables:
217185
# PHP_VERSION: "7.4"
@@ -223,9 +191,9 @@ seq-php7.4-mysql8:
223191
# - if: '$TEST_DISABLED == null'
224192

225193
## UBUNTU 22.04 LTS JAMMY
226-
seq-php8.1-mysql8:
194+
seq-php8.2-mysql8:
227195
variables:
228-
PHP_VERSION: "8.1"
196+
PHP_VERSION: "8.2"
229197
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
230198
extends:
231199
- .mysql-template
@@ -234,54 +202,20 @@ seq-php8.1-mysql8:
234202
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
235203
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
236204

237-
#seq-php8.1-postgres14.3:
238-
# variables:
239-
# PHP_VERSION: "8.1"
240-
# DATABASE_ENGINE_VERSION: '${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:14-alpine'
241-
# extends:
242-
# - .postgres-template
243-
# - .test-template
244-
# rules:
245-
# - if: '$TEST_DISABLED == null'
246-
247205
##
248206
## RPM COMBINATIONS
249207
##
250208
## CENTOS 7 - with remi and mariadb repos
251209
seq-php8.2-mariadb10.3:
252210
variables:
253-
PHP_VERSION: "7.4"
211+
PHP_VERSION: "8.2"
254212
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
255213
extends:
256214
- .mysql-template
257215
- .test-template
258216
rules:
259217
- if: "$TEST_DISABLED == null"
260218

261-
## ROCKY LINUX 8.6
262-
seq-php8.0-mariadb10.5:
263-
variables:
264-
PHP_VERSION: "8.0"
265-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
266-
extends:
267-
- .mysql-template
268-
- .test-template
269-
rules:
270-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
271-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
272-
273-
## RHEL 9
274-
seq-php8.0-mariadb8.0:
275-
variables:
276-
PHP_VERSION: "8.0"
277-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
278-
extends:
279-
- .mysql-template
280-
- .test-template
281-
rules:
282-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
283-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
284-
285219
#seq-php8.0-postgres13.7:
286220
# variables:
287221
# PHP_VERSION: "8.0"
@@ -293,6 +227,14 @@ seq-php8.0-mariadb8.0:
293227
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
294228
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
295229

230+
seq-php8.2-postgres15:
231+
variables:
232+
PHP_VERSION: "8.2"
233+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:15-alpine"
234+
extends:
235+
- .postgres-template
236+
- .test-template
237+
296238
seq-php8.3-mariadb10.5:
297239
variables:
298240
PHP_VERSION: "8.3"
@@ -303,36 +245,20 @@ seq-php8.3-mariadb10.5:
303245
rules:
304246
- if: "$TEST_DISABLED == null"
305247

306-
307-
# Mariadb 11.5 tests
308-
309-
seq-php8.0-mariadb11.5:
248+
seq-php8.3-postgres13:
310249
variables:
311-
PHP_VERSION: "8.0"
312-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:11.5"
250+
PHP_VERSION: "8.3"
251+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
313252
extends:
314-
- .mariadb-template
253+
- .postgres-template
315254
- .test-template
316255
rules:
317256
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
318257
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
319-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "release"'
320-
allow_failure: true
321258

322-
seq-php8.1-mariadb11.5:
323-
variables:
324-
PHP_VERSION: "8.1"
325-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:11.5"
326-
extends:
327-
- .mariadb-template
328-
- .test-template
329-
rules:
330-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
331-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
332-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "release"'
333-
allow_failure: true
259+
# Mariadb 11.5 tests
334260

335-
# This is what we ship with the docker image as of 14 Nov 2024
261+
# This is what we ship with the docker image as of 14 Nov 2024
336262
seq-php8.2-mariadb11.5:
337263
variables:
338264
PHP_VERSION: "8.2"
@@ -355,4 +281,4 @@ seq-php8.3-mariadb11.5:
355281
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
356282
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
357283
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "release"'
358-
allow_failure: true
284+
allow_failure: true

‎.gitlab-ci/jobs/security_check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.security-check:
22
stage: unit-test
33
variables:
4-
PHP_VERSION: "7.4"
4+
PHP_VERSION: "8.2"
55
COMPOSER_ALLOW_SUPERUSER: 1
66
image: $CI_REGISTRY_IMAGE_TEST:$PHP_VERSION
77
allow_failure: true

‎.gitlab-ci/jobs/style_check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
.static-analysis:
22
stage: unit-test
33
variables:
4-
PHP_VERSION: "7.4"
4+
PHP_VERSION: "8.2"
55
COMPOSER_ALLOW_SUPERUSER: 1
66
image: $CI_REGISTRY_IMAGE_TEST:$PHP_VERSION
77
allow_failure: false
88
script:
99
- composer config --global process-timeout 2000
1010
- composer install --no-interaction
1111
- composer validate --check-lock --no-check-publish
12-
- composer cs-check
1312
- composer stan
1413
- composer psalm
14+
- composer cs-check
1515

1616
static-analysis:
1717
extends: .static-analysis

‎Gruntfile.js

+2-13
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,11 @@ module.exports = function(grunt) {
9797
// Default Avatars
9898
'avatar/**',
9999
// Passbolt logos
100-
'logo/icon-20_white.png', 'logo/icon-20_grey.png', 'logo/icon-20.png',
101-
'logo/icon-48_white.png', 'logo/icon-48.png',
102-
'logo/logo.png', 'logo/[email protected]', 'logo/logo.svg', 'logo/logo_white.svg', 'logo/logo_white.png',
100+
'logo/logo.png', 'logo/logo.svg', 'logo/logo_white.svg',
103101
// Image for inputs and controls
104102
'controls/check_black.svg',
105-
'controls/check_white.svg',
103+
'controls/check_tick.svg',
106104
'controls/chevron-down_black.svg',
107-
'controls/chevron-down_white.svg',
108105
'controls/chevron-down_blue.svg',
109106
'controls/dot_white.svg',
110107
'controls/dot_red.svg',
@@ -118,13 +115,6 @@ module.exports = function(grunt) {
118115
'controls/warning.svg',
119116
'controls/attention.svg',
120117
// Login page 3rd party logo
121-
'third_party/firefox_logo.png',
122-
'third_party/FirefoxAMO_black.svg',
123-
'third_party/FirefoxAMO_white.svg',
124-
'third_party/ChromeWebStore_black.svg',
125-
'third_party/ChromeWebStore_white.svg',
126-
'third_party/edge-addon-black.svg',
127-
'third_party/edge-addon-white.svg',
128118
'third_party/chosen-sprite.png',
129119
'third_party/[email protected]',
130120
'third_party/firefox.svg',
@@ -135,7 +125,6 @@ module.exports = function(grunt) {
135125

136126
// Smtp provider 3rd party logo
137127
'third_party/aws-ses.svg',
138-
'third_party/azure.svg',
139128
'third_party/elastic-email.svg',
140129
'third_party/gmail.svg',
141130
'third_party/mailgun.svg',

‎composer.json

+23-31
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"config": {
1212
"optimize-autoloader": true,
1313
"platform": {
14-
"php": "7.4"
14+
"php": "8.2"
1515
},
1616
"allow-plugins": {
1717
"dealerdirect/phpcodesniffer-composer-installer": true,
@@ -45,27 +45,22 @@
4545
},
4646
{
4747
"type": "vcs",
48-
"url": "https://github.com/passbolt/migrations.git",
48+
"url": "https://github.com/ishanvyas22/cakephp-api-pagination.git",
4949
"no-api": true
5050
},
5151
{
5252
"type": "vcs",
53-
"url": "https://github.com/passbolt/phinx.git",
54-
"no-api": true
55-
},
56-
{
57-
"type": "vcs",
58-
"url": "https://github.com/bcrowe/cakephp-api-pagination.git",
53+
"url": "https://github.com/passbolt/cakephp-email-queue.git",
5954
"no-api": true
6055
},
6156
{
6257
"type": "vcs",
63-
"url": "https://github.com/passbolt/cakephp-email-queue.git",
58+
"url": "https://github.com/passbolt/cakephp.git",
6459
"no-api": true
6560
}
6661
],
6762
"require": {
68-
"php": ">=7.4",
63+
"php": ">=8.2",
6964
"ext-json": "*",
7065
"ext-posix": "*",
7166
"ext-intl": "*",
@@ -75,21 +70,18 @@
7570
"ext-pdo": "*",
7671
"ext-curl": "*",
7772
"composer/composer": "^2.8.1",
78-
"cakephp/cakephp": "^4.5.7",
79-
"cakephp/chronos": "2.4.*",
80-
"longwave/laminas-diactoros": "^2.14.1",
81-
"cakephp/migrations": "dev-master#cab2143c0b477eae213b472cdb5a3faa1ea1d0ff",
82-
"robmorgan/phinx": "0.x-dev#a409b03e1e3e5f8f60d0d3179704abc9bc80e817",
83-
"cakephp/plugin-installer": "^1.3.1",
84-
"mobiledetect/mobiledetectlib": "^2.8.39",
73+
"cakephp/cakephp": "dev-fix-uri-type-error-patch-v5.0 as 5.0.11",
74+
"cakephp/migrations": "^4.0.0",
75+
"cakephp/plugin-installer": "^2.0",
76+
"mobiledetect/mobiledetectlib": "^4.8.03",
8577
"ramsey/uuid": "^4.2.3",
8678
"singpolyma/openpgp-php": "^0.7",
87-
"donatj/phpuseragentparser": "^1.8.0",
88-
"lorenzo/cakephp-email-queue": "dev-master#ed3e3e0c66999a5d0ce31f311ad89cbbd95f16d5",
79+
"donatj/phpuseragentparser": "^1.10.0",
80+
"lorenzo/cakephp-email-queue": "dev-master#7903ab082b113d35b3428a957bdd7859703cc024",
8981
"imagine/imagine": "^1.3.2",
9082
"league/flysystem": "^2.4.5",
91-
"cakephp/authentication": "^2.10.0",
92-
"bcrowe/cakephp-api-pagination": "^3.0.1",
83+
"cakephp/authentication": "^3.0",
84+
"bcrowe/cakephp-api-pagination": "dev-cake5",
9385
"firebase/php-jwt": "^6.2.0",
9486
"spomky-labs/otphp": "^10.0.0",
9587
"bacon/bacon-qr-code": "^2.0.7",
@@ -99,17 +91,17 @@
9991
"require-dev": {
10092
"phpstan/phpstan": "^1.12.10",
10193
"psy/psysh": "@stable",
102-
"cakephp/debug_kit": "^4.9.0",
103-
"cakephp/bake": "^2.3.0",
104-
"phpunit/phpunit": "~9.6.20",
105-
"cakephp/cakephp-codesniffer": "^4.5",
106-
"passbolt/passbolt-selenium-api": "^4.5",
107-
"passbolt/passbolt-test-data": "^4.8",
108-
"vierge-noire/cakephp-fixture-factories": "^v2.9.3",
109-
"cakephp/localized": "4.0.0",
94+
"cakephp/debug_kit": "^5.0.0",
95+
"cakephp/bake": "^3.0.0",
96+
"phpunit/phpunit": "^10.1.0",
97+
"cakephp/cakephp-codesniffer": "^5.0",
98+
"passbolt/passbolt-selenium-api": "dev-cakephp5",
99+
"passbolt/passbolt-test-data": "dev-cakephp5",
100+
"vierge-noire/cakephp-fixture-factories": "^v3.0",
101+
"cakephp/localized": "^5.0",
110102
"vimeo/psalm": "^5.26.0",
111-
"cakedc/cakephp-phpstan": "^2.1",
112-
"johnkary/phpunit-speedtrap": "^4.0"
103+
"cakedc/cakephp-phpstan": "^3.2",
104+
"ergebnis/phpunit-slow-test-detector": "^2.19"
113105
},
114106
"autoload": {
115107
"psr-4": {

0 commit comments

Comments
 (0)