Merge branch 'hotfix/24'

Close #24

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/

LICENSE.md

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

composer.json

@@ -15,14 +15,6 @@
         "zendframework",
         "zend-expressive"
     ],
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "zf": {
-            "config-provider": "Zend\\Expressive\\Hal\\ConfigProvider"
-        }
-    },
     "support": {
         "docs": "https://docs.zendframework.com/zend-expressive-hal/",
         "issues": "https://github.com/zendframework/zend-expressive-hal/issues",
@@ -65,6 +57,14 @@
             "ZendTest\\Expressive\\Hal\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "zf": {
+            "config-provider": "Zend\\Expressive\\Hal\\ConfigProvider"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",

docs/ISSUE_TEMPLATE.md

@@ -1,11 +1,19 @@
+ - [ ] I was not able to find an [open](https://github.com/zendframework/zend-expressive-hal/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-expressive-hal/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/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,25 @@
 Provide a narrative description of what you are trying to accomplish:
 
-- Are you fixing a bug?
-  - Detail how the bug is invoked currently.
-  - Detail the original, incorrect behavior.
-  - Detail the new, expected behavior.
+- [ ] Are you fixing a bug?
+  - [ ] Detail how the bug is invoked currently.
+  - [ ] Detail the original, incorrect behavior.
+  - [ ] Detail the new, expected behavior.
+  - [ ] Base your feature on the `master` branch, and submit against that branch.
+  - [ ] Add a regression test that demonstrates the bug, and proves the fix.
+  - [ ] Add a `CHANGELOG.md` entry for the fix.
 
-- Are you creating a new feature?
-  - Why is the new feature needed? What purpose does it serve?
-  - How will users use the new feature?
+- [ ] Are you creating a new feature?
+  - [ ] Why is the new feature needed? What purpose does it serve?
+  - [ ] How will users use the new feature?
+  - [ ] Base your feature on the `develop` branch, and submit against that branch.
+  - [ ] Add only one feature per pull request; split multiple features over multiple pull requests
+  - [ ] Add tests for the new feature.
+  - [ ] Add documentation for the new feature.
+  - [ ] Add a `CHANGELOG.md` entry for the new feature.
 
-- Is this related to quality assurance?
-  - Detail why the changes are necessary.
+- [ ] Is this related to quality assurance?
+  <!-- Detail why the changes are necessary -->
 
-- Is this related to documentation?
-  - Is it a typographical and/or grammatical fix?
-  - Is it new documentation?
+- [ ] Is this related to documentation?
+  <!-- Is it a typographical and/or grammatical fix? -->
+  <!-- Is it new documentation? -->