Merge 9d3a795 into 172a023

slevomat · Dec 22, 2015 · 0f46b7e · 0f46b7e
2 parents 172a023 + 9d3a795
commit 0f46b7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: php
 php:
+  - 5.5
   - 5.6
   - 7.0
 before_script:

diff --git a/composer.json b/composer.json
@@ -6,13 +6,13 @@
 		"preferred-install": "source"
 	},
 	"require": {
-		"php": "^5.6|^7.0",
+		"php": "^5.5|^5.6|^7.0",
 		"jakub-onderka/php-parallel-lint": "~0.8"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^0.8",
 		"phing/phing": "^2.9",
-		"phpunit/phpunit": "^5.0",
+		"phpunit/phpunit": "^4.0",
 		"satooshi/php-coveralls": "dev-master",
 		"squizlabs/php_codesniffer": "2.5.0 as 2.3.4"
 	},