Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #397 from fruitcake/v1-backport
Browse files Browse the repository at this point in the history
Support same as 0.11 dependencies
  • Loading branch information
barryvdh authored Dec 31, 2019
2 parents 364ecec + 627ae83 commit 4b1f95a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ language: php

matrix:
include:
- php: 7.0
env: LARAVEL='5.5.*' TESTBENCH='3.5.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.1
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.1
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
- php: 7.1
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
- php: 7.1
Expand Down Expand Up @@ -52,7 +58,8 @@ before_script:
- phpenv config-rm xdebug.ini || true

before_install:
- travis_retry composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update
- travis_retry composer remove phpro/grumphp --no-interaction --no-update --dev
- travis_retry composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update

install:
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
}
],
"require": {
"php": "^7.1.3",
"illuminate/support": "^5.8|^6.0|^7.0",
"symfony/http-foundation": "~4.2.12|^4.3.8|^5.0",
"symfony/http-kernel": "~4.2.12|^4.3.8|^5.0",
"php": ">=7",
"illuminate/support": "^5.5|^6.0|^7.0",
"symfony/http-foundation": "^3.3|^4|^5.0",
"symfony/http-kernel": "^3.3|^4|^5.0",
"asm89/stack-cors": "^1.3"
},
"require-dev": {
"laravel/framework": "^5.8|^6.0|^7.0",
"laravel/framework": "^5.5|^6.0|^7.0",
"phpunit/phpunit": "^6.0|^7.0|^8.0",
"orchestra/testbench": "^3.5|^4.0|^5.0",
"squizlabs/php_codesniffer": "^3.5",
Expand Down
2 changes: 1 addition & 1 deletion src/CorsServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function register()
public function boot()
{
if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
$this->publishes([$this->configPath() => config_path('cors.php')], ['cors']);
$this->publishes([$this->configPath() => config_path('cors.php')], 'cors');
} elseif ($this->app instanceof LumenApplication) {
$this->app->configure('cors');
}
Expand Down

0 comments on commit 4b1f95a

Please sign in to comment.