Merging develop to master in preparation for 1.1.0 release.

.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-identity
-    - GH_USER_NAME="Matthew Weier O'Phinney"
-    - GH_USER_EMAIL=matthew@weierophinney.net
-    - GH_REF=github.com/zendframework/zend-mvc-plugin-identity.git
-    - secure: "WPYEeq3qwouOF1vphassU8EjQKJuoPaYeqjJeMx7prYZFFJQFo/h8PiTh1PW0tA05TAcoH3/oSy0TFuan2CS3vmhHGS0kS7OYpYZZ29AUb5mgGSds+Ngrwe7NXqQFoP9etnfRGrKNxSYtEnUwpsO8NNxy9FuGxuAhDmyzDS5ffqAyeTMEZHKlvrMph9lAtM9+1z7o5+VUAHakHJZscOp0WEY8o3q3sQ0wvGMHRfa6siVtMjPHUZbNOEneaTBvoF1EAP8NKi18BXjehyYCa9e60gbmGwQkr3xu+wVkLz7bluz3U9Qr4A4x7NVclViDhyOHqVg/pe0fKHb+TwMg98BhofwgaTRRctvrZQ4smir9YdoUvpXc7ywWxt8IJQbelZyk3X8JDXnSxcu2+W4Aqiean5Do7R8a+Vzum51djY8adtNllUjYtA4pH1Slx/yXdspu6u5bYmdj8F2eRtaJvESwdbJ0dg0p7EaOiJZD7XYtxqviqBbYBpV7rjuehArNtcdS20nTobun5cYw+nolLfklhpGymYqG/jGaAemzNbknpFWTncL1NIi0Oo8hLDLQNg+6/sNLZDKrlSbjH0Tf6jXW2A4WA7kE7z5NeWwFLMtuwqXR7EFTKz5txC8yQm9N7QdAz1f3zFzj/9jihGJVnqwnc8e7MVvranapOZh5inMfcY="
+    - 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

CHANGELOG.md

@@ -2,19 +2,25 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.0.1 - TBD
+## 1.1.0 - 2018-04-30
 
 ### Added
 
-- Nothing.
+- [#11](https://github.com/zendframework/zend-mvc-plugin-identity/pull/11) adds support for PHP 7.1 and 7.2.
+
+### Changed
+
+- [#9](https://github.com/zendframework/zend-mvc-plugin-identity/pull/9) modifies the `IdentityFactory` such that it will attempt to lookup the
+  `Zend\Authentication\AuthenticationServiceInterface` service if no `Zend\Authentication\AuthenticationService`
+  service is present in the container, and use it to seed the `Identity` plugin if found.
 
 ### Deprecated
 
 - Nothing.
 
 ### Removed
 
-- Nothing.
+- [#11](https://github.com/zendframework/zend-mvc-plugin-identity/pull/11) removes support for HHVM.
 
 ### Fixed
 

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,12 +1,12 @@
 # zend-mvc-plugin-identity
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-mvc-plugin-identity.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-mvc-plugin-identity)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-mvc-plugin-identity/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-mvc-plugin-identity?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-mvc-plugin-identity/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-mvc-plugin-identity?branch=master)
 
 Provides a
-[zend-mvc](https://zendframework.github.io/zend-mvc/) plugin (for versions 3.0
+[zend-mvc](https://docs.zendframework.com/zend-mvc/) plugin (for versions 3.0
 and up) that allows retrieving the current identity as provided by
 [zend-authentication](https://github.com/zendframework/zend-authentication).
 
 - File issues at https://github.com/zendframework/zend-mvc-plugin-identity/issues
-- Documentation is at https://zendframework.github.io/zend-mvc-plugin-identity/
+- Documentation is at https://docs.zendframework.com/zend-mvc-plugin-identity/

composer.json

@@ -1,19 +1,33 @@
 {
     "name": "zendframework/zend-mvc-plugin-identity",
-    "description": " ",
+    "description": "Plugin for retrieving the current authenticated identity within zend-mvc controllers",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "mvc"
     ],
-    "homepage": "https://github.com/zendframework/zend-mvc-plugin-identity",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        },
-        "zf": {
-            "component": "Zend\\Mvc\\Plugin\\Identity"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-mvc-plugin-identity/",
+        "issues": "https://github.com/zendframework/zend-mvc-plugin-identity/issues",
+        "source": "https://github.com/zendframework/zend-mvc-plugin-identity",
+        "rss": "https://github.com/zendframework/zend-mvc-plugin-identity/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",
+        "zendframework/zend-authentication": "^2.5.3",
+        "zendframework/zend-mvc": "^3.0",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+    },
+    "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,29 +39,26 @@
             "ZendTest\\Mvc\\Plugin\\Identity\\": "test/"
         }
     },
-    "require": {
-        "php": "^5.6 || ^7.0",
-        "container-interop/container-interop": "^1.1",
-        "zendframework/zend-mvc": "^3.0",
-        "zendframework/zend-authentication": "^2.5.3",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-    },
-    "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.1.x-dev",
+            "dev-develop": "1.2.x-dev"
+        },
+        "zf": {
+            "component": "Zend\\Mvc\\Plugin\\Identity"
+        }
     },
     "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"
     }
 }