From 6203b40ce1bca93ee913e4db5df40fc33fa19902 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Tue, 21 Dec 2021 09:05:54 -0600
Subject: [PATCH 1/2] MCLOUD-8318: Fastly: Add support PHP 8.1

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

diff --git a/composer.json b/composer.json
index 87b126e0..30434219 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "fastly/magento2",
     "description": "Fastly CDN Module for Magento 2.3.x | 2.4.x",
     "require": {
-        "php": "~7.1.3|~7.2.0|~7.3.0|~7.4.0|~8.0.0",
+        "php": "~7.1.3|~7.2.0|~7.3.0|~7.4.0|~8.0.0|~8.1.0",
         "magento/module-config": ">=101.1.0",
         "magento/module-store": ">=101.0.0",
         "magento/module-page-cache": ">=100.3.0",

From e34f633c7876c4e697b4e61de505480b0a52aefc Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 13 Jan 2022 17:18:50 -0600
Subject: [PATCH 2/2]  MCLOUD-8318: Fastly: Add support PHP 8.1

---
 Model/Config/Backend/Geoipcountry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Model/Config/Backend/Geoipcountry.php b/Model/Config/Backend/Geoipcountry.php
index b5016d0b..e4222b92 100644
--- a/Model/Config/Backend/Geoipcountry.php
+++ b/Model/Config/Backend/Geoipcountry.php
@@ -82,7 +82,7 @@ protected function _afterLoad() // @codingStandardsIgnoreLine - required by pare
     {
         $value = $this->getValue();
 
-        $oldData = json_decode($value, true);
+        $oldData = json_decode((string)$value, true);
         if (!$oldData) {
             try {
                 $oldData = $this->serializerInterface->unserialize($value);