Merge branch 'release/1.1.2'

.gitignore

@@ -1 +1,2 @@
 vendor
+composer.lock

.travis.yml

@@ -1,30 +1,22 @@
 language: php
-
-sudo: false
-
 php:
+  - 5.6
   - 7.0
   - 7.1
-
-env:
-  global:
-    - setup=basic
-    - coverage=no
-
+  - nightly
+matrix:
+  allow_failures:
+    - php: 5.6
+    - php: nightly
+  fast_finish: true
 cache:
   directories:
     - $HOME/.composer/cache/files
-
 before_script:
-  - composer config discard-changes true
-  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
-  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi
-  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
-  - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "satooshi/php-coveralls=~0.7" --prefer-dist --no-interaction --dev; fi
-
+  - phpenv global "$TRAVIS_PHP_VERSION"
+  - composer config extra.platform.php $TRAVIS_PHP_VERSION
+install:
+  - flags="--ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress"
+  - travis_wait 30 composer install $flags
 script:
-  - if [[ $coverage = 'yes' ]]; then ./vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
-  - if [[ $coverage = 'no' ]]; then ./vendor/bin/phpunit -c phpunit.xml; fi
-
-after_script:
-  - if [[ $setup = 'coveralls' ]]; then php vendor/bin/coveralls -v; fi
+  - ./vendor/bin/phpunit -c phpunit.xml

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.2](https://github.com/superhelio/commands/tree/1.1.2) (2017-09-15)
+- Removed composer.lock, only to enable correct CI builds
+- Reworked travis-ci.org configuration, builds should now go green
+
 ## [1.1.1](https://github.com/superhelio/commands/tree/1.1.1) (2017-08-27)
 - Typo fixes
 - Removal of dead/unnecessary code

composer.json

@@ -21,7 +21,7 @@
         "illuminate/support": "~5.2"
     },
     "require-dev": {
-        "phpunit/phpunit" : "4.*",
+        "phpunit/phpunit" : "~5.7",
         "orchestra/testbench": "~3.0",
         "doctrine/dbal": "~2.3"
     },