From 46934d7a85ba51178b7dfcf799a73d2e100dd6d7 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 12 Aug 2025 15:02:41 -0400 Subject: [PATCH 1/3] fix eggs with `[]` (#1596) --- app/Services/Eggs/EggConfigurationService.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Services/Eggs/EggConfigurationService.php b/app/Services/Eggs/EggConfigurationService.php index c72d6e7c5..52e0068df 100644 --- a/app/Services/Eggs/EggConfigurationService.php +++ b/app/Services/Eggs/EggConfigurationService.php @@ -20,7 +20,14 @@ class EggConfigurationService * @return array{ * startup: array{done: string[], user_interaction: string[], strip_ansi: bool}, * stop: array{type: string, value: string}, - * configs: array + * configs: list + * }> * } */ public function handle(Server $server): array @@ -81,9 +88,10 @@ class EggConfigurationService } /** - * @return array + * @param array $configs + * @return array> */ - protected function replacePlaceholders(Server $server, object $configs): array + protected function replacePlaceholders(Server $server, object|array $configs): array { // Get the legacy configuration structure for the server so that we // can property map the egg placeholders to values. From 795cad43b97dfbd70bb4d7a0f533f5dfe19f5e55 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 12 Aug 2025 21:02:49 +0200 Subject: [PATCH 2/3] Server creation: Only get node_id from allocation if it is missing (#1598) --- app/Services/Servers/ServerCreationService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php index 276311ebe..887c01e47 100644 --- a/app/Services/Servers/ServerCreationService.php +++ b/app/Services/Servers/ServerCreationService.php @@ -56,8 +56,8 @@ class ServerCreationService $egg = Egg::query()->findOrFail($data['egg_id']); // Fill missing fields from egg - $data['image'] = $data['image'] ?? collect($egg->docker_images)->first(); - $data['startup'] = $data['startup'] ?? $egg->startup; + $data['image'] ??= collect($egg->docker_images)->first(); + $data['startup'] ??= $egg->startup; // If a deployment object has been passed we need to get the allocation and node that the server should use. if ($deployment) { @@ -87,7 +87,7 @@ class ServerCreationService $data['node_id'] = $nodes->first(); } } else { - $data['node_id'] = Allocation::find($data['allocation_id'])?->node_id; + $data['node_id'] ??= Allocation::find($data['allocation_id'])?->node_id; } Assert::false(empty($data['node_id']), 'Expected a non-empty node_id in server creation data.'); From a8f233e204af2bb2256494e8802e6a54459eeb64 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Wed, 13 Aug 2025 08:01:48 -0400 Subject: [PATCH 3/3] Laravel 12.23.1 Shift (#1604) Co-authored-by: Shift --- composer.json | 2 +- composer.lock | 246 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 201 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index 8652bbaee..6c5691065 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "doctrine/dbal": "~3.6.0", "filament/filament": "^3.3", "guzzlehttp/guzzle": "^7.9", - "laravel/framework": "^12.22", + "laravel/framework": "^12.23", "laravel/helpers": "^1.7", "laravel/sanctum": "^4.1", "laravel/socialite": "^5.21", diff --git a/composer.lock b/composer.lock index 253e4b4b9..b32d3ae6e 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": "e5d9f294519edc6e4cca937c579709f8", + "content-hash": "9fe021f7367f1d07f7740ba2f5e02683", "packages": [ { "name": "abdelhamiderrahmouni/filament-monaco-editor", @@ -1020,16 +1020,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.352.5", + "version": "3.352.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "e226dcc96c0a1165d9c8248ec637d1006b883609" + "reference": "26d8988376984e4684c497e71722a97b79aeef4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e226dcc96c0a1165d9c8248ec637d1006b883609", - "reference": "e226dcc96c0a1165d9c8248ec637d1006b883609", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/26d8988376984e4684c497e71722a97b79aeef4e", + "reference": "26d8988376984e4684c497e71722a97b79aeef4e", "shasum": "" }, "require": { @@ -1111,9 +1111,9 @@ "support": { "forum": "https://github.com/aws/aws-sdk-php/discussions", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.352.5" + "source": "https://github.com/aws/aws-sdk-php/tree/3.352.7" }, - "time": "2025-08-08T18:09:38+00:00" + "time": "2025-08-12T18:29:26+00:00" }, { "name": "blade-ui-kit/blade-heroicons", @@ -1758,16 +1758,16 @@ }, { "name": "dedoc/scramble", - "version": "v0.12.28", + "version": "v0.12.29", "source": { "type": "git", "url": "https://github.com/dedoc/scramble.git", - "reference": "f06a98d1fd6678544428df7077d73194e2d28de3" + "reference": "b1fecfa9f6dc0094cf716d609975b933c5d522f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dedoc/scramble/zipball/f06a98d1fd6678544428df7077d73194e2d28de3", - "reference": "f06a98d1fd6678544428df7077d73194e2d28de3", + "url": "https://api.github.com/repos/dedoc/scramble/zipball/b1fecfa9f6dc0094cf716d609975b933c5d522f0", + "reference": "b1fecfa9f6dc0094cf716d609975b933c5d522f0", "shasum": "" }, "require": { @@ -1826,7 +1826,7 @@ ], "support": { "issues": "https://github.com/dedoc/scramble/issues", - "source": "https://github.com/dedoc/scramble/tree/v0.12.28" + "source": "https://github.com/dedoc/scramble/tree/v0.12.29" }, "funding": [ { @@ -1834,7 +1834,7 @@ "type": "github" } ], - "time": "2025-08-04T12:20:10+00:00" + "time": "2025-08-12T12:17:56+00:00" }, { "name": "dflydev/dot-access-data", @@ -2557,7 +2557,7 @@ }, { "name": "filament/actions", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/actions.git", @@ -2610,16 +2610,16 @@ }, { "name": "filament/filament", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/panels.git", - "reference": "d9d2367c910956e1e7a4c2903600f37bd740dd11" + "reference": "6f460f7f5146217b71fc242b288f908fa58c9131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/panels/zipball/d9d2367c910956e1e7a4c2903600f37bd740dd11", - "reference": "d9d2367c910956e1e7a4c2903600f37bd740dd11", + "url": "https://api.github.com/repos/filamentphp/panels/zipball/6f460f7f5146217b71fc242b288f908fa58c9131", + "reference": "6f460f7f5146217b71fc242b288f908fa58c9131", "shasum": "" }, "require": { @@ -2671,20 +2671,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2025-08-04T10:34:25+00:00" + "time": "2025-08-12T13:15:51+00:00" }, { "name": "filament/forms", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/forms.git", - "reference": "158177c4a551c8aba5be3f45bc423195ab28e5bc" + "reference": "6d2eddf754f30dee8730535dfcbcefb4cd5e1136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/forms/zipball/158177c4a551c8aba5be3f45bc423195ab28e5bc", - "reference": "158177c4a551c8aba5be3f45bc423195ab28e5bc", + "url": "https://api.github.com/repos/filamentphp/forms/zipball/6d2eddf754f30dee8730535dfcbcefb4cd5e1136", + "reference": "6d2eddf754f30dee8730535dfcbcefb4cd5e1136", "shasum": "" }, "require": { @@ -2727,20 +2727,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2025-08-04T10:34:20+00:00" + "time": "2025-08-12T13:15:47+00:00" }, { "name": "filament/infolists", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/infolists.git", - "reference": "89a3f1f236863e2035be3d7b0c68987508dd06fa" + "reference": "4533c2ccb6ef06ab7f27d81e27be0cdd4f5e72de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/infolists/zipball/89a3f1f236863e2035be3d7b0c68987508dd06fa", - "reference": "89a3f1f236863e2035be3d7b0c68987508dd06fa", + "url": "https://api.github.com/repos/filamentphp/infolists/zipball/4533c2ccb6ef06ab7f27d81e27be0cdd4f5e72de", + "reference": "4533c2ccb6ef06ab7f27d81e27be0cdd4f5e72de", "shasum": "" }, "require": { @@ -2778,11 +2778,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2025-06-23T10:46:53+00:00" + "time": "2025-08-12T13:15:27+00:00" }, { "name": "filament/notifications", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/notifications.git", @@ -2834,16 +2834,16 @@ }, { "name": "filament/support", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/support.git", - "reference": "89d8e729025c195a06f2e510af4517fc9a8fd07f" + "reference": "afafd5e7a2f8cf052f70f989b52d82d0a1df5c78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/support/zipball/89d8e729025c195a06f2e510af4517fc9a8fd07f", - "reference": "89d8e729025c195a06f2e510af4517fc9a8fd07f", + "url": "https://api.github.com/repos/filamentphp/support/zipball/afafd5e7a2f8cf052f70f989b52d82d0a1df5c78", + "reference": "afafd5e7a2f8cf052f70f989b52d82d0a1df5c78", "shasum": "" }, "require": { @@ -2889,20 +2889,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2025-07-28T09:02:43+00:00" + "time": "2025-08-12T13:15:44+00:00" }, { "name": "filament/tables", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/tables.git", - "reference": "22bc439ec6f2b5fd5703ef499381d7beb0a6b369" + "reference": "20ce6217382785df7b39b8473644c1bfe967963c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/tables/zipball/22bc439ec6f2b5fd5703ef499381d7beb0a6b369", - "reference": "22bc439ec6f2b5fd5703ef499381d7beb0a6b369", + "url": "https://api.github.com/repos/filamentphp/tables/zipball/20ce6217382785df7b39b8473644c1bfe967963c", + "reference": "20ce6217382785df7b39b8473644c1bfe967963c", "shasum": "" }, "require": { @@ -2941,11 +2941,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2025-07-28T09:02:34+00:00" + "time": "2025-08-12T13:15:31+00:00" }, { "name": "filament/widgets", - "version": "v3.3.35", + "version": "v3.3.36", "source": { "type": "git", "url": "https://github.com/filamentphp/widgets.git", @@ -3717,16 +3717,16 @@ }, { "name": "laravel/framework", - "version": "v12.22.1", + "version": "v12.23.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "d33ee45184126f32f593d4b809a846ed88a1dc43" + "reference": "2a0e9331a0db904236143fe915c281ff4be274a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/d33ee45184126f32f593d4b809a846ed88a1dc43", - "reference": "d33ee45184126f32f593d4b809a846ed88a1dc43", + "url": "https://api.github.com/repos/laravel/framework/zipball/2a0e9331a0db904236143fe915c281ff4be274a3", + "reference": "2a0e9331a0db904236143fe915c281ff4be274a3", "shasum": "" }, "require": { @@ -3767,6 +3767,8 @@ "symfony/mailer": "^7.2.0", "symfony/mime": "^7.2.0", "symfony/polyfill-php83": "^1.31", + "symfony/polyfill-php84": "^1.31", + "symfony/polyfill-php85": "^1.31", "symfony/process": "^7.2.0", "symfony/routing": "^7.2.0", "symfony/uid": "^7.2.0", @@ -3928,7 +3930,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-08-08T13:58:03+00:00" + "time": "2025-08-12T17:35:05+00:00" }, { "name": "laravel/helpers", @@ -10930,6 +10932,158 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-php84", + "version": "v1.32.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php84.git", + "reference": "000df7860439609837bbe28670b0be15783b7fbf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/000df7860439609837bbe28670b0be15783b7fbf", + "reference": "000df7860439609837bbe28670b0be15783b7fbf", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php84\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php84/tree/v1.32.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2025-02-20T12:04:08+00:00" + }, + { + "name": "symfony/polyfill-php85", + "version": "v1.32.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php85.git", + "reference": "6fedf31ce4e3648f4ff5ca58bfd53127d38f05fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/6fedf31ce4e3648f4ff5ca58bfd53127d38f05fd", + "reference": "6fedf31ce4e3648f4ff5ca58bfd53127d38f05fd", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php85\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php85/tree/v1.32.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2025-05-02T08:40:52+00:00" + }, { "name": "symfony/polyfill-uuid", "version": "v1.32.0",