Merge branch 'feature/5-expressive-3'

Close #5

.gitattributes

@@ -4,5 +4,6 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
+composer.lock export-ignore
 phpcs.xml export-ignore
 phpunit.xml.dist export-ignore

.gitignore

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

.travis.yml

@@ -5,34 +5,47 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction"
 
 matrix:
-  fast_finish: true
   include:
-    - php: 5.5
+    - php: 7.1
       env:
-        - EXECUTE_DOC_CHECK=true
-    - php: 5.6
+        - DEPS=lowest
+    - php: 7.1
       env:
-        - EXECUTE_CS_CHECK=true
-    - php: 7
-    - php: hhvm
-  allow_failures:
-    - php: hhvm
-
-before_install:
-  - composer self-update
-  - if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then composer require --dev --no-update phly/bookdown2mkdocs ; fi
+        - DEPS=locked
+        - CS_CHECK=true
+        - DOC_CHECK=true
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
+      env:
+        - DEPS=latest
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
-  - composer info -i
+  - travis_retry composer install $COMPOSER_ARGS
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - stty cols 120 && composer show
 
 before_script:
-  - if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then cp mkdocs.yml mkdocs.yml.orig ; fi
+  - if [[ $DOC_CHECK == 'true' ]]; then cp mkdocs.yml mkdocs.yml.orig ; fi
 
 script:
   - composer test
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs ; fi
-  - if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then make mkdocs ; diff mkdocs.yml mkdocs.yml.orig ; return $? ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
+  - if [[ $DOC_CHECK == 'true' ]]; then make mkdocs ; diff mkdocs.yml mkdocs.yml.orig ; return $? ; fi
+
+notifications:
+  email: false

CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file, in reverse
 chronological order by release.
 
+## 2.0.0 - 2018-03-27
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#5](https://github.com/phly/phly-expressive-mustache/pull/5) updates
+  dependencies to use  zendframework/zend-expressive-helpers `^5.0` and
+  zendframework/zend-expressive-template `^2.0` (Expressive 3 compatibility).
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#5](https://github.com/phly/phly-expressive-mustache/pull/5) removes support
+  for PHP versions prior to 7.1.
+
+### Fixed
+
+- Nothing.
+
 ## 1.1.0 - 2017-03-06
 
 ### Added

composer.json

@@ -13,15 +13,15 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "phly/phly-mustache": "^2.0",
-        "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1",
-        "zendframework/zend-expressive-template": "^1.0.4"
+        "zendframework/zend-expressive-helpers": "^5.0",
+        "zendframework/zend-expressive-template": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7 || ^6.0",
-        "squizlabs/php_codesniffer": "^2.3.1",
-        "psr/container": "^1.0"
+        "phpunit/phpunit": "^7.0.2",
+        "psr/container": "^1.0",
+        "zendframework/zend-coding-standard": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,18 +34,15 @@
         }
     },
     "scripts": {
-        "test": [
-            "phpunit"
-        ],
-        "cs": [
-            "phpcs"
-        ],
-        "cs-fix": [
-            "phpcbf"
-        ],
         "check": [
-            "@cs",
+            "@cs-check",
             "@test"
-        ]
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always"
+    },
+    "config": {
+        "sort-packages": true
     }
 }