Skip to content

Commit 4e1b300

Browse files
authoredJun 13, 2017
Merge pull request #2337 from CachetHQ/laravel-54
✨ Upgrade to Laravel 5.4
2 parents bd34264 + 3d5a1ab commit 4e1b300

36 files changed

+971
-883
lines changed
 

‎app/Presenters/IncidentPresenter.php

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ class IncidentPresenter extends BasePresenter implements Arrayable
5353
public function __construct(DateFactory $dates, Incident $resource)
5454
{
5555
$this->dates = $dates;
56-
57-
parent::__construct($resource);
5856
}
5957

6058
/**

‎app/Presenters/SchedulePresenter.php

-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ class SchedulePresenter extends BasePresenter implements Arrayable
4545
public function __construct(DateFactory $dates, Schedule $resource)
4646
{
4747
$this->dates = $dates;
48-
49-
parent::__construct($resource);
5048
}
5149

5250
/**

‎composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,23 @@
4545
"graham-campbell/markdown": "^7.1",
4646
"guzzlehttp/guzzle": "^6.2.1",
4747
"jenssegers/date": "^3.2",
48-
"laravel/framework": "5.3.*",
49-
"mccool/laravel-auto-presenter": "^4.3",
48+
"laravel/framework": "^5.4",
49+
"mccool/laravel-auto-presenter": "^5.0",
5050
"nexmo/client": "@beta",
5151
"pragmarx/google2fa": "^0.7.1",
5252
"predis/predis": "^1.1",
5353
"roumen/feed": "^2.10",
5454
"twig/twig": "^1.26.1"
5555
},
5656
"require-dev": {
57-
"alt-three/testbench": "^1.9",
57+
"alt-three/testbench": "^1.11",
5858
"filp/whoops": "^2.1",
5959
"fzaninotto/faker": "^1.6",
6060
"graham-campbell/testbench-core": "^1.1",
61+
"laravel/browser-kit-testing": "^1.0",
6162
"mockery/mockery": "0.9.5",
62-
"phpunit/phpunit": "~5.0",
63+
"nikic/php-parser": "^3.0",
64+
"phpunit/phpunit": "5.7.20",
6365
"symfony/css-selector": "^3.1",
6466
"symfony/dom-crawler": "^3.1",
6567
"tightenco/mailthief": "^0.3.2"
@@ -113,6 +115,6 @@
113115
"dev-master": "2.4-dev"
114116
}
115117
},
116-
"minimum-stability": "stable",
118+
"minimum-stability": "dev",
117119
"prefer-stable": true
118120
}

0 commit comments

Comments
 (0)