Merge branch 'pterodactyl-release/v1.11.10' into release/v1.11.10

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2]
+        php: [8.2, 8.3]
         database: ["mariadb:10.2", "mysql:8"]
     services:
       database:

.github/workflows/lint.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none

CHANGELOG.md

@@ -3,6 +3,16 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.11.10
+
+### BREAKING
+
+* Minimum PHP verion is now 8.2 due to Laravel upgrade!
+
+### Fixed
+
+* Update Laravel to address [CVE-2024-52301](https://github.com/advisories/GHSA-gv7v-rgg6-548h)
+
 ## v1.11.9
 
 ### Fixed

Dockerfile

@@ -10,7 +10,7 @@ RUN yarn install --frozen-lockfile \
 
 # Stage 1:
 # Build the actual container with all of the needed PHP dependencies that will run the application.
-FROM --platform=$TARGETOS/$TARGETARCH php:8.1-fpm-alpine
+FROM --platform=$TARGETOS/$TARGETARCH php:8.2-fpm-alpine
 WORKDIR /app
 COPY . ./
 COPY --from=0 /app/public/assets ./public/assets

composer.json

@@ -17,52 +17,52 @@
         }
     ],
     "require": {
-        "php": "^8.1 || ^8.2",
+        "php": "^8.2 || ^8.3",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "ext-pdo_mysql": "*",
         "ext-posix": "*",
         "ext-zip": "*",
-        "aws/aws-sdk-php": "~3.260.1",
-        "doctrine/dbal": "~3.6.0",
-        "guzzlehttp/guzzle": "~7.5.0",
-        "hashids/hashids": "~5.0.0",
-        "laracasts/utilities": "~3.2.2",
-        "laravel/framework": "~10.1.3",
-        "laravel/helpers": "~1.6.0",
-        "laravel/sanctum": "~3.2.1",
-        "laravel/tinker": "~2.8.1",
-        "laravel/ui": "~4.2.1",
+        "aws/aws-sdk-php": "~3.316.10",
+        "doctrine/dbal": "~3.8.6",
+        "guzzlehttp/guzzle": "~7.9.2",
+        "hashids/hashids": "~5.0.2",
+        "laracasts/utilities": "~3.2.3",
+        "laravel/framework": "~10.48.23",
+        "laravel/helpers": "~1.7.0",
+        "laravel/sanctum": "~3.3.3",
+        "laravel/tinker": "~2.9.0",
+        "laravel/ui": "~4.5.2",
         "lcobucci/jwt": "~4.3.0",
-        "league/flysystem-aws-s3-v3": "~3.12.2",
-        "league/flysystem-memory": "~3.10.3",
-        "matriphe/iso-639": "~1.2",
-        "phpseclib/phpseclib": "~3.0.18",
-        "pragmarx/google2fa": "~8.0.0",
-        "predis/predis": "~2.1.1",
-        "prologue/alerts": "~1.1.0",
+        "league/flysystem-aws-s3-v3": "~3.28.0",
+        "league/flysystem-memory": "~3.28.0",
+        "matriphe/iso-639": "~1.3",
+        "phpseclib/phpseclib": "~3.0.39",
+        "pragmarx/google2fa": "~8.0.1",
+        "predis/predis": "~2.2.2",
+        "prologue/alerts": "~1.2.0",
         "psr/cache": "~3.0.0",
         "s1lentium/iptools": "~1.2.0",
-        "spatie/laravel-fractal": "~6.0.3",
-        "spatie/laravel-query-builder": "~5.1.2",
+        "spatie/laravel-fractal": "~6.2.1",
+        "spatie/laravel-query-builder": "~5.8.1",
         "staudenmeir/belongs-to-through": "~2.13",
-        "symfony/http-client": "~6.2.6",
-        "symfony/mailgun-mailer": "~6.2.5",
-        "symfony/postmark-mailer": "~6.2.5",
-        "symfony/yaml": "~6.2.5",
+        "symfony/http-client": "~6.4.10",
+        "symfony/mailgun-mailer": "~6.4.10",
+        "symfony/postmark-mailer": "~6.4.8",
+        "symfony/yaml": "~6.4.8",
         "webmozart/assert": "~1.11.0"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "~2.13.0",
-        "fakerphp/faker": "~1.21.0",
-        "friendsofphp/php-cs-fixer": "~3.14.4",
-        "itsgoingd/clockwork": "~5.1.12",
-        "laravel/sail": "~1.21.0",
-        "mockery/mockery": "~1.5.1",
-        "nunomaduro/collision": "~7.0.5",
-        "phpunit/phpunit": "~10.0.11",
-        "spatie/laravel-ignition": "~2.0.0"
+        "barryvdh/laravel-ide-helper": "~2.15.1",
+        "fakerphp/faker": "~1.23.1",
+        "friendsofphp/php-cs-fixer": "~3.61.1",
+        "itsgoingd/clockwork": "~5.2.2",
+        "laravel/sail": "~1.31.0",
+        "mockery/mockery": "~1.6.12",
+        "nunomaduro/collision": "~7.10.0",
+        "phpunit/phpunit": "~10.5.29",
+        "spatie/laravel-ignition": "~2.8.0"
     },
     "autoload": {
         "files": [
@@ -98,7 +98,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.23"
         }
     },
     "minimum-stability": "stable",