From 4f526acc3b7700005fd273f2a36a0eb1df0b1a5f Mon Sep 17 00:00:00 2001
From: Marisa Clardy <marisa@clardy.eu>
Date: Sun, 17 Jan 2021 17:57:11 -0600
Subject: [PATCH 1/2] Update to php8.0

---
 Dockerfile                  |  2 +-
 composer.json               |  2 +-
 composer.lock               | 16 ++++++++--------
 src/Config/ReportConfig.php |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 57e69b7..a70dfc4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-cli-alpine
+FROM php:8.0-cli-alpine
 
 MAINTAINER Marisa Clardy <marisa@clardy.eu>
 
diff --git a/composer.json b/composer.json
index 6189f15..b90b529 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^8.0",
         "symfony/console": "^5.0",
         "symfony/finder": "^5.0",
         "symfony/yaml": "^5.0"
diff --git a/composer.lock b/composer.lock
index dba047a..68ce335 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e22e1e167a5aea39619ce8e6842e2f49",
+    "content-hash": "9132ccf27da06128e7d6a9224dde80c9",
     "packages": [
         {
             "name": "psr/container",
@@ -2782,16 +2782,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.0",
+            "version": "9.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe"
+                "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
-                "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7bdf4085de85a825f4424eae52c99a1cec2f360",
+                "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360",
                 "shasum": ""
             },
             "require": {
@@ -2869,7 +2869,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.1"
             },
             "funding": [
                 {
@@ -2881,7 +2881,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-12-04T05:05:53+00:00"
+            "time": "2021-01-17T07:42:25+00:00"
         },
         {
             "name": "psr/http-client",
@@ -4600,7 +4600,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.4"
+        "php": "^8.0"
     },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"
diff --git a/src/Config/ReportConfig.php b/src/Config/ReportConfig.php
index 58d85e6..c33c97e 100644
--- a/src/Config/ReportConfig.php
+++ b/src/Config/ReportConfig.php
@@ -35,7 +35,7 @@ public function output(): string
     /**
      * @psalm-mutation-free
      *
-     * @return string[]|null
+     * @return string[]
      *
      * @psalm-return array{format: string, output: string}
      */

From e8570a1bb3003c62337e2603f2cacb145cc95199 Mon Sep 17 00:00:00 2001
From: Marisa Clardy <marisa@clardy.eu>
Date: Sun, 17 Jan 2021 17:59:04 -0600
Subject: [PATCH 2/2] Update php version.

---
 .github/workflows/code-validation.yml | 6 +++---
 .github/workflows/release.yml         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code-validation.yml b/.github/workflows/code-validation.yml
index 8212255..b99d960 100644
--- a/.github/workflows/code-validation.yml
+++ b/.github/workflows/code-validation.yml
@@ -1,5 +1,5 @@
 name: Code Validation
-on: [push, pull_request]
+on: [push]
 
 jobs:
   psalm:
@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           coverage: pcov
           tools: composer:v2
 
@@ -50,7 +50,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           coverage: pcov
           tools: composer:v2
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdffb57..db60746 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           tools: composer:v2
           ini-values: phar.readonly=Off