Merge pull request #39 from webimpress/updates

PHP 7.2 + QA Tools + Docs - follow up #20, #28, #29, #33

Conflicts:
	.gitignore
	.travis.yml
	composer.json
	composer.lock
	phpunit.xml.dist

.gitattributes

@@ -1,8 +1,10 @@
-/test export-ignore
-/vendor export-ignore
-.coveralls.yml export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs 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,15 +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,25 +2,14 @@ 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-console"
-    - GH_USER_NAME="Matthew Weier O'Phinney"
-    - GH_USER_EMAIL="matthew@weierophinney.net"
-    - GH_REF="github.com/zendframework/zend-console.git"
-    - secure: "can3MouUZEPZnJUSetVwM7dZ4Wm876zomJnY2PpbWheZm1vE9nEFIVntk5oL4GJfHd2rr8l3Ot2o/IeD//8Zvinf0lVqaX8sPgq8xLcKSozeIiSzblbGKVCwDHZO5LnKTyXo+dWgKRziajBd4A6cNeO1s7srrYlroF/G4gajf29KAXJhQ8b2JtwIgjpK/n7M9pACBwzDs+5BcGfKLh6KhNJQv41tTzH69+9wMV1Lsn2ksA/CJoOGWKO0EJyu7FcXh7PugfqfmW988074WnJ57pPsOToLrYUHtaIh/6iv6S9/yYXqYw+Pdjkc3SJvWRfnAvvOaASkRsQT2jD3NknLrK0tbu7Z0EWfHYdTpAqsX9S0u/vAeyQKxG/5SotWwLH9zUxgoPgZ4rnVZwoVkOxv1rzOD/28CNToaQZ/GDQTsaEvLNg51TGCMmmyJDzK4p7WSVxLKmiM106SGj/H3brmTr0l32u8itvyfyZaJwIk7aQP/xIFgqA/qpApd/ykSTRs7u8CIj1PhdRP6FyYwUc+xn8d9Ylat1NoKJI4P6BajuUEPCij8joowb0ep05DgIMGqgU8aHuCBeIz0RiWQrbn4V9pzchVFfmd5KCUV87hoCsXYo1RNVDW4kpaOj7OG9R1tKSHVmyHmmKgy8dElYQrDIQDDgDEWFUxzE9gMQb4vQM="
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   include:
@@ -30,9 +19,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
-        - 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
@@ -42,42 +29,48 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - CS_CHECK=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:
   - 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 --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
-  - travis_retry composer install $COMPOSER_ARGS
-  - composer show
+  - 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 [[ $TEST_COVERAGE == 'true' ]]; then composer run-script test-coverage --timeout=400 -- --verbose ; else composer run-script test --timeout=300 -- --verbose ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; 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
-
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
+Copyright (c) 2005-2017, 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,10 +1,10 @@
 # zend-console
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-console.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-console)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-console/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-console?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-console/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-console?branch=master)
 
 `Zend\Console` is a component to design and implement console applications in PHP.
 
 
 - File issues at https://github.com/zendframework/zend-console/issues
-- Documentation is at https://zendframework.github.io/zend-console/
+- Documentation is at https://docs.zendframework.com/zend-console/

composer.json

@@ -1,17 +1,34 @@
 {
     "name": "zendframework/zend-console",
-    "description": " ",
+    "description": "Build console applications using getopt syntax or routing, complete with prompts",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "console"
     ],
-    "homepage": "https://github.com/zendframework/zend-console",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-console/",
+        "issues": "https://github.com/zendframework/zend-console/issues",
+        "source": "https://github.com/zendframework/zend-console",
+        "rss": "https://github.com/zendframework/zend-console/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
+    "require": {
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-filter": "^2.7.2",
+        "zendframework/zend-json": "^2.6 || ^3.0",
+        "zendframework/zend-validator": "^2.10.1"
+    },
+    "suggest": {
+        "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
+        "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
     },
     "autoload": {
         "psr-4": {
@@ -23,20 +40,14 @@
             "ZendTest\\Console\\": "test/"
         }
     },
-    "require": {
-        "php": "^5.6 || ^7.0",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
-    },
-    "require-dev": {
-        "phpunit/PHPUnit": "^4.8",
-        "zendframework/zend-filter": "^2.6",
-        "zendframework/zend-json": "^2.6",
-        "zendframework/zend-validator": "^2.6",
-        "zendframework/zend-coding-standard": "~1.0.0"
+    "config": {
+        "sort-packages": true
     },
-    "suggest": {
-        "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
-        "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
+        }
     },
     "scripts": {
         "check": [
@@ -46,7 +57,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }