Update to PHP 8.1

.github/workflows/composer.test.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install dependencies
       uses: php-actions/composer@v6
       with:
-        php_version: 7.4
+        php_version: 8.1
         command: install
 
     - name: Copy example .env file

Dockerfile

@@ -12,7 +12,7 @@ WORKDIR /tmp/src2
 RUN composer install --no-dev --no-progress --optimize-autoloader
 
 
-FROM php:7.4-apache
+FROM php:8.1-apache
 
 RUN apt-get update \
 	# Needed for the imagick php extension install

app/Jobs/DeleteWikiDbJob.php

@@ -96,7 +96,6 @@ public function handle( DatabaseManager $manager )
                 throw new \RuntimeException("Tried getting table names for wikiDB {$wikiDB->name} but did not find any");
             }
 
-            $pdo->beginTransaction();
 
             // Create the new database
             $pdo->exec(sprintf('CREATE DATABASE %s', $deletedDatabaseName));
@@ -114,16 +113,10 @@ public function handle( DatabaseManager $manager )
             }
 
             $pdo->exec(sprintf('DROP USER %s', $wikiDB->user ));
-
-            $pdo->commit();
         } catch (\Throwable $e) {
-
-            $pdo->rollBack();
-
             $manager->purge('mw');
             $this->fail( new \RuntimeException('Failed to soft-soft delete '.$wikiDB->name . ': ' . $e->getMessage()) );
             return;
-
         }
 
         $wikiDB->delete();

composer.json

@@ -15,6 +15,7 @@
         "gluedev/laravel-stackdriver": "dev-develop#7fb3e78ce949dd341b5418f876c3ff74d8c1ff92",
         "google/recaptcha": "^1.2",
         "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/psr7": "^1.9",
         "hackzilla/password-generator": "^1.6",
         "illuminate/mail": "^8.48",
         "illuminate/redis": "^8.48",
@@ -28,6 +29,8 @@
         "mxl/laravel-job": "^1.2",
         "percymamedy/laravel-dev-booter": "^3.0",
         "php-http/guzzle6-adapter": "^2.0",
+        "php-http/message": "^1.16",
+        "php-http/message-factory": "^1.1",
         "predis/predis": "^1.1",
         "superbalist/laravel-google-cloud-storage": "^2.2"
     },
@@ -77,13 +80,14 @@
     },
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.1"
         },
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true,
         "allow-plugins": {
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "php-http/discovery": false
         }
     },
     "minimum-stability": "dev",