Skip to content

CO-1847_Update_to_Cake_4 #11

Merged
merged 1 commit into from
Sep 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
49 changes: 49 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
# CakePHP 4
# User specific & automatically generated files #
#################################################
/build
/dist
/tags
/composer.lock
/phpunit.xml
/vendor
/vendors
/composer.phar
*.mo
debug.log
error.log
.phpunit.result.cache

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db

# Tool specific files #
#######################
# vim
*~
*.swp
*.swo
# sublime text & textmate
*.sublime-*
*.stTheme.cache
*.tmlanguage.cache
*.tmPreferences.cache
# Eclipse
.settings/*
/.project
/.buildpath
# JetBrains, aka PHPStorm, IntelliJ IDEA
.idea/*
# NetBeans
nbproject/*
# Visual Studio Code
.vscode

# CakePHP 3

/vendor/*
Expand Down
13 changes: 7 additions & 6 deletions app/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@
"type": "project",
"license": "MIT",
"require": {
"php": ">=5.6",
"php": ">=7.2",
"adodb/adodb-php": "^5.20",
"cakephp/cakephp": "3.10.*",
"cakephp/migrations": "^1.0",
"cakephp/cakephp": "4.0.*",
"cakephp/migrations": "^3.0.0",
"cakephp/plugin-installer": "^1.0",
"doctrine/dbal": "^2.9",
"josegonzalez/dotenv": "2.*",
"mobiledetect/mobiledetectlib": "2.*"
},
"require-dev": {
"cakephp/bake": "^1.1",
"cakephp/bake": "^2.0.10",
"cakephp/cakephp-codesniffer": "^3.0",
"cakephp/debug_kit": "^3.6",
"cakephp/debug_kit": "^4.0.6",
"phpstan/phpstan": "^0.12.18",
"phpunit/phpunit": "^8.0",
"psy/psysh": "@stable"
},
"suggest": {
Expand All @@ -40,7 +42,6 @@
"scripts": {
"post-install-cmd": "App\\Console\\Installer::postInstall",
"post-create-project-cmd": "App\\Console\\Installer::postInstall",
"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump",
"check": [
"@test",
"@cs-check"
Expand Down
Loading