Skip to content

Commit

Permalink
Prepare 3.5 branch.
Browse files Browse the repository at this point in the history
Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Jan 1, 2017
1 parent aba5ea7 commit b09b17a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: php
sudo: false

php:
- 5.6
- 7.0
- 7.1

Expand All @@ -28,11 +27,11 @@ after_script:

matrix:
include:
- php: 5.6
- php: 7.0
env: setup=lowest
- php: 5.6
- php: 7.0
env: setup=stable
- php: 5.6
- php: 7.0
env: setup=coveralls coverage=yes
allow_failures:
- env: setup=stable
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
}
},
"require": {
"php": ">=5.6.0",
"laravel/framework": "~5.4.0",
"orchestra/database": "~3.4.0",
"php": ">=7.0",
"laravel/framework": "~5.5.0",
"orchestra/database": "~3.5.0",
"fzaninotto/faker": "~1.4",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/css-selector": "3.2.*",

This comment has been minimized.

Copy link
@GrahamCampbell

GrahamCampbell Jan 1, 2017

Contributor

these are one version too low i think?

This comment has been minimized.

Copy link
@GrahamCampbell

GrahamCampbell Jan 1, 2017

Contributor

laravel 5.4 is symfony 3.2

This comment has been minimized.

Copy link
@GrahamCampbell

GrahamCampbell Jan 1, 2017

Contributor

this is the 5.5 branch?

This comment has been minimized.

Copy link
@crynobone

crynobone Jan 1, 2017

Author Member

it's not ready yet

This comment has been minimized.

Copy link
@GrahamCampbell

GrahamCampbell Jan 1, 2017

Contributor

right, but the 3.4 branch here should be symfony 3.2, not 3.1?

"symfony/dom-crawler": "3.2.*"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "~5.0"
},
"suggest": {
"phpunit/phpunit": "Allow to use PHPUnit for testing your Laravel Application/Package (~4.0|~5.0)."
"phpunit/phpunit": "Allow to use PHPUnit for testing your Laravel Application/Package (~5.0)."
},
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "3.5-dev"
}
},
"minimum-stability": "dev"
Expand Down

0 comments on commit b09b17a

Please sign in to comment.