Merge pull request #9 from zak956/master

support for PHP 7.0 and 7.1
uecode · May 2, 2017 · 5c28ce2 · 5c28ce2
2 parents b52fd7d + 38c932d
commit 5c28ce2
Show file tree

Hide file tree

Showing 8 changed files with 587 additions and 273 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,15 @@
 language: php
+
 php:
   - "5.5"
-  - "5.4"
+  - "5.6"
+  - "7.0"
+  - "7.1"
+
 before_script:
   - composer self-update
   - composer install --prefer-source
-  
+
 script: phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:

diff --git a/composer.json b/composer.json
@@ -17,17 +17,17 @@
         }
     ],
     "require": {
-        "php":                        "~5.4",
-        "guzzlehttp/guzzle":          "~5.0",
-        "guzzlehttp/guzzle-services": "~0.5",
+        "php":                        ">=5.5",
+        "guzzlehttp/guzzle":          "5.3.1",
+        "guzzlehttp/guzzle-services": "~0.6",
         "monolog/monolog":            "~1.7",
         "symfony/filesystem":         "~2.5",
         "symfony/console":            "~2.5"
     },
     "require-dev": {
-        "mockery/mockery":    "dev-master",
+        "mockery/mockery":    "~0.9.4",
         "phpunit/phpunit":    "~4.0",
-        "raulfraile/ladybug": "dev-master"
+        "raulfraile/ladybug": "~1.0.13"
     },
     "autoload": {
         "psr-4": {