Skip to content
This repository has been archived by the owner on Mar 7, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/3.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastiaanluca committed Jul 2, 2019
2 parents 675086a + dfffaf2 commit 782f121
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 31 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2
42 changes: 21 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
language: php

php:
- "7.2"
- "7.3"
- 7.4snapshot
- "7.2"
- "7.3"
- 7.4snapshot

cache:
directories:
- $HOME/.composer/cache
- $HOME/.composer/cache

env:
matrix:
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"

matrix:
allow_failures:
- php: 7.4snapshot
- env: LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
- env: LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
- php: 7.4snapshot
- env: LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
- env: LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
fast_finish: true

before_install:
- composer validate --strict
- travis_retry composer self-update
- if [[ -n ${MINIMUM_STABILITY} ]]; then composer config minimum-stability ${MINIMUM_STABILITY}; echo "Minimum stability set to ${MINIMUM_STABILITY}"; else echo "Minimum stability left unchanged"; fi
- if [[ -n ${ORCHESTRA_VERSION} ]]; then composer require orchestra/testbench=${ORCHESTRA_VERSION} --dev --no-update; else echo "orchestra/testbench version requirement left unchanged"; fi
- composer require laravel/framework=${LARAVEL_VERSION} --no-update
- composer validate --strict
- travis_retry composer self-update
- if [[ -n ${MINIMUM_STABILITY} ]]; then composer config minimum-stability ${MINIMUM_STABILITY}; echo "Minimum stability set to ${MINIMUM_STABILITY}"; else echo "Minimum stability left unchanged"; fi
- if [[ -n ${ORCHESTRA_VERSION} ]]; then composer require orchestra/testbench=${ORCHESTRA_VERSION} --dev --no-update; else echo "orchestra/testbench version requirement left unchanged"; fi
- composer require laravel/framework=${LARAVEL_VERSION} --no-update

install:
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist

script:
- vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
- vendor/bin/phpunit
- vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
- vendor/bin/phpunit

branches:
only:
- master
- develop
- master
- develop

notifications:
email:
Expand Down
25 changes: 19 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
[![Software license][license-badge]](LICENSE.md)
[![Build status][travis-badge]][link-travis]
[![Total downloads][downloads-badge]][link-packagist]
[![Total stars][stars-badge]][link-github]

[![Read my blog][blog-link-badge]][link-blog]
[![View my other packages and projects][packages-link-badge]][link-packages]
[![Follow @sebastiaanluca on Twitter][twitter-profile-badge]][link-twitter]
[![Share this package on Twitter][twitter-share-badge]][link-twitter-share]

__Load Laravel service providers and facades based on the current environment.__
**Load Laravel service providers and facades based on the current environment.**

Specify the service providers and facades to load per environment directly in your configuration file. No more need to add lengthy blocks of conditionals to your `AppServiceProvider`, do it all in the app configuration file like you would with any service provider and facade!

Expand Down Expand Up @@ -87,7 +88,17 @@ composer require sebastiaanluca/laravel-conditional-providers

### Conditional providers

Disable Laravel service provider auto-discovery by adding it to your composer.json relevant section.
Disable auto-discovery of the package's service provider by adding it to your composer.json's relevant section:

```json
"extra": {
"laravel": {
"dont-discover": [
"barryvdh/laravel-debugbar"
]
}
},
```

Once you're set up, simply __add a providers array per environment__ to your `config/app.php` file:

Expand Down Expand Up @@ -192,24 +203,26 @@ My name is Sebastiaan and I'm a freelance Laravel developer specializing in buil

Have a project that could use some guidance? Send me an e-mail at [[email protected]][link-author-email]!

[version-badge]: https://poser.pugx.org/sebastiaanluca/laravel-conditional-providers/version
[license-badge]: https://img.shields.io/badge/license-MIT-brightgreen.svg
[version-badge]: https://img.shields.io/packagist/v/sebastiaanluca/laravel-conditional-providers.svg?label=stable
[license-badge]: https://img.shields.io/badge/license-MIT-informational.svg
[travis-badge]: https://img.shields.io/travis/sebastiaanluca/laravel-conditional-providers/master.svg
[downloads-badge]: https://img.shields.io/packagist/dt/sebastiaanluca/laravel-conditional-providers.svg
[downloads-badge]: https://img.shields.io/packagist/dt/sebastiaanluca/laravel-conditional-providers.svg?color=brightgreen
[stars-badge]: https://img.shields.io/github/stars/sebastiaanluca/laravel-conditional-providers.svg?color=brightgreen

[blog-link-badge]: https://img.shields.io/badge/link-blog-lightgrey.svg
[packages-link-badge]: https://img.shields.io/badge/link-other_packages-lightgrey.svg
[twitter-profile-badge]: https://img.shields.io/twitter/follow/sebastiaanluca.svg?style=social
[twitter-share-badge]: https://img.shields.io/twitter/url/http/shields.io.svg?style=social

[link-github]: https://github.com/sebastiaanluca/laravel-conditional-providers
[link-packagist]: https://packagist.org/packages/sebastiaanluca/laravel-conditional-providers
[link-travis]: https://travis-ci.org/sebastiaanluca/laravel-conditional-providers
[link-twitter-share]: https://twitter.com/intent/tweet?text=Check%20out%20this%20extensive%20set%20of%20generic%20PHP%20helper%20functions%20and%20classes!%20Via%20@sebastiaanluca%20https://github.com/sebastiaanluca/laravel-conditional-providers
[link-contributors]: ../../contributors

[link-portfolio]: https://www.sebastiaanluca.com
[link-blog]: https://blog.sebastiaanluca.com
[link-packages]: https://packagist.org/packages/sebastiaanluca
[link-twitter]: https://twitter.com/sebastiaanluca
[link-twitter-share]: https://twitter.com/intent/tweet?text=Load%20Laravel%20service%20providers%20based%20on%20the%20current%20environment.%20https%3A%2F%2Fgithub.com%2Fsebastiaanluca%2Flaravel-helpers%20via%20%40sebastiaanluca
[link-github-profile]: https://github.com/sebastiaanluca
[link-author-email]: mailto:[email protected]
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
}
],
"require": {
"laravel/framework": "~5.8.0",
"php": "^7.2"
"php": "^7.2",
"laravel/framework": "5.8.*"
},
"require-dev": {
"orchestra/testbench": "~3.8.0",
"phpunit/phpunit": "^8.0",
"orchestra/testbench": "3.8.*",
"phpunit/phpunit": "^8.2",
"sebastiaanluca/php-codesniffer-ruleset": "^0.3.0"
},
"autoload": {
Expand Down

0 comments on commit 782f121

Please sign in to comment.