Skip to content

Commit 26f6873

Browse files
authored
Merge pull request #9 from WorkorderApp/feature/laravel-12-upgrade
chore: Updated dependencies (to allow for Laravel 12) and gitignore (for IDE and OS files)
2 parents db4c30c + 4117b9a commit 26f6873

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.gitignore

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# OS files
2+
.DS_Store
3+
Thumbs.db
4+
5+
# Dependencies
16
vendor
27
composer.lock
3-
.phpunit.result.cache
8+
9+
# Testing
10+
.phpunit.result.cache
11+
12+
# IDEA
13+
/.idea
14+
/.nova
15+
/.vscode
16+
/.fleet

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"ext-json": "*",
3131
"avadim/fast-excel-writer": "^6.6",
3232
"avadim/fast-excel-reader": "^2.26",
33-
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
34-
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0"
33+
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
34+
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0"
3535
},
3636
"require-dev": {
3737
"orchestra/testbench": "^4.0|^5.0|^6.0",

0 commit comments

Comments
 (0)