Skip to content

Commit 3ca30a4

Browse files
Merge branch '10.3' into 10.4
2 parents d36a447 + 270011a commit 3ca30a4

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
* Work around GitLab's API returning bad JSON for some endpoints
1717

18-
[10.3.0]: https://github.com/GitLabPHP/Client/compare/10.3.0...10.3.1
18+
[10.3.1]: https://github.com/GitLabPHP/Client/compare/10.3.0...10.3.1
1919

2020
## [10.3.0] - 2020-11-27
2121

psalm-baseline.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.2.1@ea9cb72143b77e7520c52fa37290bd8d8bc88fd9">
2+
<files psalm-version="4.3.1@2feba22a005a18bf31d4c7b9bdb9252c73897476">
33
<file src="src/Api/AbstractApi.php">
44
<InvalidArgument occurrences="1"/>
55
</file>

vendor-bin/phpstan/composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"require": {
33
"php": "^7.2.5 || ^8.0",
4-
"phpstan/phpstan": "~0.12.57",
5-
"phpstan/phpstan-deprecation-rules": "~0.12.5",
6-
"phpstan/phpstan-strict-rules": "~0.12.5",
7-
"thecodingmachine/phpstan-strict-rules": "~0.12.1",
8-
"ergebnis/phpstan-rules": "~0.15.3"
4+
"phpstan/phpstan": "0.12.60",
5+
"phpstan/phpstan-deprecation-rules": "0.12.5",
6+
"phpstan/phpstan-strict-rules": "0.12.5",
7+
"thecodingmachine/phpstan-strict-rules": "0.12.1",
8+
"ergebnis/phpstan-rules": "0.15.3"
99
},
1010
"config": {
1111
"preferred-install": "dist"

vendor-bin/phpunit/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.1.3 || ^8.0",
4-
"phpunit/phpunit": "^7.5.20 || ^8.5.11 || ^9.4.3"
4+
"phpunit/phpunit": "^7.5.20 || ^8.5.13 || ^9.4.4"
55
},
66
"config": {
77
"preferred-install": "dist"

vendor-bin/psalm/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.1.3 || ^8.0",
4-
"psalm/phar": "~4.2.1"
4+
"psalm/phar": "4.3.1"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)