Skip to content

Commit 3bb3f60

Browse files
Merge pull request #13 from Setasign/development
Development
2 parents 2a83abf + e03b0cf commit 3bb3f60

21 files changed

+2147
-2125
lines changed

.github/workflows/code-style.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Install php
1212
uses: shivammathur/setup-php@v2
1313
with:
14-
php-version: "7.3"
14+
php-version: "7.4"
1515

1616
- name: Install dependencies
1717
run: composer update --dev --no-interaction --prefer-dist --no-progress --no-suggest --ansi
@@ -32,10 +32,10 @@ jobs:
3232
- name: Install php
3333
uses: shivammathur/setup-php@v2
3434
with:
35-
php-version: "7.3"
35+
php-version: "7.4"
3636

3737
- name: Install dependencies
3838
run: composer update --dev --no-interaction --prefer-dist --no-progress --no-suggest --ansi
3939

4040
- name: Run phpstan
41-
run: php ./vendor/phpstan/phpstan/phpstan.phar analyse --no-progress
41+
run: php ./vendor/bin/phpstan analyse --no-progress

.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ on: [pull_request]
33
jobs:
44
tests:
55
name: Run PHP Unit tests
6-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-latest
77
strategy:
88
matrix:
9-
php: ['7.3', '7.4', '8.0', '8.1']
9+
php: ['7.4', '8.0', '8.1', '8.2', '8.3']
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v2

composer.json

+23-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212

1313
"require": {
14-
"php": "^7.3 || ^8.0",
14+
"php": "^7.4 || ^8.0",
1515
"ext-pcre": "*",
1616
"ext-mbstring": "*",
1717

@@ -20,10 +20,7 @@
2020
},
2121

2222
"require-dev": {
23-
"phpunit/phpunit": "^9.0",
24-
"php-defer/php-defer": "^4.0",
25-
"squizlabs/php_codesniffer": "^3.5",
26-
"phpstan/phpstan": "^0.12"
23+
"bamarni/composer-bin-plugin": "^1.8"
2724
},
2825

2926
"autoload": {
@@ -40,5 +37,25 @@
4037

4138
"bin": [
4239
"./bin/php-stub-generator"
43-
]
40+
],
41+
42+
"config": {
43+
"allow-plugins": {
44+
"bamarni/composer-bin-plugin": true
45+
}
46+
},
47+
48+
"extra": {
49+
"bamarni-bin": {
50+
"bin-links": true,
51+
"target-directory": "vendor-bin",
52+
"forward-command": true
53+
}
54+
},
55+
56+
"scripts": {
57+
"tests": "@php vendor/bin/phpunit",
58+
"cs": "@php vendor/bin/phpcs",
59+
"phpstan": "@php vendor/bin/phpstan analyse"
60+
}
4461
}

0 commit comments

Comments
 (0)