Skip to content

Commit

Permalink
Merge pull request #9 from Jaspaul/change/add-laravel-5-5-support
Browse files Browse the repository at this point in the history
[Change] Adds Laravel 5.5 Support
  • Loading branch information
Jaspaul authored Jan 4, 2018
2 parents 59f1ae8 + 66758bf commit f9b4a8b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 13 deletions.
26 changes: 22 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
language: php

php:
- 7.0
- 7.1
matrix:
include:
- php: 7.0
env: ILLUMINATE_VERSION=5.4.*
- php: 7.0
env: ILLUMINATE_VERSION=5.5.*
- php: 7.1
env: ILLUMINATE_VERSION=5.4.*
- php: 7.1
env: ILLUMINATE_VERSION=5.5.*
- php: 7.2
env: ILLUMINATE_VERSION=5.4.*
- php: 7.2
env: ILLUMINATE_VERSION=5.5.*

before_script: composer install
before_install:
- composer require "illuminate/cache:${ILLUMINATE_VERSION}" --no-update
- composer require "illuminate/config:${ILLUMINATE_VERSION}" --no-update
- composer require "illuminate/console:${ILLUMINATE_VERSION}" --no-update
- composer require "illuminate/database:${ILLUMINATE_VERSION}" --no-update
- composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update

before_script: composer update --prefer-source --no-interaction --dev

script:
- vendor/bin/phpunit
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"minimum-stability": "stable",
"require": {
"php": ">=7.0",
"illuminate/cache": "^5.3",
"illuminate/config": "^5.3",
"illuminate/console": "^5.3",
"illuminate/database": "^5.3",
"illuminate/support": "^5.3",
"illuminate/cache": "^5.4",
"illuminate/config": "^5.4",
"illuminate/console": "^5.4",
"illuminate/database": "^5.4",
"illuminate/support": "^5.4",
"opensoft/rollout": "^2.2"
},
"require-dev": {
"codeclimate/php-test-reporter": "^0.4.4",
"friendsofphp/php-cs-fixer": "^2.1",
"illuminate/container": "^5.3|^5.4",
"illuminate/container": "^5.4",
"mockery/mockery": "^0.9.9",
"orchestra/testbench": "^3.4",
"phpunit/phpunit": "^6.0",
Expand Down
4 changes: 1 addition & 3 deletions src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ public function boot()
$config = $app->make(Config::class);

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

$repository = new Repository(new DatabaseStore($connection, $encrypter, $table));
$repository = new Repository($app->makeWith(DatabaseStore::class, ['table' => $table]));
$driver = new Cache($repository);
} else {
$driver = new Cache($app->make('cache.store'));
Expand Down

0 comments on commit f9b4a8b

Please sign in to comment.