Skip to content

Commit 71bd742

Browse files
author
Juan Pablo Ramirez
committed
Installs CakePHP4 on common
1 parent 53c372a commit 71bd742

File tree

369 files changed

+3913
-2587
lines changed

Some content is hidden

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

369 files changed

+3913
-2587
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,6 @@ debian/passbolt-api-ce/
114114
debian/passbolt-api-pro/
115115
debian/*debhelper*
116116
debian/*substvars*
117+
118+
# PHPUNIT generated file
119+
.phpunit.result.cache

bin/cake

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ canonicalize() {
2828
while [ -h "$NAME" ]; do
2929
DIR=$(dirname -- "$NAME")
3030
SYM=$(readlink "$NAME")
31-
NAME=$(cd "$DIR" > /dev/null && cd $(dirname -- "$SYM") > /dev/null && pwd)/$(basename -- "$SYM")
31+
NAME=$(cd "$DIR" > /dev/null && cd "$(dirname -- "$SYM")" > /dev/null && pwd)/$(basename -- "$SYM")
3232
done
3333
echo "$NAME"
3434
}
@@ -37,7 +37,7 @@ canonicalize() {
3737
findCliPhp() {
3838
for TESTEXEC in php php-cli /usr/local/bin/php
3939
do
40-
SAPI=`echo "<?= PHP_SAPI ?>" | $TESTEXEC 2>/dev/null`
40+
SAPI=$(echo "<?= PHP_SAPI ?>" | $TESTEXEC 2>/dev/null)
4141
if [ "$SAPI" = "cli" ]
4242
then
4343
echo $TESTEXEC
@@ -65,11 +65,11 @@ then
6565
PHP=$(findCliPhp)
6666
fi
6767

68-
if [ $(basename $realname) != 'cake' ]
68+
if [ "$(basename "$realname")" != 'cake' ]
6969
then
70-
exec $PHP "$CONSOLE"/cake.php $(basename $realname) "$@"
70+
exec "$PHP" "$CONSOLE"/cake.php "$(basename "$realname")" "$@"
7171
else
72-
exec $PHP "$CONSOLE"/cake.php "$@"
72+
exec "$PHP" "$CONSOLE"/cake.php "$@"
7373
fi
7474

7575
exit

bin/cake.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
// Check platform requirements
44
require dirname(__DIR__) . '/config/requirements.php';
55
require dirname(__DIR__) . '/vendor/autoload.php';
6+
67
use App\Application;
78
use Cake\Console\CommandRunner;
9+
810
// Build the runner with an application and root executable name.
911
$runner = new CommandRunner(new Application(dirname(__DIR__) . '/config'), 'cake');
10-
exit($runner->run($argv));
12+
exit($runner->run($argv));

composer.json

+17-16
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
"repositories": [
2929
{
3030
"type": "vcs",
31-
"url": "https://github.com/passbolt/passbolt_selenium_api.git",
31+
"url": "https://github.com/pabloelcolombiano/passbolt_selenium_api",
3232
"no-api": true
3333
},
3434
{
3535
"type": "vcs",
36-
"url": "https://github.com/passbolt/passbolt_test_data.git",
36+
"url": "https://github.com/pabloelcolombiano/passbolt_test_data",
3737
"no-api": true
3838
},
3939
{
@@ -49,27 +49,28 @@
4949
"ext-intl" : "*",
5050
"ext-mbstring" : "*",
5151
"ext-gnupg" : "*",
52-
"cakephp/cakephp": "3.9.5",
53-
"cakephp/migrations": "^2.4.2",
52+
"cakephp/cakephp": "^4.2",
53+
"cakephp/migrations": "^3.0",
5454
"cakephp/plugin-installer": "^1.3.0",
5555
"mobiledetect/mobiledetectlib": "^2.8.34",
5656
"ramsey/uuid": "^4.1.1",
5757
"singpolyma/openpgp-php": "dev-master#c961eca13df86a4e9af6ef1ebd9da7d3858d75c8",
5858
"donatj/phpuseragentparser": "^1.1.0",
59-
"lorenzo/cakephp-email-queue": "^3.3.1",
60-
"burzum/cakephp-file-storage": "^2.1.0",
61-
"burzum/cakephp-imagine-plugin": "^3.0.0"
59+
"lorenzo/cakephp-email-queue": "^4.0",
60+
"imagine/imagine": "^1.2",
61+
"league/flysystem": "^2.0",
62+
"cakephp/authentication": "^2.0"
6263
},
6364
"require-dev": {
6465
"psy/psysh": "@stable",
65-
"cakephp/debug_kit": "^3.22.4",
66-
"cakephp/bake": "^1.12.0",
67-
"phpunit/phpunit": "^6.5.14",
66+
"cakephp/debug_kit": "^4.4",
67+
"cakephp/bake": "^2.3",
68+
"phpunit/phpunit": "^9.5",
6869
"passbolt/cakephp-codesniffer": "dev-master",
69-
"passbolt/passbolt_selenium_api": "^2.10.0",
70-
"passbolt/passbolt_test_data": "^2.14.1",
71-
"vierge-noire/cakephp-test-suite-light": "^1.0",
72-
"vierge-noire/cakephp-test-migrator": "^1.0"
70+
"passbolt/passbolt_selenium_api": "dev-master",
71+
"passbolt/passbolt_test_data": "dev-master",
72+
"vierge-noire/cakephp-fixture-factories": "^2.2",
73+
"vierge-noire/cakephp-test-migrator": "^2.1"
7374
},
7475
"autoload": {
7576
"psr-4": {
@@ -110,8 +111,8 @@
110111
"@test",
111112
"@cs-check"
112113
],
113-
"cs-check": "phpcs --colors -p --standard=vendor/passbolt/cakephp-codesniffer/CakePHP --ignore=*.js ./src ./tests ./plugins",
114-
"cs-fix": "phpcbf --colors --standard=vendor/passbolt/cakephp-codesniffer/CakePHP --ignore=*.js ./src ./tests ./plugins",
114+
"cs-check": "phpcs --colors -p --standard=vendor/passbolt/cakephp-codesniffer/CakePHP --ignore=*.js,*/templates/* ./src ./tests ./plugins",
115+
"cs-fix": "phpcbf --colors --standard=vendor/passbolt/cakephp-codesniffer/CakePHP --ignore=*.js,*/templates/* ./src ./tests ./plugins",
115116
"test": "phpunit --colors=always"
116117
},
117118
"prefer-stable": true

0 commit comments

Comments
 (0)