Merge branch 'release/v0.1.1'

loopline-systems · Jan 11, 2016 · d7d930d · d7d930d
2 parents 38d0142 + c5b5c57
commit d7d930d
Show file tree

Hide file tree

Showing 5 changed files with 1,887 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 config/
 !config/config.sample.yml
 vendor/
-composer.lock
 tests/LooplineSystems/CloseIoApi/Api/LiveApiTest.php
 tests/build/logs/
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,7 @@
 language: php
 
 php:
-    - 5.5
-    - 5.4
+    - 5.6
 
 before_script:
     - /home/travis/.phpenv/versions/`phpenv version-name`/bin/composer self-update

diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
         }
     ],
     "require": {
-        "php": "^5.4.0",
-        "symfony/yaml": "^2.5.2",
+        "php": "^5.6.0",
+        "symfony/yaml": "^2.5",
         "zendframework/zend-filter": "^2.3.3",
         "doctrine/inflector": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.3.5",
+        "phpunit/phpunit": "^5.0.0",
         "codeclimate/php-test-reporter": "^0.1.2"
     },
     "autoload": {