Skip to content
This repository has been archived by the owner on Mar 20, 2024. It is now read-only.

Upgrade to laravel 6 dependencies #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade to laravel 6 dependencies #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d6cccd
Updated the dependencies to work with laravel 6.4 and higher
martinnaughton Dec 29, 2019
d6495cf
Updated readme to reflect the 6.x change
martinnaughton Dec 29, 2019
946ae26
Update to php 7.2 as some of the dependencies only work on 7.2
martinnaughton Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Concierge - Laravel 5.x
# Concierge - Laravel 6.x

## ABOUT THIS BRANCH

Expand Down Expand Up @@ -120,4 +120,4 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
[link-code-quality]: https://scrutinizer-ci.com/g/timegridio/concierge
[link-downloads]: https://packagist.org/packages/timegridio/concierge
[link-author]: https://github.com/alariva
[link-contributors]: ../../contributors
[link-contributors]: ../../contributors
16 changes: 8 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "timegridio/concierge",
"type": "library",
"description": "A Laravel 5.x reservation library",
"description": "A Laravel 6.x reservation library",
"keywords": [
"laravel",
"timegrid",
Expand All @@ -20,15 +20,15 @@
}
],
"require": {
"php": ">=5.5.9",
"illuminate/support": "~5.3",
"laravel/framework": "5.4.36 || ~5.5 || ~5.6",
"mccool/laravel-auto-presenter": "~4.0 || ~5.0 || ~7.0",
"doctrine/dbal": "~2.5"
"php": "~7.2",
"illuminate/support": "~6.4",
"laravel/framework": "~6.4",
"mccool/laravel-auto-presenter": "~7.0",
"doctrine/dbal": "~2.10"
},
"require-dev": {
"phpunit/phpunit": "~5.0",
"phpspec/phpspec": "~2.1",
"phpunit/phpunit": "~8.0",
"phpspec/phpspec": "~4.0",
"codeclimate/php-test-reporter": "dev-master",
"laracasts/testdummy": "~2.3",
"orchestra/testbench": "~3.3"
Expand Down
Loading