Skip to content

Commit 70954fb

Browse files
committed
Merge pull request #232 from shivammathur/develop
2.3.0
2 parents b84dd3c + 65e6516 commit 70954fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+810
-679
lines changed

.eslintrc.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"env": { "node": true, "jest": true },
33
"parser": "@typescript-eslint/parser",
4-
"parserOptions": { "ecmaVersion": 2020, "sourceType": "module" },
4+
"parserOptions": { "ecmaVersion": 2019, "sourceType": "module" },
55
"extends": [
66
"eslint:recommended",
77
"plugin:@typescript-eslint/eslint-recommended",
@@ -12,11 +12,5 @@
1212
"plugin:prettier/recommended",
1313
"prettier/@typescript-eslint"
1414
],
15-
"plugins": ["@typescript-eslint", "jest"],
16-
"rules": {
17-
"camelcase": "off",
18-
"require-atomic-updates": "off",
19-
"@typescript-eslint/ban-ts-ignore": "off",
20-
"@typescript-eslint/camelcase": "off"
21-
}
15+
"plugins": ["@typescript-eslint", "jest"]
2216
}

.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@
22

33
tidelift: "npm/setup-php"
44
community_bridge: setup-php
5-
issuehunt: shivammathur
65
patreon: shivammathur
7-
liberapay: shivammathur
86
custom: https://www.paypal.me/shivammathur

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
name: Bug report
33
about: Nice, you found a bug!
44
title: ''
5-
labels: t:bug
5+
labels: 'bug'
66
assignees: 'shivammathur'
77

88
---
99

1010
**Describe the bug**
1111
<!-- Please describe the bug concisely. -->
1212

13+
**Version**
14+
- [ ] I have checked releases and the bug exists in the latest patch version of `v1` or `v2`.
15+
- [ ] `v2`
16+
- [ ] `v1`
17+
1318
**Runners**
1419
<!-- Please mark the GitHub Action runner your workflow uses. -->
1520
- [ ] GitHub Hosted

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
name: Feature request
33
about: Suggest a new feature
44
title: ''
5-
labels: t:enhancement
5+
labels: 'enhancement'
66
assignees: 'shivammathur'
77

88
---
99

1010
**Describe the feature**
1111
<!-- Please describe concisely the feature you want to add. -->
1212

13+
**Version**
14+
- [ ] I have checked releases and the feature is missing in the latest patch version of `v2`.
15+
1316
**Underlying issue**
1417
<!-- Please describe the issue this would solve. -->
1518

.github/PULL_REQUEST_TEMPLATE/FIX.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/SECURITY.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ The following versions of this project are supported for security updates.
66

77
| Version | Supported |
88
| ------- | ------------------ |
9-
| 1.8.x | :white_check_mark: |
10-
| 2.2.x | :white_check_mark: |
9+
| 1.9.x | :white_check_mark: |
10+
| 2.3.x | :white_check_mark: |
1111

1212
## Supported PHP Versions
1313

@@ -22,7 +22,7 @@ This security policy only applies to the latest patches of the following PHP ver
2222

2323
## Reporting a Vulnerability
2424

25-
If you have found any issues that might have security implications in the versions supported, please send a report privately to [[email protected]](mailto:[email protected])
25+
If you have found any issues that might have security implications in the versions supported, please send a report privately to [[email protected]](mailto:[email protected]).
2626
Do not report security reports publicly.
2727

2828
## Tidelift

.github/workflows/experimental-workflow.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
28+
operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
2929
php-versions: ['8.0']
3030
env:
3131
extensions: xml, opcache, pcov
@@ -34,28 +34,6 @@ jobs:
3434
- name: Checkout
3535
uses: actions/checkout@v2
3636

37-
- name: Setup Node.js 12.x
38-
uses: actions/setup-node@v1
39-
with:
40-
node-version: 12.x
41-
42-
- name: Install dependencies
43-
run: npm install
44-
45-
- name: Prettier Format Check
46-
run: npm run format-check
47-
48-
- name: ESLint Check
49-
run: npm run lint
50-
51-
- name: Run tests
52-
run: npm test
53-
54-
- name: Send Coverage
55-
continue-on-error: true
56-
timeout-minutes: 1
57-
run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
58-
5937
- name: Setup cache environment
6038
id: cache-env
6139
uses: shivammathur/cache-extensions@develop
@@ -65,7 +43,7 @@ jobs:
6543
key: ${{ env.key }}
6644

6745
- name: Cache extensions
68-
uses: actions/cache@v1
46+
uses: actions/cache@v2
6947
with:
7048
path: ${{ steps.cache-env.outputs.dir }}
7149
key: ${{ steps.cache-env.outputs.key }}

.github/workflows/node-workflow.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Node workflow
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
- develop
7+
- verbose
8+
paths-ignore:
9+
- '**.md'
10+
- 'examples/**'
11+
push:
12+
branches:
13+
- master
14+
- develop
15+
- verbose
16+
paths-ignore:
17+
- '**.md'
18+
- 'examples/**'
19+
jobs:
20+
run:
21+
name: Run
22+
runs-on: ${{ matrix.operating-system }}
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
operating-system: [ubuntu-latest, windows-latest, macos-latest]
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v2
30+
31+
- name: Setup Node.js 12.x
32+
uses: actions/setup-node@v1
33+
with:
34+
node-version: 12.x
35+
36+
- name: Install dependencies
37+
run: npm install
38+
39+
- name: Prettier Format Check
40+
run: npm run format-check
41+
42+
- name: ESLint Check
43+
run: npm run lint
44+
45+
- name: Run tests
46+
run: npm test
47+
48+
- name: Send Coverage
49+
continue-on-error: true
50+
timeout-minutes: 1
51+
run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}

.github/workflows/workflow.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
26+
operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
2727
php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
2828
env:
2929
extensions: xml, opcache, xdebug, pcov
@@ -32,28 +32,6 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@v2
3434

35-
- name: Setup Node.js 12.x
36-
uses: actions/setup-node@v1
37-
with:
38-
node-version: 12.x
39-
40-
- name: Install dependencies
41-
run: npm install
42-
43-
- name: Prettier Format Check
44-
run: npm run format-check
45-
46-
- name: ESLint Check
47-
run: npm run lint
48-
49-
- name: Run tests
50-
run: npm test
51-
52-
- name: Send Coverage
53-
continue-on-error: true
54-
timeout-minutes: 1
55-
run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
56-
5735
- name: Setup cache environment
5836
id: cache-env
5937
uses: shivammathur/cache-extensions@develop
@@ -63,7 +41,7 @@ jobs:
6341
key: ${{ env.key }}
6442

6543
- name: Cache extensions
66-
uses: actions/cache@v1
44+
uses: actions/cache@v2
6745
with:
6846
path: ${{ steps.cache-env.outputs.dir }}
6947
key: ${{ steps.cache-env.outputs.key }}

0 commit comments

Comments
 (0)