Skip to content

Commit 104b1ed

Browse files
AReveronAReveron
committed
REF #35456 upgrade to cakephp 4.4
1 parent 3830d02 commit 104b1ed

File tree

167 files changed

+4470
-2494
lines changed

Some content is hidden

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

167 files changed

+4470
-2494
lines changed

‎.gitignore

+45-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,52 @@
1-
/vendor/*
2-
/config/app.php
3-
/tmp/*
1+
# CakePHP specific files #
2+
##########################
3+
/config/app_local.php
4+
/config/.env
45
/logs/*
6+
/tmp/*
7+
/vendor/*
8+
9+
# OS generated files #
10+
######################
11+
.DS_Store
12+
.DS_Store?
13+
._*
14+
.Spotlight-V100
15+
.Trashes
16+
Icon?
17+
ehthumbs.db
18+
Thumbs.db
19+
.directory
20+
21+
# Tool specific files #
22+
#######################
23+
# PHPUnit
24+
.phpunit.result.cache
25+
# vim
26+
*~
27+
*.swp
28+
*.swo
29+
# sublime text & textmate
30+
*.sublime-*
31+
*.stTheme.cache
32+
*.tmlanguage.cache
33+
*.tmPreferences.cache
34+
# Eclipse
35+
.settings/*
36+
# JetBrains, aka PHPStorm, IntelliJ IDEA
37+
.idea/*
38+
# NetBeans
39+
nbproject/*
40+
# Visual Studio Code
41+
.vscode
42+
# Sass preprocessor
43+
.sass-cache/
44+
545
/webroot/cache_css/*
646
/webroot/cache_js/*
747
/files/*
848
/webroot/files/*
949
/plugins/Showcase
10-
.idea
1150
.php_cs.cache
51+
config/Migrations/schema-dump-default.lock
52+
.ddev

‎bin/cake

+29-29
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,40 @@
1919

2020
# Canonicalize by following every symlink of the given name recursively
2121
canonicalize() {
22-
NAME="$1"
23-
if [ -f "$NAME" ]
24-
then
25-
DIR=$(dirname -- "$NAME")
26-
NAME=$(cd -P "$DIR" > /dev/null && pwd -P)/$(basename -- "$NAME")
27-
fi
28-
while [ -h "$NAME" ]; do
29-
DIR=$(dirname -- "$NAME")
30-
SYM=$(readlink "$NAME")
31-
NAME=$(cd "$DIR" > /dev/null && cd $(dirname -- "$SYM") > /dev/null && pwd)/$(basename -- "$SYM")
32-
done
33-
echo "$NAME"
22+
NAME="$1"
23+
if [ -f "$NAME" ]
24+
then
25+
DIR=$(dirname -- "$NAME")
26+
NAME=$(cd -P "$DIR" > /dev/null && pwd -P)/$(basename -- "$NAME")
27+
fi
28+
while [ -h "$NAME" ]; do
29+
DIR=$(dirname -- "$NAME")
30+
SYM=$(readlink "$NAME")
31+
NAME=$(cd "$DIR" > /dev/null && cd "$(dirname -- "$SYM")" > /dev/null && pwd)/$(basename -- "$SYM")
32+
done
33+
echo "$NAME"
3434
}
3535

3636
# Find a CLI version of PHP
3737
findCliPhp() {
38-
for TESTEXEC in php php-cli /usr/local/bin/php
39-
do
40-
SAPI=`echo "<?= PHP_SAPI ?>" | $TESTEXEC 2>/dev/null`
41-
if [ "$SAPI" = "cli" ]
42-
then
43-
echo $TESTEXEC
44-
return
45-
fi
46-
done
47-
echo "Failed to find a CLI version of PHP; falling back to system standard php executable" >&2
48-
echo "php";
38+
for TESTEXEC in php php-cli /usr/local/bin/php
39+
do
40+
SAPI=$(echo "<?= PHP_SAPI ?>" | $TESTEXEC 2>/dev/null)
41+
if [ "$SAPI" = "cli" ]
42+
then
43+
echo $TESTEXEC
44+
return
45+
fi
46+
done
47+
echo "Failed to find a CLI version of PHP; falling back to system standard php executable" >&2
48+
echo "php";
4949
}
5050

5151
# If current path is a symlink, resolve to real path
5252
realname="$0"
5353
if [ -L "$realname" ]
5454
then
55-
realname=$(readlink -f "$0")
55+
realname=$(readlink -f "$0")
5656
fi
5757

5858
CONSOLE=$(dirname -- "$(canonicalize "$realname")")
@@ -62,14 +62,14 @@ APP=$(dirname "$CONSOLE")
6262
# variable with the correct path in it.
6363
if [ -z "$PHP" ]
6464
then
65-
PHP=$(findCliPhp)
65+
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

75-
exit
75+
exit

‎bin/cake.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:: @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
1212
:: @link https://cakephp.org CakePHP(tm) Project
1313
:: @since 2.0.0
14-
:: @license https://www.opensource.org/licenses/mit-license.php MIT License
14+
:: @license https://opensource.org/licenses/mit-license.php MIT License
1515
::
1616
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
1717

‎composer.json

+18-14
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,31 @@
66
"license": "MIT",
77
"require": {
88
"php": ">=7.3",
9-
"cakephp/cakephp": "3.8.*",
10-
"cakephp/migrations": "^2.0.0",
9+
"cakephp/cakephp": "^4.4.0",
10+
"cakephp/migrations": "^3.8.2",
1111
"mobiledetect/mobiledetectlib": "2.*",
1212
"cakephp/plugin-installer": "^1.3",
13-
"markstory/asset_compress": "~3.0",
14-
"cakedc/users": "^8.0",
15-
"burzum/cakephp-imagine-plugin": "~2.0",
16-
"muffin/tags": "^1.1",
17-
"muffin/slug": "^1.4",
18-
"josegonzalez/cakephp-upload": "^4.0.0",
13+
"markstory/asset_compress": "^4.1.0",
14+
"cakedc/users": "^11.2.1",
15+
"burzum/cakephp-imagine-plugin": "^4.0.0",
16+
"muffin/tags": "^2.0.0-beta",
17+
"muffin/slug": "^2.1.1",
18+
"josegonzalez/cakephp-upload": "^7.0.1",
1919
"google/recaptcha": "~1.1",
20-
"league/flysystem": "^1.1",
20+
"league/flysystem": "^2.2",
2121
"linkorb/jsmin-php": "^1.0",
2222
"natxet/cssmin": "^3.0"
2323
},
2424
"require-dev": {
2525
"psy/psysh": "@stable",
26-
"cakephp/debug_kit": "~3.2",
27-
"cakephp/bake": "~1.1",
26+
"cakephp/debug_kit": "^4.9.4",
27+
"cakephp/bake": "^2.9.3",
2828
"cakephp/cakephp-codesniffer": "^3.0",
29-
"phpunit/phpunit": "^6.0"
30-
},
29+
"phpunit/phpunit": "^9.5",
30+
"phpstan/extension-installer": "^1.0",
31+
"phpstan/phpstan": "1.7.15",
32+
"psalm/phar": "^4.18.1"
33+
},
3134
"autoload": {
3235
"psr-4": {
3336
"App\\": "src"
@@ -36,7 +39,8 @@
3639
"config": {
3740
"secure-http": false,
3841
"allow-plugins": {
39-
"cakephp/plugin-installer": true
42+
"cakephp/plugin-installer": true,
43+
"phpstan/extension-installer": true
4044
}
4145
},
4246
"extra": {

0 commit comments

Comments
 (0)