Skip to content

Commit 208c4a9

Browse files
GrahamCampbellGrahamCampbell
committed
Bumped versions
1 parent 3d27dbf commit 208c4a9

File tree

9 files changed

+63
-43
lines changed

9 files changed

+63
-43
lines changed

‎.github/workflows/static.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,30 @@ on:
77
jobs:
88
phpstan:
99
name: PHPStan
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111

1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '8.0'
20-
tools: composer:2.1
19+
php-version: '8.1'
20+
tools: composer:v2
2121
coverage: none
22+
env:
23+
update: true
2224

2325
- name: Install Dependencies
24-
uses: nick-invision/retry@v1
26+
uses: nick-invision/retry@v2
2527
with:
2628
timeout_minutes: 5
2729
max_attempts: 5
2830
command: composer update --no-interaction --no-progress
2931

3032
- name: Install PHPStan
31-
uses: nick-invision/retry@v1
33+
uses: nick-invision/retry@v2
3234
with:
3335
timeout_minutes: 5
3436
max_attempts: 5
@@ -39,28 +41,30 @@ jobs:
3941

4042
psalm:
4143
name: Psalm
42-
runs-on: ubuntu-20.04
44+
runs-on: ubuntu-22.04
4345

4446
steps:
4547
- name: Checkout code
46-
uses: actions/checkout@v2
48+
uses: actions/checkout@v3
4749

4850
- name: Setup PHP
4951
uses: shivammathur/setup-php@v2
5052
with:
51-
php-version: '8.0'
52-
tools: composer:2.1
53+
php-version: '8.1'
54+
tools: composer:v2
5355
coverage: none
56+
env:
57+
update: true
5458

5559
- name: Install Dependencies
56-
uses: nick-invision/retry@v1
60+
uses: nick-invision/retry@v2
5761
with:
5862
timeout_minutes: 5
5963
max_attempts: 5
6064
command: composer update --no-interaction --no-progress
6165

6266
- name: Install Psalm
63-
uses: nick-invision/retry@v1
67+
uses: nick-invision/retry@v2
6468
with:
6569
timeout_minutes: 5
6670
max_attempts: 5

‎.github/workflows/tests.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,37 @@ on:
77
jobs:
88
tests:
99
name: PHP ${{ matrix.php }}
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111

1212
strategy:
1313
matrix:
1414
php: ['7.4', '8.0', '8.1']
1515

1616
steps:
1717
- name: Checkout Code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919

2020
- name: Setup PHP
2121
uses: shivammathur/setup-php@v2
2222
with:
2323
php-version: ${{ matrix.php }}
24-
tools: composer:2.1
24+
tools: composer:v2
2525
coverage: none
26+
env:
27+
update: true
2628

2729
- name: Setup Problem Matchers
2830
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
2931

3032
- name: Install Dependencies
31-
uses: nick-invision/retry@v1
33+
uses: nick-invision/retry@v2
3234
with:
3335
timeout_minutes: 5
3436
max_attempts: 5
3537
command: composer update --no-interaction --no-progress
3638

3739
- name: Install PHPUnit
38-
uses: nick-invision/retry@v1
40+
uses: nick-invision/retry@v2
3941
with:
4042
timeout_minutes: 5
4143
max_attempts: 5

‎Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
install:
2-
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.0-base update
3-
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.0-base bin all update
2+
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.1-base update
3+
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.1-base bin all update
44

55
phpunit:
6-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.0-cli
6+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.1-cli
77

88
phpstan-analyze:
9-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.0-cli analyze
9+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.1-cli analyze
1010

1111
phpstan-baseline:
12-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.0-cli analyze --generate-baseline
12+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.1-cli analyze --generate-baseline
1313

1414
psalm-analyze:
15-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli
15+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.1-cli
1616

1717
psalm-baseline:
18-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli --set-baseline=psalm-baseline.xml
18+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.1-cli --set-baseline=psalm-baseline.xml
1919

2020
psalm-show-info:
21-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli --show-info=true
21+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.1-cli --show-info=true
2222

2323
test: phpunit phpstan-analyze psalm-analyze
2424

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,23 @@ This version supports [PHP](https://php.net) 7.4-8.1. To get started, simply req
2828
### Standard Installation
2929

3030
```bash
31-
$ composer require "m4tthumphrey/php-gitlab-api:^11.8" "guzzlehttp/guzzle:^7.4" "http-interop/http-factory-guzzle:^1.2"
31+
$ composer require "m4tthumphrey/php-gitlab-api:^11.9" \
32+
"guzzlehttp/guzzle:^7.5" "http-interop/http-factory-guzzle:^1.2"
3233
```
3334

3435
### Framework Integration
3536

3637
#### Laravel:
3738

3839
```bash
39-
$ composer require "graham-campbell/gitlab:^6.1"
40+
$ composer require "graham-campbell/gitlab:^7.0"
4041
```
4142

4243
#### Symfony:
4344

4445
```bash
45-
$ composer require "zeichen32/gitlabapibundle:^6.0" "symfony/http-client:^5.4" "nyholm/psr7:^1.4"
46+
$ composer require "zeichen32/gitlabapibundle:^6.0" \
47+
"symfony/http-client:^5.4" "nyholm/psr7:^1.4"
4648
```
4749

4850
We are decoupled from any HTTP messaging client by using [PSR-7](https://www.php-fig.org/psr/psr-7/), [PSR-17](https://www.php-fig.org/psr/psr-17/), [PSR-18](https://www.php-fig.org/psr/psr-18/), and [HTTPlug](https://httplug.io/). You can visit [HTTPlug for library users](https://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages. The framework integration [graham-campbell/gitlab](https://github.com/GrahamCampbell/Laravel-GitLab) is by [Graham Campbell](https://github.com/GrahamCampbell) and [zeichen32/gitlabapibundle](https://github.com/Zeichen32/GitLabApiBundle) is by [Jens Averkamp](https://github.com/Zeichen32).

‎composer.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@
3030
"ext-json": "*",
3131
"ext-xml": "*",
3232
"php-http/cache-plugin": "^1.7.5",
33-
"php-http/client-common": "^2.5",
34-
"php-http/discovery": "^1.14",
35-
"php-http/httplug": "^2.2",
33+
"php-http/client-common": "^2.6",
34+
"php-http/discovery": "^1.15",
35+
"php-http/httplug": "^2.3",
3636
"php-http/multipart-stream-builder": "^1.2",
3737
"psr/cache": "^1.0 || ^2.0 || ^3.0",
3838
"psr/http-client-implementation": "^1.0",
3939
"psr/http-factory-implementation": "^1.0",
4040
"psr/http-message": "^1.0",
4141
"symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
42-
"symfony/polyfill-php80": "^1.17"
42+
"symfony/polyfill-php80": "^1.26"
4343
},
4444
"require-dev": {
45-
"bamarni/composer-bin-plugin": "^1.4.1",
46-
"guzzlehttp/guzzle": "^7.4",
45+
"bamarni/composer-bin-plugin": "^1.8.2",
46+
"guzzlehttp/guzzle": "^7.5",
4747
"http-interop/http-factory-guzzle": "^1.0"
4848
},
4949
"autoload": {
@@ -59,7 +59,14 @@
5959
"config": {
6060
"preferred-install": "dist",
6161
"allow-plugins": {
62-
"bamarni/composer-bin-plugin": true
62+
"bamarni/composer-bin-plugin": true,
63+
"php-http/discovery": true
64+
}
65+
},
66+
"extra": {
67+
"bamarni-bin": {
68+
"bin-links": true,
69+
"forward-command": false
6370
}
6471
}
6572
}

‎phpstan-baseline.neon

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int, array\\)\\: bool\\)\\|null, Closure\\(\\)\\: void given\\.$#"
4+
message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, Closure\\(\\)\\: void given\\.$#"
55
count: 1
66
path: src/Api/AbstractApi.php
77

@@ -10,6 +10,11 @@ parameters:
1010
count: 1
1111
path: src/Api/AbstractApi.php
1212

13+
-
14+
message: "#^Parameter \\#4 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
15+
count: 1
16+
path: src/Api/AbstractApi.php
17+
1318
-
1419
message: "#^Property Gitlab\\\\Api\\\\AbstractApi\\:\\:\\$perPage is never written, only read\\.$#"
1520
count: 1

‎src/ResultPager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ private function get(string $key): array
259259
*/
260260
private static function bindPerPage(AbstractApi $api, int $perPage): AbstractApi
261261
{
262+
/** @var Closure(AbstractApi): AbstractApi */
262263
$closure = Closure::bind(static function (AbstractApi $api) use ($perPage): AbstractApi {
263264
$clone = clone $api;
264265

@@ -267,7 +268,6 @@ private static function bindPerPage(AbstractApi $api, int $perPage): AbstractApi
267268
return $clone;
268269
}, null, AbstractApi::class);
269270

270-
/** @var AbstractApi */
271271
return $closure($api);
272272
}
273273
}

‎vendor-bin/phpstan/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"require": {
3-
"php": "^8.0.2",
4-
"phpstan/phpstan": "1.4.2",
5-
"phpstan/phpstan-deprecation-rules": "1.0.0",
6-
"phpstan/phpstan-strict-rules": "1.1.0",
3+
"php": "^8.1",
4+
"phpstan/phpstan": "1.10.3",
5+
"phpstan/phpstan-deprecation-rules": "1.1.2",
6+
"phpstan/phpstan-strict-rules": "1.5.0",
77
"thecodingmachine/phpstan-strict-rules": "1.0.0",
88
"ergebnis/phpstan-rules": "1.0.0"
99
},

‎vendor-bin/psalm/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
3-
"php": "^8.0.2",
4-
"psalm/phar": "4.18.1"
3+
"php": "^8.1",
4+
"psalm/phar": "5.7.6"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)