Merge branch 'hotfix/10' into release-1.0.0

Forward port #10

Author: weierophinney

.gitattributes

@@ -1,10 +1,10 @@
-/docs export-ignore
-/test 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,7 +1,7 @@
-docs/html/
-vendor/
-zf-mkdoc-theme/
-clover.xml
-coveralls-upload.json
-phpunit.xml
-zf-mkdoc-theme.tgz
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -33,12 +33,9 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: 7.2
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) {year}, Zend Technologies USA, Inc.
+Copyright (c) 2017, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

composer.json

@@ -1,22 +1,20 @@
 {
     "name": "zendframework/zend-expressive-authorization",
     "description": "Authorization middleware for Expressive and PSR-7 applications",
-    "homepage": "https://docs.zendframework.com/zend-expressive-authorization/",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "authorization",
         "middleware",
         "psr-7",
+        "zf",
+        "zendframework",
         "zend-expressive"
     ],
-    "config": {
-        "sort-packages": true
-    },
     "support": {
         "docs": "https://docs.zendframework.com/zend-expressive-authorization/",
         "issues": "https://github.com/zendframework/zend-expressive-authorization/issues",
         "source": "https://github.com/zendframework/zend-expressive-authorization",
+        "rss": "https://github.com/zendframework/zend-expressive-authorization/releases.atom",
         "slack": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
@@ -30,7 +28,7 @@
         "zendframework/zend-expressive-router": "^2.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0.8",
+        "phpunit/phpunit": "^6.4.3",
         "roave/security-advisories": "dev-master",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
@@ -41,15 +39,6 @@
         "zendframework/zend-expressive-authorization-acl": "^0.1 || ^1.0; provides a zend-permissions-acl-backed adapter",
         "zendframework/zend-expressive-authorization-rbac": "^0.1 || ^1.0; provides a zend-permissions-rbac-backed adapter"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "^0.3.x-dev",
-            "dev-release-1.0.0": "^1.0.x-dev"
-        },
-        "zf": {
-            "config-provider": "Zend\\Expressive\\Authorization\\ConfigProvider"
-        }
-    },
     "autoload": {
         "psr-4": {
             "Zend\\Expressive\\Authorization\\": "src/"
@@ -60,15 +49,27 @@
             "ZendTest\\Expressive\\Authorization\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "^0.3.x-dev",
+            "dev-release-1.0.0": "^1.0.x-dev"
+        },
+        "zf": {
+            "config-provider": "Zend\\Expressive\\Authorization\\ConfigProvider"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v"
     }
 }

composer.lock

@@ -1,11 +1,19 @@
-Provide a narrative description of the issue.
+ - [ ] I was not able to find an [open](https://github.com/zendframework/zend-expressive-authorization/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-expressive-authorization/issues?q=is%3Aclosed) issue matching what I'm seeing.
+ - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
+
+Provide a narrative description of what you are trying to accomplish.
 
 ### Code to reproduce the issue
 
+<!-- Please provide the minimum code necessary to recreate the issue -->
+
 ```php
 ```
 
 ### Expected results
 
+<!-- What do you think should have happened? -->
+
 ### Actual results
 
+<!-- What did you actually observe? -->

docs/ISSUE_TEMPLATE.md

@@ -18,8 +18,8 @@ Provide a narrative description of what you are trying to accomplish:
   - [ ] Add a `CHANGELOG.md` entry for the new feature.
 
 - [ ] Is this related to quality assurance?
-  - [ ] Detail why the changes are necessary.
+  <!-- Detail why the changes are necessary -->
 
 - [ ] Is this related to documentation?
-  - [ ] Is it a typographical and/or grammatical fix?
-  - [ ] Is it new documentation?
+  <!-- Is it a typographical and/or grammatical fix? -->
+  <!-- Is it new documentation? -->

docs/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ Zend Framework offers three support channels:
 - For real-time questions, use our
   [Slack](https://zendframework-slack.herokuapp.com)
 - For detailed questions (e.g., those requiring examples) use our
-  [forums](https://discourse.zendframework.com/c/questions/components)
+  [forums](https://discourse.zendframework.com/c/questions/expressive)
 - To report issues, use this repository's
   [issue tracker](https://github.com/zendframework/zend-expressive-authorization/issues/new)