Housekeeping

.github/CONTRIBUTING.md

@@ -9,11 +9,12 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 * Fork the project.
 * Make your bug fix or feature addition.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
-* Send a pull request to the develop branch.
+* If editing the scripts, create a demo integration test.
+* Send a pull request to the develop branch with all the details.
 
 Please make sure that you have [set up your user name and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
 
-Due to time constraints, you may not always get a quick response. Please do not take delays personal and feel free to remind.
+Due to time constraints, you may not always get a quick response. Please do not take delays personally and feel free to remind.
 
 ## Coding Guidelines
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +1,37 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Nice, you found a bug!
 title: ''
-labels: ''
+labels: t:bug
-assignees: ''
+assignees: 'shivammathur'
 
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- Please describe the bug concisely. -->
+
+**Runners**
+<!-- Please mark the GitHub Action runner your workflow uses. -->
+- [ ] GitHub Hosted
+- [ ] Self Hosted
+
+**Operating systems**
+<!-- Please mention the operating systems your workflow uses. -->
+
+**PHP versions**
+<!-- Please mention the PHP versions your workflow uses. -->
 
 **To Reproduce**
-Please provide the GitHub Action `.yml` file.
+<!-- Please provide the relevant steps of your workflow `.yml` file. -->
 
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
-**Screenshots**
+**Screenshots/Logs**
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots or logs to help explain your problem. -->
 
 **Additional context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
+
+**Are you willing to submit a PR?**
+<!-- We accept pull requests targeting the develop branch. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +1,23 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest a new feature
 title: ''
-labels: ''
+labels: t:enhancement
-assignees: ''
+assignees: 'shivammathur'
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+**Describe the feature**
-A clear and concise description of what the problem is. Ex. I want to improve [...]
+<!-- Please describe concisely the feature you want to add. -->
 
-**Describe the solution you'd like**
+**Underlying issue**
-A clear and concise description of what you want to happen.
+<!-- Please describe the issue this would solve. -->
 
-**Describe alternatives you've considered**
+**Describe alternatives**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- Please mention any alternative solutions you've considered. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->
+
+**Are you willing to submit a PR?**
+<!-- We accept pull requests targeting the develop branch. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,14 +7,13 @@ labels: bug or enhancement
 
 ## A Pull Request should be associated with an Issue.
 
-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
+> If you're fixing a bug, adding a new feature or improving something please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular direction.
 
-Related issue: 
+Related issue: <!-- Please link the related issue -->
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.
 
 ### Description
 
@@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
+- [ ] `npm test` returns with no unit test errors and all code covered.
+
+> In case this PR edits any scripts:
+
+- [ ] I have checked the edited scripts for syntax.
+- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/PULL_REQUEST_TEMPLATE/FIX.md

@@ -7,14 +7,13 @@ labels: bug
 
 ## A Pull Request should be associated with an Issue.
 
-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
+> If you're offering a new feature or fixing anything, please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular direction.
 
-Related issue: 
+Related issue: <!-- Please link the related issue -->
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.
 
 ### Description
 
@@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
+- [ ] `npm test` returns with no unit test errors and all code covered.
+
+> In case this PR edits any scripts:
+
+- [ ] I have checked the edited scripts for syntax.
+- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md

@@ -7,14 +7,13 @@ labels: enhancement
 
 ## A Pull Request should be associated with an Issue.
 
-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
+> If you're improving a feature please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular direction.
 
-Related issue: 
+Related issue: <!-- Please link the related issue -->
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.
 
 ### Description
 
@@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
+- [ ] `npm test` returns with no unit test errors and all code covered.
+
+> In case this PR edits any scripts:
+
+- [ ] I have checked the edited scripts for syntax.
+- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md

@@ -1,20 +1,19 @@
 ---
 name: 🎉 New Feature
-about: You have implemented some neat idea that you want to make part of setup-php?
+about: You have added a new feature to setup-php?
 labels: enhancement
 
 ---
 
 ## A Pull Request should be associated with an Issue.
 
-> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
+> If you're adding a new feature please provide the details in Issues,
-> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> so that the development can be pointed in the intended direction.
-> and potentially we'll be able to point development in a particular direction.
 
-Related issue: 
+Related issue: <!-- Please link the related issue -->
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
+> Thank you for your contribution.
 
 ### Description
 
@@ -26,7 +25,12 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors.
+- [ ] `npm test` returns with no unit test errors and all code covered.
+
+> In case this PR edits any scripts:
+
+- [ ] I have checked the edited scripts for syntax.
+- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/SECURITY.md

@@ -7,7 +7,7 @@ The following versions of this project are supported for security updates.
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.8.x   | :white_check_mark: |
-| 2.1.x   | :white_check_mark: |
+| 2.2.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 

package-lock.json

@@ -980,9 +980,9 @@
       }
     },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.1",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz",
-      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
+      "integrity": "sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
@@ -995,9 +995,9 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "1.1.1",
+      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "*",
@@ -1005,9 +1005,9 @@
       }
     },
     "@types/jest": {
-      "version": "25.2.1",
+      "version": "25.2.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.2.tgz",
-      "integrity": "sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==",
+      "integrity": "sha512-aRctFbG8Pb7DSLzUt/fEtL3q/GKb9mretFuYhRub2J0q6NhzBYbx9HTQzHrWgBNIxYOlxGNVe6Z54cpbUt+Few==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",
@@ -1051,9 +1051,9 @@
       "dev": true
     },
     "@types/yargs": {
-      "version": "15.0.4",
+      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
+      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
@@ -6298,9 +6298,9 @@
       "dev": true
     },
     "spdx-expression-parse": {
-      "version": "3.0.0",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -6710,9 +6710,9 @@
       }
     },
     "tslib": {
-      "version": "1.12.0",
+      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-5rxCQkP0kytf4H1T4xz1imjxaUUPMvc5aWp0rJ/VMIN7ClRiH1FwFvBt8wOeMasp/epeUnmSW6CixSIePtiLqA==",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
       "dev": true
     },
     "tsutils": {

package.json

@@ -50,7 +50,7 @@
   "husky": {
     "skipCI": true,
     "hooks": {
-      "pre-commit": "npm run format && npm run lint && npm run build && npm run release"
+      "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
     }
   }
 }

src/scripts/ext/xdebug.sh

@@ -1,3 +0,0 @@
-cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
-cd xdebug || echo "Failed to clone Xdebug"
-sudo ./rebuild.sh

src/scripts/ext/xdebug_darwin.sh

@@ -1,6 +0,0 @@
-cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
-cd xdebug || echo "Failed to clone Xdebug"
-sudo phpize
-sudo ./configure
-sudo make
-sudo cp modules/xdebug.so "$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")"