Skip to content

Commit ecb3c14

Browse files
committed
Merge tag '2.0.4'
Hotfix release - hotfix update PHP version and license
2 parents 42d09fe + 81e8a16 commit ecb3c14

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

.travis.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
language: php
22

33
php:
4-
- "7.2"
5-
- "7.1"
6-
- "7.0"
74
- "5.6"
8-
- "5.5"
9-
- "5.4"
10-
- "nightly"
5+
- "7.0"
6+
- "7.1"
7+
- "7.2"
118

129
env:
1310
- CONTAO_VERSION=~3.5.5
1411

15-
# Exclude impossible Contao Version combinations.
16-
matrix:
17-
exclude:
18-
1912
sudo: false
2013

2114
before_install:
22-
- phpenv config-add travis.php.ini
15+
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
2316

2417
install:
2518
- travis_retry composer self-update && composer --version

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"source": "https://github.com/MetaModels/attribute_translatedfile"
3333
},
3434
"require": {
35-
"php": "^5.4 | ^7.0",
35+
"php": "^5.6 || ^7.0",
3636
"contao/core": "^3.5.5",
3737
"contao-community-alliance/composer-plugin": "~2.0",
3838
"contao-community-alliance/dc-general": "~2.0@beta",

travis.php.ini

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)