Merge pull request #11 from Litipk/castarco-patch-1

castarco · castarco · commit 737c7a2b7f8e · 2015-03-05T19:26:08.000+01:00
Preparing a new release.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
 		"litipk/php-exceptions": ">=0.1.2"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "3.7.*",
-		"squizlabs/php_codesniffer": "1.5.1",
+		"phpunit/phpunit": "4.3.*",
+		"squizlabs/php_codesniffer": "2.3.*",
 		"satooshi/php-coveralls": "dev-master"
 	},
 	"minimum-stability": "stable",

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 language: php
 php:
 +  - 5.6
   - 5.5
   - 5.4
   - 5.3