Skip to content

Commit

Permalink
Merge pull request #15 from BRACKETS-by-TRIAD/laravel-7
Browse files Browse the repository at this point in the history
Laravel 7
  • Loading branch information
RichardDominik authored Apr 29, 2020
2 parents 1f15ccd + fa612f5 commit 4717e3c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
"require": {
"php": "^7.2.5",
"illuminate/support": "^6.0|^7.0",
"spatie/laravel-medialibrary": "^7.0"
"spatie/laravel-medialibrary": "^7.19"
},
"require-dev": {
"phpunit/phpunit": "^8.5",
"orchestra/testbench": "~4.0"
"orchestra/testbench": "~4.0|~5.0"
},
"autoload": {
"classmap": [],
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/FileUploaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function a_user_can_upload_file()
'name' => 'test',
'path' => $this->getTestFilesDirectory('test.psd'),
];
$file = new UploadedFile($data['path'], $data['name'], 'image/jpeg', filesize($data['path']), null, true);
$file = new UploadedFile($data['path'], $data['name'], 'image/jpeg', null, true);
$response = $this->call('POST', 'upload', $data, [], ['file' => $file], [], []);

$response->assertStatus(200);
Expand Down
5 changes: 3 additions & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Gate;
use Orchestra\Testbench\TestCase as Orchestra;
use Throwable;
use Spatie\MediaLibrary\MediaLibraryServiceProvider;

abstract class TestCase extends Orchestra
Expand Down Expand Up @@ -242,12 +243,12 @@ public function __construct()
{
}

public function report(Exception $e)
public function report(Throwable $e)
{
// no-op
}

public function render($request, Exception $e)
public function render($request, Throwable $e)
{
throw $e;
}
Expand Down

0 comments on commit 4717e3c

Please sign in to comment.