Skip to content

Commit 87509fd

Browse files
Merge branch 'master' into parse-docblock-if-type-hint-array
2 parents a8339ff + 6bd8682 commit 87509fd

File tree

6 files changed

+11724
-4211
lines changed

6 files changed

+11724
-4211
lines changed

.github/workflows/build.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: build
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
FORCE_COLOR: 1
7+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8+
9+
jobs:
10+
test:
11+
strategy:
12+
matrix:
13+
php:
14+
- 7.1
15+
- 7.2
16+
- 7.3
17+
- 7.4
18+
- 8.0
19+
deps:
20+
- lowest
21+
- highest
22+
include:
23+
- php: 8.1
24+
deps: highest
25+
composer-options: --ignore-platform-reqs
26+
exclude:
27+
# that config currently breaks as older PHPUnit cannot generate coverage on PHP 8
28+
- php: 8
29+
deps: lowest
30+
31+
runs-on: ubuntu-latest
32+
steps:
33+
- uses: actions/checkout@v2
34+
35+
- name: Setup PHP
36+
uses: shivammathur/setup-php@v2
37+
with:
38+
php-version: ${{ matrix.php }}
39+
40+
- uses: ramsey/composer-install@v1
41+
with:
42+
dependency-versions: ${{ matrix.deps }}
43+
composer-options: ${{ matrix.composer-options }}
44+
45+
- run: vendor/bin/phpunit --coverage-clover=coverage.xml --whitelist lib --bootstrap vendor/autoload.php tests
46+
47+
- uses: codecov/codecov-action@v1
48+
49+
release:
50+
needs: test
51+
if: github.repository_owner == 'felixfbecker' && github.event_name == 'push' && github.ref == 'refs/heads/master'
52+
runs-on: ubuntu-latest
53+
steps:
54+
- uses: actions/checkout@v2
55+
56+
- name: Setup Node.js
57+
uses: actions/setup-node@v2
58+
59+
- name: Install npm dependencies
60+
run: npm ci
61+
62+
- name: Release
63+
run: npm run semantic-release

.travis.yml

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"require": {
2323
"php": "^7.1 || ^8.0",
24-
"netresearch/jsonmapper": "^1.0 || ^2.0",
24+
"netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
2525
"phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
2626
},
2727
"require-dev": {

0 commit comments

Comments
 (0)