Skip to content

Commit cbb9b70

Browse files
committed
Laravel 5.4 support
1 parent b86a60b commit cbb9b70

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@
2020
]
2121
},
2222
"require": {
23-
"laravel/framework": "~5.2.0|~5.3.0",
23+
"laravel/framework": "~5.2.0|~5.3.0|~5.4.0",
2424
"jeroennoten/laravel-package-helper": "^3.1",
2525
"league/flysystem": "^1.0.8",
2626
"intervention/image": "^2.3"
2727
},
2828
"require-dev": {
2929
"phpunit/phpunit": "~4.8.20",
30-
"orchestra/testbench": "~3.2.4|~3.3.0",
30+
"orchestra/database": "~3.2.0|~3.3.0|~3.4.0-dev",
31+
"orchestra/testbench": "~3.2.4|~3.3.0|~3.4.0-dev",
3132
"mockery/mockery": "^0.9.5",
3233
"hamcrest/hamcrest-php": "~1.2",
33-
"league/flysystem-aws-s3-v3": "^1.0.1"
34+
"league/flysystem-aws-s3-v3": "^1.0.1",
35+
"laravel/browser-kit-testing": "^1.0"
3436
}
3537
}

tests/ServiceProviderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function testDefaultDisk()
2626
public function testCloudDisk()
2727
{
2828
$this->app['config']['ckeditor.disk'] = 's3';
29+
$this->app['config']['filesystems.disks.s3.region'] = 'your-region';
2930

3031
/** @var ImageUploader $imageUploader */
3132
$imageUploader = $this->app->make(ImageUploader::class);

tests/TestCase.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
class TestCase extends \Orchestra\Testbench\TestCase
55
{
6+
use \Laravel\BrowserKitTesting\Concerns\MakesHttpRequests;
7+
use \Laravel\BrowserKitTesting\Concerns\InteractsWithSession;
8+
69
/** @before */
710
public function injectDependencies()
811
{

0 commit comments

Comments
 (0)