Skip to content

Commit 17ee48b

Browse files
authored
Lower number of ci jobs and upgrade phpstan (#162)
1 parent 310ad8b commit 17ee48b

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: "Setup PHP"
1313
uses: shivammathur/setup-php@v2
1414
with:
15-
php-version: 8.0
15+
php-version: 8.1
1616
tools: cs2pr
1717
- name: "Install dependencies with composer"
1818
run: |
@@ -51,24 +51,18 @@ jobs:
5151
symfony-version: 4.4.*
5252
- php-version: 8.0
5353
symfony-version: 4.4.*
54+
- php-version: 8.1
55+
symfony-version: 4.4.*
5456
- php-version: 7.4
55-
symfony-version: 5.3.*
56-
- php-version: 8.0
57-
symfony-version: 5.3.*
58-
- php-version: 8.0
5957
symfony-version: 5.4.*
60-
dev: true
6158
- php-version: 8.0
62-
symfony-version: 6.0.*
63-
dev: true
64-
- php-version: 8.1
65-
symfony-version: 5.3.*
59+
symfony-version: 5.4.*
6660
- php-version: 8.1
6761
symfony-version: 5.4.*
68-
dev: true
62+
- php-version: 8.0
63+
symfony-version: 6.0.*
6964
- php-version: 8.1
7065
symfony-version: 6.0.*
71-
dev: true
7266
steps:
7367
- name: "Checkout"
7468
uses: actions/checkout@v2
@@ -77,14 +71,10 @@ jobs:
7771
with:
7872
coverage: none
7973
php-version: ${{ matrix.php-version }}
80-
- name: "Configure minimum stability"
81-
if: matrix.dev
82-
run: |
83-
composer config minimum-stability dev
84-
composer remove --dev friendsofphp/php-cs-fixer
8574
- name: "Install dependencies (fixed Symfony version) with composer"
8675
if: matrix.symfony-version
8776
run: |
77+
composer remove --dev friendsofphp/php-cs-fixer
8878
composer require symfony/options-resolver:${{ matrix.symfony-version }} --no-interaction --no-update
8979
composer update --no-interaction --no-progress --no-suggest
9080
- name: "Install dependencies (lowest dependencies) with composer"
@@ -103,8 +93,8 @@ jobs:
10393
strategy:
10494
matrix:
10595
include:
106-
- php-version: 8.0
107-
symfony-version: 5.3.*
96+
- php-version: 8.1
97+
symfony-version: 6.0.*
10898
steps:
10999
- name: "Checkout"
110100
uses: actions/checkout@v2
@@ -115,6 +105,7 @@ jobs:
115105
php-version: ${{ matrix.php-version }}
116106
- name: "Install dependencies with composer"
117107
run: |
108+
composer remove --dev friendsofphp/php-cs-fixer
118109
composer require symfony/options-resolver:${{ matrix.symfony-version }} --no-interaction --no-update
119110
composer update --no-interaction --no-progress --no-suggest
120111
- name: "Run tests with phpunit/phpunit"

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## Version 2.8.0
4+
5+
- add external user id auth hash in device to enable identity verification
6+
- Allow Symfony 6
7+
38
## Version 2.7.0
49

510
- Additional SMS related fields (on the Notifications payload)

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"symfony/options-resolver": "^4.4|^5.0|^6.0"
2121
},
2222
"require-dev": {
23-
"friendsofphp/php-cs-fixer": "^3.1",
23+
"friendsofphp/php-cs-fixer": "^3.3",
2424
"nyholm/psr7": "^1.2",
25-
"phpstan/phpstan": "^0.12",
26-
"phpstan/phpstan-phpunit": "^0.12",
25+
"phpstan/phpstan": "^1.0",
26+
"phpstan/phpstan-phpunit": "^1.0",
2727
"symfony/http-client": "^5.0|^6.0",
2828
"symfony/phpunit-bridge": "^5.3|^6.0"
2929
},

src/AbstractApi.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ protected function createRequest(string $method, string $uri): RequestInterface
3232

3333
/**
3434
* @param mixed $value
35+
* @phpstan-param int<1, max> $maxDepth
3536
*/
3637
protected function createStream($value, int $flags = null, int $maxDepth = 512): StreamInterface
3738
{

0 commit comments

Comments
 (0)