Skip to content

Commit

Permalink
Merge pull request #137 from anstiftung/issue-134-cakephp-5-update
Browse files Browse the repository at this point in the history
Issue 134 cakephp 5 update
  • Loading branch information
mrothauer authored Jan 19, 2024
2 parents c56a28a + ead7b3f commit 94c4881
Show file tree
Hide file tree
Showing 117 changed files with 1,770 additions and 1,968 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/app_custom.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@
],
],
'Datasources' => [
'default' => [
'host' => 'mysql-test',
'username' => 'my_user',
'password' => 'password',
'database' => 'my_app',
'port' => 3331,
],
'test' => [
'host' => 'mysql-test',
'username' => 'my_user',
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ nbproject/* # NetBeans
/webroot/node_modules
/.phpunit.result.cache
/.history
.phpunit.cache
1 change: 0 additions & 1 deletion bin/cake.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/php -q
<?php
// Check platform requirements
require dirname(__DIR__) . '/config/requirements.php';
require dirname(__DIR__) . '/vendor/autoload.php';

use App\Application;
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
},
"require": {
"php": ">=8.2",
"cakephp/authentication": "^2.0",
"cakephp/authorization": "^2.3",
"cakephp/cakephp": "4.*",
"cakephp/migrations": "^3.0",
"cakephp/plugin-installer": "~1.0",
"cakephp/authentication": "^3.0",
"cakephp/authorization": "^3.0",
"cakephp/cakephp": "5.*",
"cakephp/migrations": "^4.0",
"cakephp/plugin-installer": "~2.0",
"mobiledetect/mobiledetectlib": "3.*",
"markstory/asset_compress": "4.*",
"markstory/asset_compress": "5.*",
"tedivm/jshrink": "^1.3",
"intervention/image": "2.*",
"studio-42/elfinder": "^2.1",
"ezyang/htmlpurifier": "^4.11",
"dereuromark/cakephp-feed": "^2.0",
"dereuromark/cakephp-feed": "^3.0@RC",
"league/csv": "^9.8",
"eluceo/ical": "2.*",
"gregwar/captcha": "^1.1",
"druidfi/mysqldump-php": "^1.0"
},
"require-dev": {
"cakephp/debug_kit": "4.*",
"cakephp/debug_kit": "5.*",
"phpstan/phpstan": "1.*",
"phpunit/phpunit": "^9.0"
"phpunit/phpunit": "^10.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 94c4881

Please sign in to comment.