Skip to content

Commit e8a71b7

Browse files
authored
Merge #181: v4.0 — modernize, hermetic HTTP/TLS tests, PHP 8.4/8.5 fix, namespace rename
4.0: modernize, hermetic HTTP/TLS tests, fix PHP 8.4/8.5 & rename namespace (#179 #175 #47 #11)
2 parents f36aa48 + bab293d commit e8a71b7

44 files changed

Lines changed: 2859 additions & 1225 deletions

Some content is hidden

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

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.0.0
2+
current_version = 4.0.0
33
commit = True
44
tag = True
55
tag_name = {new_version}

.gitattributes

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
/.gitattributes export-ignore
2-
/.gitignore export-ignore
3-
/.travis.yml export-ignore
4-
/.editorconfig export-ignore
5-
/phpunit.xml export-ignore
6-
/tests export-ignore
7-
/Gruntfile.js export-ignore
8-
/package.json export-ignore
9-
/phpunit.xml export-ignore
10-
/README.md export-ignore
11-
/CONTRIBUTING.md export-ignore
1+
# Keep development-only files out of the Composer dist archive.
2+
/.github export-ignore
3+
/example export-ignore
4+
/tests export-ignore
5+
/.bumpversion.cfg export-ignore
6+
/.editorconfig export-ignore
7+
/.gitattributes export-ignore
8+
/.gitignore export-ignore
9+
/phpcs.xml.dist export-ignore
10+
/phpstan.neon.dist export-ignore
11+
/phpunit.xml.dist export-ignore
12+
/CONTRIBUTING.md export-ignore

.github/renovate.json

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
{
2-
"extends": [
3-
"config:base"
4-
],
5-
"assigneesFromCodeOwners": true,
6-
"packageRules": [
7-
{
8-
"matchPackagePatterns": [
9-
"*"
10-
],
11-
"matchUpdateTypes": [
12-
"minor",
13-
"patch"
14-
],
15-
"groupName": "all non-major dependencies",
16-
"groupSlug": "all-minor-patch",
17-
"automerge": true,
18-
"labels": [
19-
"dependencies"
20-
]
21-
},
22-
{
23-
"matchPackagePatterns": [
24-
"*"
25-
],
26-
"matchUpdateTypes": [
27-
"major"
28-
],
29-
"labels": [
30-
"dependencies",
31-
"breaking"
32-
]
33-
}
34-
]
35-
}
36-
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended",
5+
":dependencyDashboard"
6+
],
7+
"assigneesFromCodeOwners": true,
8+
"packageRules": [
9+
{
10+
"matchUpdateTypes": [
11+
"minor",
12+
"patch"
13+
],
14+
"groupName": "all non-major dependencies",
15+
"groupSlug": "all-minor-patch",
16+
"automerge": true,
17+
"labels": [
18+
"dependencies"
19+
]
20+
},
21+
{
22+
"matchUpdateTypes": [
23+
"major"
24+
],
25+
"labels": [
26+
"dependencies",
27+
"breaking"
28+
]
29+
}
30+
]
31+
}

.github/workflows/ci-8.0.yml

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

.github/workflows/ci-8.1.yml

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

.github/workflows/ci-8.2.yml

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

.github/workflows/ci.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
- stage
9+
pull_request:
10+
workflow_dispatch:
11+
schedule:
12+
# Weekly run to catch breakage from new PHP / dependency releases.
13+
- cron: '0 6 * * 1'
14+
15+
permissions:
16+
contents: read
17+
18+
concurrency:
19+
group: ci-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
jobs:
23+
tests:
24+
name: PHP ${{ matrix.php }}${{ matrix.deps == 'lowest' && ' (lowest deps)' || '' }}
25+
runs-on: ubuntu-latest
26+
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
php: ['8.1', '8.2', '8.3', '8.4', '8.5']
31+
deps: ['highest']
32+
include:
33+
# Also verify the project still works against its minimum dependencies.
34+
- php: '8.1'
35+
deps: 'lowest'
36+
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v6
40+
41+
- name: Setup PHP
42+
uses: shivammathur/setup-php@v2
43+
with:
44+
php-version: ${{ matrix.php }}
45+
extensions: soap, curl, libxml, openssl, mbstring
46+
coverage: xdebug
47+
ini-values: error_reporting=E_ALL, display_errors=On
48+
49+
- name: Validate composer.json
50+
run: composer validate --strict
51+
52+
- name: Install dependencies
53+
run: >
54+
composer update --no-interaction --no-progress --prefer-dist
55+
${{ matrix.deps == 'lowest' && '--prefer-lowest --prefer-stable' || '--prefer-stable' }}
56+
57+
- name: Lint (php syntax)
58+
run: composer lint
59+
60+
- name: Coding standards (PSR-2)
61+
run: composer check-style
62+
63+
- name: Static analysis (PHPStan)
64+
run: composer stan
65+
66+
- name: Tests (hermetic + TLS)
67+
run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=never
68+
69+
- name: Upload coverage to Codecov
70+
if: matrix.php == '8.3' && matrix.deps == 'highest'
71+
uses: codecov/codecov-action@v5
72+
with:
73+
files: coverage.xml
74+
fail_ci_if_error: false
75+
env:
76+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ testem.log
9292
.DS_Store
9393
Thumbs.db
9494
.phplint-cache
95+
.phplint.cache
9596
coverage.xml
9697
coverage.clover
9798
/report

.scrutinizer.yml

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

.styleci.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)