From ddac3b8326ba07566e6ff35878f4cd5f5f997e30 Mon Sep 17 00:00:00 2001
From: Buster Neece <buster@busterneece.com>
Date: Mon, 12 Feb 2024 09:52:59 -0600
Subject: [PATCH] Revert "Revert to PHP 8.2 (because of maxminddb again)"

This reverts commit fa1d52d18b6fb8ed34b6146bd95de22a7147aa12.
---
 .github/workflows/default.yml | 4 ++--
 composer.json                 | 2 +-
 composer.lock                 | 4 ++--
 util/docker/web/setup/php.sh  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index ad8a5d2bd..4972572cc 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: intl, xdebug
           tools: composer:v2, cs2pr
 
@@ -77,7 +77,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: intl, xdebug
           tools: composer:v2, cs2pr
 
diff --git a/composer.json b/composer.json
index 47c183cee..9da97bf6d 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "^8.2",
+    "php": "^8.3",
     "ext-PDO": "*",
     "ext-curl": "*",
     "ext-ffi": "*",
diff --git a/composer.lock b/composer.lock
index 9cc274912..deec59b5a 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": "5f89eb149038129f72bf2862b6c3ee92",
+    "content-hash": "e3e3e88098bbfee794623d5bce712c1d",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -14420,7 +14420,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-pdo": "*",
         "ext-curl": "*",
         "ext-ffi": "*",
diff --git a/util/docker/web/setup/php.sh b/util/docker/web/setup/php.sh
index 779a22a32..8ce66716f 100644
--- a/util/docker/web/setup/php.sh
+++ b/util/docker/web/setup/php.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-PHP_VERSION=8.2
+PHP_VERSION=8.3
 
 curl -S "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c" \
   | sudo gpg --batch --yes --dearmor --output "/etc/apt/keyrings/php.gpg"