Skip to content

Commit

Permalink
Merge branch 'feature-cake5' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Benn Oshrin committed Jan 25, 2026
2 parents 71a1312 + e079748 commit e33f9d7
Show file tree
Hide file tree
Showing 6,856 changed files with 215,564 additions and 343,345 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
52 changes: 26 additions & 26 deletions app/composer.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{
"name": "cakephp/app",
"description": "CakePHP skeleton app",
"homepage": "https://cakephp.org",
"description": "COmanage Match",
"homepage": "https://incommon.org/software/comanage/",
"type": "project",
"license": "MIT",
"license": "Apache 2",
"require": {
"php": ">=7.3",
"cakephp/cakephp": "^4.6",
"cakephp/migrations": "^3.2",
"cakephp/plugin-installer": "^1.3",
"php": ">=8.1",
"cakephp/authentication": "~3.0",
"cakephp/cakephp": "5.2.*",
"cakephp/migrations": "^4.0.0",
"cakephp/plugin-installer": "^2.0",
"components/jquery": "~3.7",
"doctrine/dbal": "^3.3",
"mobiledetect/mobiledetectlib": "^2.8",
"twbs/bootstrap": "^5.1"
},
"require-dev": {
"cakephp/bake": "^2.6",
"cakephp/repl": "^0.1",
"cakephp/cakephp-codesniffer": "^4.5",
"cakephp/debug_kit": "^4.5",
"josegonzalez/dotenv": "^3.2",
"phpstan/phpstan": "^0.12.99",
"phpunit/phpunit": "~8.5.0 || ^9.3"
"cakephp/bake": "^3.0.0",
"cakephp/cakephp-codesniffer": "^5.0",
"cakephp/debug_kit": "^5.0.0",
"josegonzalez/dotenv": "^4.0",
"phpunit/phpunit": "^10.5.5 || ^11.1.3 || ^12.1"
},
"suggest": {
"markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
"cakephp/repl": "Console tools for a REPL interface for CakePHP applications.",
"dereuromark/cakephp-ide-helper": "After baking your code, this keeps your annotations in sync with the code evolving from there on for maximum IDE and PHPStan/Psalm compatibility.",
"markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
"phpstan/phpstan": "PHPStan focuses on finding errors in your code without actually running it. It catches whole classes of bugs even before you write tests for the code."
},
"autoload": {
Expand All @@ -39,6 +39,14 @@
"Cake\\Test\\": "vendor/cakephp/cakephp/tests/"
}
},
"config": {
"allow-plugins": {
"cakephp/plugin-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true
},
"platform-check": true,
"sort-packages": true
},
"scripts": {
"post-install-cmd": [
"App\\Console\\Installer::postInstall",
Expand Down Expand Up @@ -69,17 +77,9 @@
"@test",
"@cs-check"
],
"cs-check": "phpcs --colors -p src/ tests/",
"cs-fix": "phpcbf --colors -p src/ tests/",
"stan": "phpstan analyse",
"cs-check": "phpcs --colors -p",
"cs-fix": "phpcbf --colors -p",
"test": "phpunit --colors=always"
},
"prefer-stable": true,
"config": {
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"cakephp/plugin-installer": true
}
}
"prefer-stable": true
}
Loading

0 comments on commit e33f9d7

Please sign in to comment.