Merge a9bc8ed into 13cde0b

.coveralls.yml

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

.gitattributes

@@ -0,0 +1,10 @@
+/.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,38 +2,24 @@ 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-plugin-flashmessenger
-    - GH_USER_NAME="Matthew Weier O'Phinney"
-    - GH_USER_EMAIL=matthew@weierophinney.net
-    - GH_REF=github.com/zendframework/zend-mvc-plugin-flashmessenger.git
-    - secure: "c58UgXfy+F7YJkW4bZKI82qY6GvtfKOiqyyybSon4Vrg3Xg9ZEhUFHbt/Bzaay+BwwKKoXqZww8c6WYPI6L/cPwe73iI2exHIesHMDUnhg+UOwOeM8mlwCBywePBfV3BuMH6BqeO+byAt4LEdKe+RpGCPEJY2FGc8o2MDDBcwOK4/6ydLg76ycXnduIhi74CFraHuYoW250povd/gdqNR8QMurdDsbEwr9R44rqV8EJ6P2XB8rpUuXZaiGfDYw626mIHhjUwrS34b/OeWg1+FYVuDqH2yZiYrrvt/bXlB+VPgwn9YuyTytgtWNqXVDtu54oFnllfkwGJGlcp4ra7H9E1fTqXTeggAgzk40AR8MkSn8kXJNi9EzREphNskA+wVdE1fmGbyTa2Xw5rLHK4xuFA26r6yxca0lUapdhTDknzgBdGoy2Jwk9pSyHPSIAp8th/0z54B16A5j6YkZW+UVmoa3Bk8ncFmEP4qwcKkbLiDF17icNNxyqdw56Lb9Ih15ZiUC6ZG81vWvXxZwN8dXTtDvtKGYkNRwcPtZEJq6z/nzBS3iyblKTH6FlAZr7REg23ZT5Emgr0sTwNP12oZP2Fqng4NHhvBePxFe1FjoLer9Ho/9ci0cW8LzTXzIbP/ahT1VdE5419AHtsWQF5nFlH/IfkF8X64x5gPKHAebw="
+    - 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
-        - 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
@@ -43,44 +29,48 @@ matrix:
     - 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 travis_retry curl -sSL https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh | bash ; 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
 
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then ./zf-mkdoc-theme/deploy.sh ; fi
+notifications:
+  email: false

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2016, 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,17 +1,17 @@
 # zend-mvc-plugin-flashmessenger
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-mvc-plugin-flashmessenger.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-mvc-plugin-flashmessenger)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-mvc-plugin-flashmessenger/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-mvc-plugin-flashmessenger?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-mvc-plugin-flashmessenger/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-mvc-plugin-flashmessenger?branch=master)
 
 Flash messages [derive from Rails](http://api.rubyonrails.org/classes/ActionDispatch/Flash.html),
 and are used to expose messages from one action to the next, after which they
 are cleared; a typical use case is with
-[Post/Redirect/Get](https://zendframework.github.io/zend-mvc-plugin-prg), where
+[Post/Redirect/Get](https://docs.zendframework.com/zend-mvc-plugin-prg), where
 they are created in the `POST` handler, and then displayed by the `GET` handler
 to indicate success or failure to the end-user.
 
 This component provides a flash messenger controller plugin for
-[zend-mvc](https://zendframework.github.io/zend-mvc/) versions 3.0 and up.
+[zend-mvc](https://docs.zendframework.com/zend-mvc/) versions 3.0 and up.
 
 - File issues at https://github.com/zendframework/zend-mvc-plugin-flashmessenger/issues
-- Documentation is at https://zendframework.github.io/zend-mvc-plugin-flashmessenger/
+- Documentation is at https://docs.zendframework.com/zend-mvc-plugin-flashmessenger/

composer.json

@@ -1,19 +1,32 @@
 {
     "name": "zendframework/zend-mvc-plugin-flashmessenger",
-    "description": " ",
+    "description": "Plugin for creating and exposing flash messages via zend-mvc controllers",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "mvc"
     ],
-    "homepage": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        },
-        "zf": {
-            "component": "Zend\\Mvc\\Plugin\\FlashMessenger"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-mvc-plugin-flashmessenger/",
+        "issues": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger/issues",
+        "source": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger",
+        "rss": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
+    "require": {
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-mvc": "^3.0",
+        "zendframework/zend-session": "^2.6.2",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+        "zendframework/zend-coding-standard": "~1.0.0"
+    },
+    "conflict": {
+        "zendframework/zend-mvc": "<3.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -25,28 +38,26 @@
             "ZendTest\\Mvc\\Plugin\\FlashMessenger\\": "test/"
         }
     },
-    "require": {
-        "php": "^5.6 || ^7.0",
-        "zendframework/zend-mvc": "^3.0",
-        "zendframework/zend-session": "^2.6.2",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
-    },
-    "require-dev": {
-        "phpunit/PHPUnit": "^4.5",
-        "squizlabs/php_codesniffer": "^2.3.1"
+    "config": {
+        "sort-packages": true
     },
-    "conflict": {
-        "zendframework/zend-mvc": "<3.0.0"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev",
+            "dev-develop": "1.1.x-dev"
+        },
+        "zf": {
+            "component": "Zend\\Mvc\\Plugin\\FlashMessenger"
+        }
     },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }