Skip to content

Commit 71f36c1

Browse files
authored
Merge pull request #2 from cakephp/4x-update
4x update
2 parents 0097663 + a29bb43 commit 71f36c1

55 files changed

Lines changed: 878 additions & 771 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# CakePHP specific files #
22
##########################
3-
/config/app.php
43
/config/.env
4+
/config/app_local.php
55
/tmp/*
66
/logs/*
77
/tmp/*

‎composer.json‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
"type": "project",
66
"license": "MIT",
77
"require": {
8-
"php": ">=5.6",
9-
"cakephp/cakephp": "3.5.*",
10-
"mobiledetect/mobiledetectlib": "2.*",
11-
"cakephp/migrations": "~1.0",
8+
"php": ">=7.2",
9+
"cakephp/cakephp": "^4.0",
10+
"cakephp/migrations": "~3.0",
11+
"cakephp/authorization": "~2.0",
12+
"cakephp/authentication": "~2.0",
1213
"cakephp/plugin-installer": "~1.0",
1314
"josegonzalez/dotenv": "2.*"
1415
},
1516
"require-dev": {
1617
"psy/psysh": "@stable",
17-
"cakephp/debug_kit": "~3.2",
18-
"cakephp/bake": "~1.1",
19-
"cakephp/cakephp-codesniffer": "^3.0"
18+
"cakephp/debug_kit": "^4.0",
19+
"cakephp/bake": "^2.0",
20+
"cakephp/cakephp-codesniffer": "^4.0"
2021
},
2122
"suggest": {
2223
"markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
@@ -43,9 +44,11 @@
4344
"@test",
4445
"@cs-check"
4546
],
46-
"cs-check": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests",
47-
"cs-fix": "phpcbf --colors --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests",
47+
"cs-check": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
48+
"cs-fix": "phpcbf --colors --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
49+
"stan": "phpstan analyse src/",
4850
"test": "phpunit --colors=always"
4951
},
52+
"minimum-stability": "dev",
5053
"prefer-stable": true
5154
}

0 commit comments

Comments
 (0)