From 4eec8b2efbfe45ac29e9bc3e50b96ff0680da049 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Mon, 20 Jun 2022 20:06:02 +0200
Subject: [PATCH 1/4] Fix composer dependencies and corresponding github ci
 strategy

---
 .github/workflows/continuous-integration.yml | 17 +++++++++++
 composer.json                                | 31 ++++++++++----------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ce3b991d..cc971e68 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -15,6 +15,8 @@ jobs:
         php-version:
           - "7.3"
           - "7.4"
+          - "8.0"
+          - "8.1"
         deps:
           - "normal"
         symfony-require:
@@ -41,6 +43,21 @@ jobs:
             deps: "dev"
 
           - php-version: "8.0"
+            deps: "normal"
+
+          - php-version: "8.0"
+            deps: "low"
+
+          - php-version: "8.0"
+            deps: "dev"
+
+          - php-version: "8.1"
+            deps: "normal"
+
+          - php-version: "8.1"
+            deps: "low"
+
+          - php-version: "8.1"
             deps: "dev"
 
     steps:
diff --git a/composer.json b/composer.json
index fa9652ab..e1239809 100644
--- a/composer.json
+++ b/composer.json
@@ -31,29 +31,28 @@
     "license": "MIT",
     "name": "php-tmdb/api",
     "require": {
-        "php": "^7.3 || ^7.4 || ^8.0",
+        "php": "^7.3 || ^7.4 || ^8.0 || ^8.1",
         "ext-json": "*",
-        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
-        "psr/cache": "^1.0 || ^2.0 || ^3.0",
-        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
-        "psr/event-dispatcher": "^1.0",
-        "psr/event-dispatcher-implementation": "^1.0",
-        "psr/log": "^1.0 || ^2.0 || ^3.0",
+        "symfony/options-resolver": ">=4.4 || ^5 || ^6",
+        "psr/cache": "^1 || ^2 || ^3",
+        "psr/simple-cache": "^1 || ^2 || ^3",
+        "psr/event-dispatcher": "^1",
+        "psr/event-dispatcher-implementation": "^1",
+        "psr/log": "^1 || ^2 || ^3",
         "php-http/discovery": "^1.11",
-        "psr/http-client": "^1.0",
-        "psr/http-client-implementation": "^1.0",
-        "psr/http-factory": "^1.0",
-        "psr/http-factory-implementation": "^1.0",
-        "psr/http-message": "^1.0"
+        "psr/http-client": "^1",
+        "psr/http-client-implementation": "^1",
+        "psr/http-factory": "^1",
+        "psr/http-factory-implementation": "^1",
+        "psr/http-message": "^1"
     },
     "require-dev": {
         "nyholm/psr7": "^1.2",
-        "friendsofphp/php-cs-fixer": "^2.17",
         "php-http/mock-client": "^1.2",
-        "slevomat/coding-standard": "^6.4.1",
+        "slevomat/coding-standard": "^6.4",
         "squizlabs/php_codesniffer": "^3.5.8",
-        "symfony/cache": ">=4.4,<6",
-        "symfony/event-dispatcher": "^5.0,<6",
+        "symfony/cache": ">=4.4 || ^5 || ^6",
+        "symfony/event-dispatcher": ">=4.4 || ^5 || ^6",
         "phpstan/phpstan": "^0.12.18",
         "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3",
         "php-http/guzzle7-adapter": "^0.1",

From 5c1c0988a7af403c1fc797ecbec3a9c75fa06a28 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Mon, 20 Jun 2022 20:09:03 +0200
Subject: [PATCH 2/4] Drop support for phpunit 7

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e1239809..b19b91ae 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "symfony/cache": ">=4.4 || ^5 || ^6",
         "symfony/event-dispatcher": ">=4.4 || ^5 || ^6",
         "phpstan/phpstan": "^0.12.18",
-        "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3",
+        "phpunit/phpunit": "^8.0 || ^9.3",
         "php-http/guzzle7-adapter": "^0.1",
         "monolog/monolog": ">=1.11.0",
         "vimeo/psalm": "^4",

From d758f920492431703d6f6d7a66145316ce0ec204 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Mon, 20 Jun 2022 20:10:34 +0200
Subject: [PATCH 3/4] Bump phpunit upwards to at least 8.5

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b19b91ae..b2c5e8ba 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "symfony/cache": ">=4.4 || ^5 || ^6",
         "symfony/event-dispatcher": ">=4.4 || ^5 || ^6",
         "phpstan/phpstan": "^0.12.18",
-        "phpunit/phpunit": "^8.0 || ^9.3",
+        "phpunit/phpunit": ">=8.5 || ^9.3",
         "php-http/guzzle7-adapter": "^0.1",
         "monolog/monolog": ">=1.11.0",
         "vimeo/psalm": "^4",

From 2cbe0bf9d04944a633d77721c03ec7a6ea7c1971 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Mon, 20 Jun 2022 20:15:03 +0200
Subject: [PATCH 4/4] Require phpunit/phpunit to be at least 8.5.23 or ^9.3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b2c5e8ba..f1d06856 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "symfony/cache": ">=4.4 || ^5 || ^6",
         "symfony/event-dispatcher": ">=4.4 || ^5 || ^6",
         "phpstan/phpstan": "^0.12.18",
-        "phpunit/phpunit": ">=8.5 || ^9.3",
+        "phpunit/phpunit": ">=8.5.23 || ^9.3",
         "php-http/guzzle7-adapter": "^0.1",
         "monolog/monolog": ">=1.11.0",
         "vimeo/psalm": "^4",