Skip to content
This repository has been archived by the owner on Sep 28, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/v3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
James McNab committed Jun 21, 2018
2 parents 06fe1b1 + d2488d3 commit 99627f2
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 21 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: php

php:
- '5.6'
- '7.0'
- '7.1'
- '7.2'

before_script:
- travis_retry composer self-update
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [3.0.0] - 2018-06-21
### Added
- Upgraded to Laravel 5.5 and 5.6.

### Removed
- No longer supports PHP 5.6 and 7.0.

## [2.0.0] - 2017-09-15
### Added
- Basic integration tests (under PHP 5.6, 7.0 and 7.1).
- Add change log (`CHANGELOG.md`) and upgrade guide (`UPGRADE.md`).
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
3.0.0
22 changes: 15 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
}
],
"require": {
"php": ">=5.6.4",
"illuminate/support": "5.4.*",
"illuminate/database": "5.4.*"
"php": "^7.1.3",
"illuminate/support": "5.5.*|5.6.*",
"illuminate/database": "5.5.*|5.6.*"
},
"require-dev": {
"orchestra/testbench": "^3.4",
"phpspec/phpspec": "~2.0",
"phpunit/phpunit": "^5.7"
"orchestra/testbench": "3.5.*|3.6.*",
"phpspec/phpspec": "^4.3",
"phpunit/phpunit": "^6.0|^7.0"
},
"autoload": {
"psr-4": {
Expand All @@ -31,7 +31,15 @@
},
"extra": {
"branch-alias": {
"dev-develop": "2.x-dev"
"dev-develop": "3.x-dev"
},
"laravel": {
"providers": [
"Jameswmcnab\\ConfigDb\\ConfigDbServiceProvider"
],
"aliases": {
"ConfigDb": "Jameswmcnab\\ConfigDb\\Facades\\ConfigDb"
}
}
},
"minimum-stability": "stable",
Expand Down
6 changes: 5 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
verbose="true"
>
<testsuites>
<testsuite name="Integration">
<directory>./tests/Integration</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
</phpunit>
10 changes: 1 addition & 9 deletions src/ConfigDbServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?php namespace Jameswmcnab\ConfigDb;

use Illuminate\Foundation\Application;
use Illuminate\Foundation\AliasLoader;
use Illuminate\Support\ServiceProvider;
use Jameswmcnab\ConfigDb\Facades\ConfigDb;

class ConfigDbServiceProvider extends ServiceProvider
{
Expand Down Expand Up @@ -48,12 +46,6 @@ public function register()
$this->app->singleton('config-db', function (Application $app) {
return $app->make(RepositoryInterface::class);
});

// Add facade alias
$this->app->booting(function () {
$loader = AliasLoader::getInstance();
$loader->alias('ConfigDb', ConfigDb::class);
});
}

/**
Expand Down Expand Up @@ -92,6 +84,6 @@ protected function registerDefaultRepository()
*/
public function provides()
{
return array('config-db');
return ['config-db'];
}
}

0 comments on commit 99627f2

Please sign in to comment.