Skip to content

Commit

Permalink
Merge pull request #34 from OskarStark/patch-1
Browse files Browse the repository at this point in the history
allow Symfony 4 and removed php 5.2 .travis.yml
  • Loading branch information
DracoBlue authored Dec 12, 2017
2 parents 517f12d + 56aaf17 commit 7945483
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: php
matrix:
include:
- php: 5.2
dist: precise
- php: 5.3
dist: precise
- php: 5.4
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ element, you can do this:

## Changelog

- 2.1.1 (2017/12/12)
- added compatibility to symfony/yaml 4.x
- 2.1.0 (2017/03/13)
- added `\` to escape dots in path
- 2.0.1 (2016/06/28)
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
],
"require": {
"php": ">=5.3.0",
"dracoblue/naith": "1.1.*",
"phpoffice/phpexcel": "1.7.*",
"symfony/yaml": ">=2.0 <4.0"
"dracoblue/naith": "^1.1",
"phpoffice/phpexcel": "^1.7",
"symfony/yaml": "^2.0 || ^3.0 || ^4.0"
},
"autoload": {
"classmap": [ "src/" ]
Expand Down

0 comments on commit 7945483

Please sign in to comment.