Skip to content

Commit f9b4a8b

Browse files
authored
Merge pull request #9 from Jaspaul/change/add-laravel-5-5-support
[Change] Adds Laravel 5.5 Support
2 parents 59f1ae8 + 66758bf commit f9b4a8b

File tree

3 files changed

+29
-13
lines changed

3 files changed

+29
-13
lines changed

.travis.yml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
language: php
22

3-
php:
4-
- 7.0
5-
- 7.1
3+
matrix:
4+
include:
5+
- php: 7.0
6+
env: ILLUMINATE_VERSION=5.4.*
7+
- php: 7.0
8+
env: ILLUMINATE_VERSION=5.5.*
9+
- php: 7.1
10+
env: ILLUMINATE_VERSION=5.4.*
11+
- php: 7.1
12+
env: ILLUMINATE_VERSION=5.5.*
13+
- php: 7.2
14+
env: ILLUMINATE_VERSION=5.4.*
15+
- php: 7.2
16+
env: ILLUMINATE_VERSION=5.5.*
617

7-
before_script: composer install
18+
before_install:
19+
- composer require "illuminate/cache:${ILLUMINATE_VERSION}" --no-update
20+
- composer require "illuminate/config:${ILLUMINATE_VERSION}" --no-update
21+
- composer require "illuminate/console:${ILLUMINATE_VERSION}" --no-update
22+
- composer require "illuminate/database:${ILLUMINATE_VERSION}" --no-update
23+
- composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update
24+
25+
before_script: composer update --prefer-source --no-interaction --dev
826

927
script:
1028
- vendor/bin/phpunit

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
"minimum-stability": "stable",
1313
"require": {
1414
"php": ">=7.0",
15-
"illuminate/cache": "^5.3",
16-
"illuminate/config": "^5.3",
17-
"illuminate/console": "^5.3",
18-
"illuminate/database": "^5.3",
19-
"illuminate/support": "^5.3",
15+
"illuminate/cache": "^5.4",
16+
"illuminate/config": "^5.4",
17+
"illuminate/console": "^5.4",
18+
"illuminate/database": "^5.4",
19+
"illuminate/support": "^5.4",
2020
"opensoft/rollout": "^2.2"
2121
},
2222
"require-dev": {
2323
"codeclimate/php-test-reporter": "^0.4.4",
2424
"friendsofphp/php-cs-fixer": "^2.1",
25-
"illuminate/container": "^5.3|^5.4",
25+
"illuminate/container": "^5.4",
2626
"mockery/mockery": "^0.9.9",
2727
"orchestra/testbench": "^3.4",
2828
"phpunit/phpunit": "^6.0",

src/ServiceProvider.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ public function boot()
3636
$config = $app->make(Config::class);
3737

3838
if ($config->get('laravel-rollout.storage') === 'database') {
39-
$connection = $app->make(ConnectionInterface::class);
40-
$encrypter = $app->make(Encrypter::class);
4139
$table = $config->get('laravel-rollout.table');
4240

43-
$repository = new Repository(new DatabaseStore($connection, $encrypter, $table));
41+
$repository = new Repository($app->makeWith(DatabaseStore::class, ['table' => $table]));
4442
$driver = new Cache($repository);
4543
} else {
4644
$driver = new Cache($app->make('cache.store'));

0 commit comments

Comments
 (0)