Merge branch '10.3' into 11.0

Author: GrahamCampbell

.github/workflows/tests.yml

@@ -11,8 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4']
-
+        php: ['7.2', '7.3', '7.4', '8.0']
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [10.3.0] - UPCOMING
 
+* Support PHP 8.0
+
 [10.3.0]: https://github.com/GitLabPHP/Client/compare/10.2.0...10.3.0
 
 ## [10.2.0] - 2020-11-09

Makefile

@@ -3,7 +3,7 @@ install:
 	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:7.4-base bin all update
 
 phpunit:
-	@rm -f bootstrap/cache/*.php && docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
 
 phpstan-analyze:
 	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze

README.md

@@ -23,7 +23,7 @@ Check out the [change log](CHANGELOG.md), [releases](https://github.com/GitLabPH
 
 ## Installation
 
-This version supports [PHP](https://php.net) 7.2-7.4. To get started, simply require the project using [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
+This version supports [PHP](https://php.net) 7.2-8.0. To get started, simply require the project using [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
 
 ### Standard Installation
 

composer.json

@@ -22,14 +22,14 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.2.5 || ^8.0",
         "ext-json": "*",
         "ext-xml": "*",
-        "php-http/cache-plugin": "^1.7",
+        "php-http/cache-plugin": "^1.7.1",
         "php-http/client-common": "^2.3",
         "php-http/discovery": "^1.12",
-        "php-http/httplug": "^2.1",
-        "php-http/multipart-stream-builder": "^1.1",
+        "php-http/httplug": "^2.2",
+        "php-http/multipart-stream-builder": "^1.1.2",
         "psr/cache": "^1.0",
         "psr/http-client-implementation": "^1.0",
         "psr/http-factory-implementation": "^1.0",

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977">
+<files psalm-version="4.2.1@ea9cb72143b77e7520c52fa37290bd8d8bc88fd9">
   <file src="src/Api/AbstractApi.php">
     <InvalidArgument occurrences="1"/>
   </file>

vendor-bin/phpstan/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5 || ^8.0",
-        "phpstan/phpstan": "~0.12.54",
+        "phpstan/phpstan": "~0.12.57",
         "phpstan/phpstan-deprecation-rules": "~0.12.5",
         "phpstan/phpstan-strict-rules": "~0.12.5",
         "thecodingmachine/phpstan-strict-rules": "~0.12.1",

vendor-bin/phpunit/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5 || ^8.0",
-        "phpunit/phpunit": "^8.5.8 || ^9.4.2"
+        "phpunit/phpunit": "^8.5.11 || ^9.4.3"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/psalm/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5 || ^8.0",
-        "psalm/phar": "~4.1.1"
+        "psalm/phar": "~4.2.1"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/rector/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5",
-        "rector/rector-prefixed": "0.8.48"
+        "rector/rector-prefixed": "0.8.52"
     },
     "config": {
         "preferred-install": "dist"