138 - Upgrading to Laravel 5.5

This commit is contained in:
Adam Wathan
2017-09-11 16:24:01 -04:00
parent 4e00a17fa0
commit de0c35724f
5 changed files with 707 additions and 295 deletions

View File

@@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*",
"laravel/framework": "5.5.*",
"zondicons/blade-bridge": "^0.1.0",
"stripe/stripe-php": "^4.3",
"guzzlehttp/guzzle": "^6.2",
@@ -16,10 +16,11 @@
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "1.0.0-alpha1",
"phpunit/phpunit": "~5.0",
"phpunit/phpunit": "~6.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"laravel/tinker": "^1.0"
"laravel/tinker": "^1.0",
"filp/whoops": "~2.0"
},
"autoload": {
"classmap": [

976
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -49,7 +49,7 @@ class PurchaseTicketsTest extends TestCase
private function assertValidationError($field)
{
$this->assertResponseStatus(422);
$this->assertArrayHasKey($field, $this->decodeResponseJson());
$this->assertArrayHasKey($field, $this->decodeResponseJson()['errors']);
}
/** @test */

View File

@@ -35,19 +35,19 @@ class SendAttendeeMessageTest extends TestCase
SendAttendeeMessage::dispatch($message);
Mail::assertSent(AttendeeMessageEmail::class, function ($mail) use ($message) {
Mail::assertQueued(AttendeeMessageEmail::class, function ($mail) use ($message) {
return $mail->hasTo('alex@example.com')
&& $mail->attendeeMessage->is($message);
});
Mail::assertSent(AttendeeMessageEmail::class, function ($mail) use ($message) {
Mail::assertQueued(AttendeeMessageEmail::class, function ($mail) use ($message) {
return $mail->hasTo('sam@example.com')
&& $mail->attendeeMessage->is($message);
});
Mail::assertSent(AttendeeMessageEmail::class, function ($mail) use ($message) {
Mail::assertQueued(AttendeeMessageEmail::class, function ($mail) use ($message) {
return $mail->hasTo('taylor@example.com')
&& $mail->attendeeMessage->is($message);
});
Mail::assertNotSent(AttendeeMessageEmail::class, function ($mail) {
Mail::assertNotQueued(AttendeeMessageEmail::class, function ($mail) {
return $mail->hasTo('jane@example.com');
});
}

View File

@@ -47,13 +47,8 @@ class OrderTest extends TestCase
/** @test */
function retrieving_a_nonexistent_order_by_confirmation_number_throws_an_exception()
{
try {
$this->expectException(ModelNotFoundException::class);
Order::findByConfirmationNumber('NONEXISTENTCONFIRMATIONNUMBER');
} catch (ModelNotFoundException $e) {
return;
}
$this->fail('No matching order was found for the specified confirmation number, but an exception was not thrown.');
}
/** @test */