Merging develop to master in preparation for 1.2.0 release.

Author: weierophinney

.coveralls.yml

@@ -0,0 +1,2 @@
+coverage_clover: clover.xml
+json_path: coveralls-upload.json

.gitattributes

@@ -1,8 +1,10 @@
-/doc export-ignore
-/test export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-mkdocs.yml export-ignore
-phpcs.xml export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,16 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-doc/html/
-tmp/
-zf-mkdoc-theme/
-
-clover.xml
-coveralls-upload.json
-phpunit.xml
-vendor
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -2,85 +2,75 @@ sudo: false
 
 language: php
 
-branches:
-  except:
-    - /^release-.*$/
-    - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
-    - SITE_URL=https://zendframework.github.io/zend-mvc-console
-    - GH_USER_NAME="Matthew Weier O'Phinney"
-    - [email protected]
-    - GH_REF=github.com/zendframework/zend-mvc-console.git
-    - secure: "NNw71pdP0hUxEbTmEr4q3K62cOcCksi+XFGwr1sVQsc8W5WI5G18JGZwf3ZM9nXYWsyhmv2ongDAVxpzOrCLDFhLrYnvuDgI2YqKP4B9v/bJZnRpYgyH5A5j8lwmtWyZ4y4RbUuFKPg2JzhVQG/ECovMdSGo9P3RFGWHpid/T69aJuk4iE9dIjn4in+WaYqpdLva539p7fo1zCD4ZJU0e9lqWLXlk0myca0zG/VEdu8/zUJm26YAWvP8L4Sv03yomze2SS+WtOnUSgPpp8bMGWgs7ryQcuL42PJIuKaEXFDNy4gX82WUC45kyXOqEDm9qwDHpAmWHU1tA5bIob+6dOIMSqf1mLUMR9XSolvtI3NegsFa67w6DtX8boTBGJGszUZRF1fkuQgTVTMNHv5xjBYlgaKtuS3skzngTrLqyplgyHPOXKSGCf4FhJoT7u6fVzcaODR3jGqXmPiyNl6CHAl8cXCN5vtDpVvjTB/GasxsDebVC9LqqlooNUkEUUUTsCsJuOxgA15504ETU0hW6ZjOeXA/sE7FrvFBsHm/xLBsAktwaY4PXHy8oyquhcy5O//U4LR8s+zoHOLr8DwRw6Ku+V3u+7AqIM89lrh0KXHK++LFwLIcI02BS+/+EHr4uC2ZKjyxI0ZmKaHNZrfXfuA7k/2eKfLw1NmD7/gCJ/E="
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
-  fast_finish: true
   include:
     - php: 5.6
       env:
         - DEPS=lowest
     - php: 5.6
       env:
         - DEPS=locked
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
-        - TEST_COVERAGE=true
     - php: 7
       env:
         - DEPS=lowest
     - php: 7
       env:
         - DEPS=locked
-        - CHECK_CS=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.1
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: 7.1
       env:
         - DEPS=locked
-    - php: hhvm
+        - CS_CHECK=true
+        - TEST_COVERAGE=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
-  allow_failures:
-    - php: hhvm
-
-notifications:
-  irc: "irc.freenode.org#zftalk.dev"
-  email: false
 
 before_install:
-  - travis_retry composer self-update
-  - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
+  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
+  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - 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
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --no-update --dev $COMPOSER_ARGS satooshi/php-coveralls ; fi
-  - travis_retry composer install $COMPOSER_ARGS
-  - composer show --installed
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
-  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
-
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false

CHANGELOG.md

@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.1.12 - TBD
+## 1.2.0 - 2018-04-30
 
 ### Added
 
-- Nothing.
+- [#24](https://github.com/zendframework/zend-mvc-console/pull/24) adds support for PHP 7.1 and 7.2.
 
 ### Changed
 
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#24](https://github.com/zendframework/zend-mvc-console/pull/24) removes support for HHVM.
 
 ### Fixed
 

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
+Copyright (c) 2005-2018, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
 - Neither the name of Zend Technologies USA, Inc. nor the names of its
   contributors may be used to endorse or promote products derived from this

README.md

@@ -1,7 +1,7 @@
 # zend-mvc-console
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-mvc-console.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-mvc-console)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-mvc-console/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-mvc-console?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-mvc-console/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-mvc-console?branch=master)
 
 zend-mvc-console provides integration between:
 
@@ -14,7 +14,7 @@ and replaces the console functionality found in the v2 releases of the latter
 three components.
 
 - File issues at https://github.com/zendframework/zend-mvc-console/issues
-- Documentation is at https://zendframework.github.io/zend-mvc-console/
+- Documentation is at https://docs.zendframework.com/zend-mvc-console/
 
 ## Installation
 
@@ -23,10 +23,10 @@ $ composer require zendframework/zend-mvc-console
 ```
 
 Assuming you are using the [component
-installer](https://zendframework.github.io/zend-component-installer), doing so
+installer](https://docs.zendframework.com/zend-component-installer), doing so
 will enable the component in your application, allowing you to immediately start
 developing console applications via your MVC. If you are not, please read the
-[introduction](https://zendframework.github.io/zend-mvc-console/intro/) for
+[introduction](https://docs.zendframework.com/zend-mvc-console/intro/) for
 details on how to register the functionality with your application.
 
 ## For use with zend-mvc v3 and up
@@ -36,6 +36,6 @@ zend-mvc releases prior to v3, as it is not compatible.
 
 ## Migrating from zend-mvc v2 console to zend-mvc-console
 
-Please see the [migration guide](http://zendframework.github.io/zend-mvc-console/migration/v2-to-v3/)
-for details on how to migrate your existing zend-mvc console functionality to 
+Please see the [migration guide](http://docs.zendframework.com/zend-mvc-console/migration/v2-to-v3/)
+for details on how to migrate your existing zend-mvc console functionality to
 the features exposed by this component.

TODO.md

@@ -1,13 +1,21 @@
 {
     "name": "zendframework/zend-mvc-console",
-    "description": " ",
+    "description": "Integration between zend-mvc and zend-console",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "mvc",
         "console"
     ],
-    "homepage": "https://github.com/zendframework/zend-mvc-console",
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-mvc-console/",
+        "issues": "https://github.com/zendframework/zend-mvc-console/issues",
+        "source": "https://github.com/zendframework/zend-mvc-console",
+        "rss": "https://github.com/zendframework/zend-mvc-console/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
     "require": {
         "php": "^5.6 || ^7.0",
         "container-interop/container-interop": "^1.1",
@@ -22,17 +30,16 @@
         "zendframework/zend-view": "^2.6.3"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^2.3.1",
-        "phpunit/PHPUnit": "^4.5",
-        "zendframework/zend-filter": "^2.6.1",
-        "zendframework/zend-form": "^2.7"
-    },
-    "suggest": {
-        "zendframework/zend-filter": "^2.6.1, to filter rendered results"
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-filter": "^2.6.1"
     },
     "conflict": {
         "zendframework/zend-mvc": "<3.0.0"
     },
+    "suggest": {
+        "zendframework/zend-filter": "^2.6.1, to filter rendered results"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Mvc\\Console\\": "src/"
@@ -43,10 +50,13 @@
             "ZendTest\\Mvc\\Console\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev",
-            "dev-develop": "1.2-dev"
+            "dev-master": "1.2.x-dev",
+            "dev-develop": "1.3.x-dev"
         },
         "zf": {
             "component": "Zend\\Mvc\\Console"
@@ -57,10 +67,9 @@
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls",
         "cs-check": "phpcs",
-        "cs-fix": "phpcbf fix -v",
-        "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }