diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4aca84ce80..c2fa6edbf5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,19 +14,21 @@ jobs:
ui:
name: UI
runs-on: ubuntu-20.04
+ permissions:
+ contents: read
strategy:
fail-fast: false
matrix:
node-version: [16]
steps:
- name: Code Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- cache: "yarn"
+ cache: yarn
- name: Install dependencies
run: yarn install --frozen-lockfile
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1c8130552d..e0375787c3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,11 +14,18 @@ jobs:
tests:
name: Tests
runs-on: ubuntu-20.04
+ permissions:
+ contents: read
strategy:
fail-fast: false
matrix:
- php: [8.1, 8.2]
- database: ["mariadb:10.2", "mysql:8"]
+ php: [8.2, 8.3]
+ database:
+ - mariadb:10.5
+ - mariadb:10.11
+ - mariadb:11.5
+ - mysql:8
+ - mysql:9
services:
database:
image: ${{ matrix.database }}
@@ -27,10 +34,9 @@ jobs:
MYSQL_DATABASE: testing
ports:
- 3306
- options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- name: Code Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Get cache directory
id: composer-cache
@@ -38,7 +44,7 @@ jobs:
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 1a63e7beab..97d6875d0e 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -18,6 +18,9 @@ jobs:
name: Push
runs-on: ubuntu-20.04
if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
+ permissions:
+ contents: read
+ packages: write
steps:
- name: Code checkout
uses: actions/checkout@v4
@@ -46,7 +49,7 @@ jobs:
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
- password: ${{ secrets.REGISTRY_TOKEN }}
+ password: ${{ secrets.GITHUB_TOKEN }}
- name: Update version
if: "github.event_name == 'release' && github.event.action == 'published'"
@@ -56,7 +59,7 @@ jobs:
sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:1}',/" config/app.php
- name: Build and Push
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 4ac292b686..78f2256096 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -14,14 +14,16 @@ jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
+ permissions:
+ contents: read
steps:
- name: Code Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- 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
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index cbbb4b05e7..0ba2b69714 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,15 +9,17 @@ jobs:
release:
name: Release
runs-on: ubuntu-20.04
+ permissions:
+ contents: write # write is required to create releases and push.
steps:
- name: Code checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 16
- cache: "yarn"
+ cache: yarn
- name: Install dependencies
run: yarn install --frozen-lockfile
@@ -41,7 +43,7 @@ jobs:
- name: Create release archive
run: |
- rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
+ rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
- name: Extract changelog
@@ -58,7 +60,7 @@ jobs:
- name: Create release
id: create_release
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
diff --git a/.gitignore b/.gitignore
index 2c9fda4ca6..f59b05d1f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,9 @@ public/assets/manifest.json
# For local development with docker
# Remove if we ever put the Dockerfile in the repo
.dockerignore
-docker-compose.yml
+docker-compose.*
+!docker-compose.example.yml
+!docker-compose.example.yaml
# for image related files
misc
@@ -33,4 +35,3 @@ resources/lang/locales.js
/public/build
/public/hot
result
-docker-compose.yaml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 9245b7e6e5..fa90205555 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -2,6 +2,7 @@
use PhpCsFixer\Config;
use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
$finder = (new Finder())
->in(__DIR__)
@@ -14,6 +15,7 @@
->notName(['_ide_helper*']);
return (new Config())
+ ->setParallelConfig(ParallelConfigFactory::detect())
->setRiskyAllowed(true)
->setFinder($finder)
->setRules([
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58d5431e78..9495f2115e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,28 @@ 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
+
+* Fixed issue with CI not pushing Docker image
+
+## v1.11.8
+
+### Fixed
+
+* Fixed an issue where a `DELETE` request was used instead of a `POST`, potentially logging user passwords in plain text if they disable 2FA.
+
## v1.11.7
### Added
diff --git a/Dockerfile b/Dockerfile
index 9bcb0df633..fd7d72f906 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN yarn install --frozen-lockfile --network-timeout 200000 \
# 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
diff --git a/app/Console/Commands/Location/DeleteLocationCommand.php b/app/Console/Commands/Location/DeleteLocationCommand.php
index 3193e0c3d4..ae9d11915f 100644
--- a/app/Console/Commands/Location/DeleteLocationCommand.php
+++ b/app/Console/Commands/Location/DeleteLocationCommand.php
@@ -20,7 +20,7 @@ class DeleteLocationCommand extends Command
*/
public function __construct(
private LocationDeletionService $deletionService,
- private LocationRepositoryInterface $repository
+ private LocationRepositoryInterface $repository,
) {
parent::__construct();
}
diff --git a/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php b/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php
index f256fe44fd..5530014bbc 100644
--- a/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php
+++ b/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php
@@ -36,7 +36,7 @@ public function handle()
collect($files)->each(function (\SplFileInfo $file) {
$lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
- if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
+ if ((int) $lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
$this->disk->delete($file->getPath());
$this->info(trans('command/messages.maintenance.deleting_service_backup', ['file' => $file->getFilename()]));
}
diff --git a/app/Console/Commands/Node/NodeConfigurationCommand.php b/app/Console/Commands/Node/NodeConfigurationCommand.php
index 9bf0f425c9..83a25720b1 100644
--- a/app/Console/Commands/Node/NodeConfigurationCommand.php
+++ b/app/Console/Commands/Node/NodeConfigurationCommand.php
@@ -17,7 +17,7 @@ public function handle(): int
{
$column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
- /** @var \Pterodactyl\Models\Node $node */
+ /** @var Node $node */
$node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
$this->error('The selected node does not exist.');
diff --git a/app/Console/Commands/Server/BulkPowerActionCommand.php b/app/Console/Commands/Server/BulkPowerActionCommand.php
index 4e7ae1af95..5df31bec94 100644
--- a/app/Console/Commands/Server/BulkPowerActionCommand.php
+++ b/app/Console/Commands/Server/BulkPowerActionCommand.php
@@ -30,7 +30,7 @@ public function __construct(private DaemonPowerRepository $powerRepository, priv
/**
* Handle the bulk power request.
*
- * @throws \Illuminate\Validation\ValidationException
+ * @throws ValidationException
*/
public function handle()
{
diff --git a/app/Console/Commands/UpgradeCommand.php b/app/Console/Commands/UpgradeCommand.php
index 12ed4c7747..75f2b8ecc4 100644
--- a/app/Console/Commands/UpgradeCommand.php
+++ b/app/Console/Commands/UpgradeCommand.php
@@ -133,7 +133,7 @@ public function handle()
/** @var \Illuminate\Foundation\Application $app */
$app = require __DIR__ . '/../../../bootstrap/app.php';
- /** @var \Pterodactyl\Console\Kernel $kernel */
+ /** @var Kernel $kernel */
$kernel = $app->make(Kernel::class);
$kernel->bootstrap();
$this->setLaravel($app);
diff --git a/app/Contracts/Extensions/HashidsInterface.php b/app/Contracts/Extensions/HashidsInterface.php
index 1cf83b4a00..3fd3dedbbd 100644
--- a/app/Contracts/Extensions/HashidsInterface.php
+++ b/app/Contracts/Extensions/HashidsInterface.php
@@ -11,5 +11,5 @@ interface HashidsInterface extends VendorHashidsInterface
*
* @throws \InvalidArgumentException
*/
- public function decodeFirst(string $encoded, string $default = null): mixed;
+ public function decodeFirst(string $encoded, ?string $default = null): mixed;
}
diff --git a/app/Contracts/Repository/NestRepositoryInterface.php b/app/Contracts/Repository/NestRepositoryInterface.php
index 2f80bedd56..9049d16cb2 100644
--- a/app/Contracts/Repository/NestRepositoryInterface.php
+++ b/app/Contracts/Repository/NestRepositoryInterface.php
@@ -12,14 +12,14 @@ interface NestRepositoryInterface extends RepositoryInterface
*
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
- public function getWithEggs(int $id = null): Collection|Nest;
+ public function getWithEggs(?int $id = null): Collection|Nest;
/**
* Return a nest or all nests and the count of eggs and servers for that nest.
*
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
- public function getWithCounts(int $id = null): Collection|Nest;
+ public function getWithCounts(?int $id = null): Collection|Nest;
/**
* Return a nest along with its associated eggs and the servers relation on those eggs.
diff --git a/app/Contracts/Repository/ServerRepositoryInterface.php b/app/Contracts/Repository/ServerRepositoryInterface.php
index 9294a191b5..1a30f1ec01 100644
--- a/app/Contracts/Repository/ServerRepositoryInterface.php
+++ b/app/Contracts/Repository/ServerRepositoryInterface.php
@@ -16,12 +16,12 @@ public function loadEggRelations(Server $server, bool $refresh = false): Server;
/**
* Return a collection of servers with their associated data for rebuild operations.
*/
- public function getDataForRebuild(int $server = null, int $node = null): Collection;
+ public function getDataForRebuild(?int $server = null, ?int $node = null): Collection;
/**
* Return a collection of servers with their associated data for reinstall operations.
*/
- public function getDataForReinstall(int $server = null, int $node = null): Collection;
+ public function getDataForReinstall(?int $server = null, ?int $node = null): Collection;
/**
* Return a server model and all variables associated with the server.
diff --git a/app/Contracts/Repository/SettingsRepositoryInterface.php b/app/Contracts/Repository/SettingsRepositoryInterface.php
index c55c09b747..09fd8f0e8a 100644
--- a/app/Contracts/Repository/SettingsRepositoryInterface.php
+++ b/app/Contracts/Repository/SettingsRepositoryInterface.php
@@ -10,7 +10,7 @@ interface SettingsRepositoryInterface extends RepositoryInterface
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
- public function set(string $key, string $value = null);
+ public function set(string $key, ?string $value = null);
/**
* Retrieve a persistent setting from the database.
diff --git a/app/Exceptions/DisplayException.php b/app/Exceptions/DisplayException.php
index c1440dbe08..884df9a893 100644
--- a/app/Exceptions/DisplayException.php
+++ b/app/Exceptions/DisplayException.php
@@ -72,7 +72,7 @@ public function report()
try {
$logger = Container::getInstance()->make(LoggerInterface::class);
- } catch (Exception) {
+ } catch (\Exception) {
throw $this->getPrevious();
}
diff --git a/app/Exceptions/Http/HttpForbiddenException.php b/app/Exceptions/Http/HttpForbiddenException.php
index 1488265a93..3fc8cb6d8c 100644
--- a/app/Exceptions/Http/HttpForbiddenException.php
+++ b/app/Exceptions/Http/HttpForbiddenException.php
@@ -10,7 +10,7 @@ class HttpForbiddenException extends HttpException
/**
* HttpForbiddenException constructor.
*/
- public function __construct(string $message = null, \Throwable $previous = null)
+ public function __construct(?string $message = null, ?\Throwable $previous = null)
{
parent::__construct(Response::HTTP_FORBIDDEN, $message, $previous);
}
diff --git a/app/Exceptions/Http/Server/ServerStateConflictException.php b/app/Exceptions/Http/Server/ServerStateConflictException.php
index 31687aacf1..0d477f36d9 100644
--- a/app/Exceptions/Http/Server/ServerStateConflictException.php
+++ b/app/Exceptions/Http/Server/ServerStateConflictException.php
@@ -11,7 +11,7 @@ class ServerStateConflictException extends ConflictHttpException
* Exception thrown when the server is in an unsupported state for API access or
* certain operations within the codebase.
*/
- public function __construct(Server $server, \Throwable $previous = null)
+ public function __construct(Server $server, ?\Throwable $previous = null)
{
$message = '此服务器目前处于不受支持的状态，请稍后再试。';
if ($server->isSuspended()) {
diff --git a/app/Exceptions/Http/TwoFactorAuthRequiredException.php b/app/Exceptions/Http/TwoFactorAuthRequiredException.php
index 1fbeda328e..5c036c90a6 100644
--- a/app/Exceptions/Http/TwoFactorAuthRequiredException.php
+++ b/app/Exceptions/Http/TwoFactorAuthRequiredException.php
@@ -11,7 +11,7 @@ class TwoFactorAuthRequiredException extends HttpException implements HttpExcept
/**
* TwoFactorAuthRequiredException constructor.
*/
- public function __construct(\Throwable $previous = null)
+ public function __construct(?\Throwable $previous = null)
{
parent::__construct(Response::HTTP_BAD_REQUEST, '此帐户需要动态口令认证才能访问此端点。', $previous);
}
diff --git a/app/Exceptions/Service/ServiceLimitExceededException.php b/app/Exceptions/Service/ServiceLimitExceededException.php
index 450a1743ba..9bbb371f4c 100644
--- a/app/Exceptions/Service/ServiceLimitExceededException.php
+++ b/app/Exceptions/Service/ServiceLimitExceededException.php
@@ -10,7 +10,7 @@ class ServiceLimitExceededException extends DisplayException
* Exception thrown when something goes over a defined limit, such as allocated
* ports, tasks, databases, etc.
*/
- public function __construct(string $message, \Throwable $previous = null)
+ public function __construct(string $message, ?\Throwable $previous = null)
{
parent::__construct($message, $previous, self::LEVEL_WARNING);
}
diff --git a/app/Extensions/Backups/BackupManager.php b/app/Extensions/Backups/BackupManager.php
index bd0dbf183f..f53ea5d3a0 100644
--- a/app/Extensions/Backups/BackupManager.php
+++ b/app/Extensions/Backups/BackupManager.php
@@ -38,7 +38,7 @@ public function __construct(protected Application $app)
/**
* Returns a backup adapter instance.
*/
- public function adapter(string $name = null): FilesystemAdapter
+ public function adapter(?string $name = null): FilesystemAdapter
{
return $this->get($name ?: $this->getDefaultAdapter());
}
diff --git a/app/Extensions/DynamicDatabaseConnection.php b/app/Extensions/DynamicDatabaseConnection.php
index 5adbd171da..2bed3436e0 100644
--- a/app/Extensions/DynamicDatabaseConnection.php
+++ b/app/Extensions/DynamicDatabaseConnection.php
@@ -19,7 +19,7 @@ class DynamicDatabaseConnection
public function __construct(
protected ConfigRepository $config,
protected Encrypter $encrypter,
- protected DatabaseHostRepositoryInterface $repository
+ protected DatabaseHostRepositoryInterface $repository,
) {
}
diff --git a/app/Extensions/Hashids.php b/app/Extensions/Hashids.php
index 1a6bfdb39c..4a0c4c6627 100644
--- a/app/Extensions/Hashids.php
+++ b/app/Extensions/Hashids.php
@@ -7,10 +7,7 @@
class Hashids extends VendorHashids implements HashidsInterface
{
- /**
- * {@inheritdoc}
- */
- public function decodeFirst(string $encoded, string $default = null): mixed
+ public function decodeFirst(string $encoded, ?string $default = null): mixed
{
$result = $this->decode($encoded);
if (!is_array($result)) {
diff --git a/app/Extensions/Laravel/Sanctum/NewAccessToken.php b/app/Extensions/Laravel/Sanctum/NewAccessToken.php
index 256e57b61f..53e9fe4992 100644
--- a/app/Extensions/Laravel/Sanctum/NewAccessToken.php
+++ b/app/Extensions/Laravel/Sanctum/NewAccessToken.php
@@ -6,7 +6,7 @@
use Laravel\Sanctum\NewAccessToken as SanctumAccessToken;
/**
- * @property \Pterodactyl\Models\ApiKey $accessToken
+ * @property ApiKey $accessToken
*/
class NewAccessToken extends SanctumAccessToken
{
diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php
index 40d0986f15..1b63bb63b6 100644
--- a/app/Http/Controllers/Admin/DatabaseController.php
+++ b/app/Http/Controllers/Admin/DatabaseController.php
@@ -30,7 +30,7 @@ public function __construct(
private HostDeletionService $deletionService,
private HostUpdateService $updateService,
private LocationRepositoryInterface $locationRepository,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php
index 8ae6ceec67..8824ffd604 100644
--- a/app/Http/Controllers/Admin/LocationController.php
+++ b/app/Http/Controllers/Admin/LocationController.php
@@ -26,7 +26,7 @@ public function __construct(
protected LocationDeletionService $deletionService,
protected LocationRepositoryInterface $repository,
protected LocationUpdateService $updateService,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
@@ -86,7 +86,7 @@ public function update(LocationFormRequest $request, Location $location): Redire
* Delete a location from the system.
*
* @throws \Exception
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function delete(Location $location): RedirectResponse
{
diff --git a/app/Http/Controllers/Admin/MountController.php b/app/Http/Controllers/Admin/MountController.php
index beb7e12de6..1645d24f93 100644
--- a/app/Http/Controllers/Admin/MountController.php
+++ b/app/Http/Controllers/Admin/MountController.php
@@ -28,7 +28,7 @@ public function __construct(
protected NestRepositoryInterface $nestRepository,
protected LocationRepositoryInterface $locationRepository,
protected MountRepository $repository,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Nests/EggController.php b/app/Http/Controllers/Admin/Nests/EggController.php
index e71e48e91a..6698d24c92 100644
--- a/app/Http/Controllers/Admin/Nests/EggController.php
+++ b/app/Http/Controllers/Admin/Nests/EggController.php
@@ -27,7 +27,7 @@ public function __construct(
protected EggRepositoryInterface $repository,
protected EggUpdateService $updateService,
protected NestRepositoryInterface $nestRepository,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
@@ -111,7 +111,7 @@ public function destroy(Egg $egg): RedirectResponse
/**
* Normalizes a string of docker image data into the expected egg format.
*/
- protected function normalizeDockerImages(string $input = null): array
+ protected function normalizeDockerImages(?string $input = null): array
{
$data = array_map(fn ($value) => trim($value), explode("\n", $input ?? ''));
diff --git a/app/Http/Controllers/Admin/Nests/EggScriptController.php b/app/Http/Controllers/Admin/Nests/EggScriptController.php
index 4f997e5a86..ef6a5f799c 100644
--- a/app/Http/Controllers/Admin/Nests/EggScriptController.php
+++ b/app/Http/Controllers/Admin/Nests/EggScriptController.php
@@ -21,7 +21,7 @@ public function __construct(
protected AlertsMessageBag $alert,
protected EggRepositoryInterface $repository,
protected InstallScriptService $installScriptService,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Nests/EggShareController.php b/app/Http/Controllers/Admin/Nests/EggShareController.php
index b2c704e52a..85efa09a62 100644
--- a/app/Http/Controllers/Admin/Nests/EggShareController.php
+++ b/app/Http/Controllers/Admin/Nests/EggShareController.php
@@ -21,7 +21,7 @@ public function __construct(
protected AlertsMessageBag $alert,
protected EggExporterService $exporterService,
protected EggImporterService $importerService,
- protected EggUpdateImporterService $updateImporterService
+ protected EggUpdateImporterService $updateImporterService,
) {
}
diff --git a/app/Http/Controllers/Admin/Nests/EggVariableController.php b/app/Http/Controllers/Admin/Nests/EggVariableController.php
index 2b84e8b022..520866488c 100644
--- a/app/Http/Controllers/Admin/Nests/EggVariableController.php
+++ b/app/Http/Controllers/Admin/Nests/EggVariableController.php
@@ -26,7 +26,7 @@ public function __construct(
protected VariableUpdateService $updateService,
protected EggRepositoryInterface $repository,
protected EggVariableRepositoryInterface $variableRepository,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Nests/NestController.php b/app/Http/Controllers/Admin/Nests/NestController.php
index 311a5df28b..09220670ec 100644
--- a/app/Http/Controllers/Admin/Nests/NestController.php
+++ b/app/Http/Controllers/Admin/Nests/NestController.php
@@ -24,7 +24,7 @@ public function __construct(
protected NestDeletionService $nestDeletionService,
protected NestRepositoryInterface $repository,
protected NestUpdateService $nestUpdateService,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/NodeAutoDeployController.php b/app/Http/Controllers/Admin/NodeAutoDeployController.php
index ec34f401b8..d032508e12 100644
--- a/app/Http/Controllers/Admin/NodeAutoDeployController.php
+++ b/app/Http/Controllers/Admin/NodeAutoDeployController.php
@@ -19,7 +19,7 @@ class NodeAutoDeployController extends Controller
public function __construct(
private ApiKeyRepository $repository,
private Encrypter $encrypter,
- private KeyCreationService $keyCreationService
+ private KeyCreationService $keyCreationService,
) {
}
@@ -31,7 +31,7 @@ public function __construct(
*/
public function __invoke(Request $request, Node $node): JsonResponse
{
- /** @var \Pterodactyl\Models\ApiKey|null $key */
+ /** @var ApiKey|null $key */
$key = $this->repository->getApplicationKeys($request->user())
->filter(function (ApiKey $key) {
foreach ($key->getAttributes() as $permission => $value) {
diff --git a/app/Http/Controllers/Admin/Nodes/NodeViewController.php b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
index 6738903230..ed8cd20584 100644
--- a/app/Http/Controllers/Admin/Nodes/NodeViewController.php
+++ b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
@@ -29,7 +29,7 @@ public function __construct(
private NodeRepository $repository,
private ServerRepository $serverRepository,
private SoftwareVersionService $versionService,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/NodesController.php b/app/Http/Controllers/Admin/NodesController.php
index 71094a5175..a641310e15 100644
--- a/app/Http/Controllers/Admin/NodesController.php
+++ b/app/Http/Controllers/Admin/NodesController.php
@@ -44,7 +44,7 @@ public function __construct(
protected ServerRepositoryInterface $serverRepository,
protected NodeUpdateService $updateService,
protected SoftwareVersionService $versionService,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Servers/CreateServerController.php b/app/Http/Controllers/Admin/Servers/CreateServerController.php
index c0fee8c8e6..0bf26df49d 100644
--- a/app/Http/Controllers/Admin/Servers/CreateServerController.php
+++ b/app/Http/Controllers/Admin/Servers/CreateServerController.php
@@ -24,7 +24,7 @@ public function __construct(
private NestRepository $nestRepository,
private NodeRepository $nodeRepository,
private ServerCreationService $creationService,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Servers/ServerTransferController.php b/app/Http/Controllers/Admin/Servers/ServerTransferController.php
index 8941ce10c5..d9fc5d153a 100644
--- a/app/Http/Controllers/Admin/Servers/ServerTransferController.php
+++ b/app/Http/Controllers/Admin/Servers/ServerTransferController.php
@@ -26,7 +26,7 @@ public function __construct(
private ConnectionInterface $connection,
private DaemonTransferRepository $daemonTransferRepository,
private NodeJWTService $nodeJWTService,
- private NodeRepository $nodeRepository
+ private NodeRepository $nodeRepository,
) {
}
diff --git a/app/Http/Controllers/Admin/Servers/ServerViewController.php b/app/Http/Controllers/Admin/Servers/ServerViewController.php
index 05abbb49cc..8ec1d49e59 100644
--- a/app/Http/Controllers/Admin/Servers/ServerViewController.php
+++ b/app/Http/Controllers/Admin/Servers/ServerViewController.php
@@ -33,7 +33,7 @@ public function __construct(
private NodeRepository $nodeRepository,
private ServerRepository $repository,
private EnvironmentService $environmentService,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
@@ -118,7 +118,7 @@ public function mounts(Request $request, Server $server): View
* Returns the base server management page, or an exception if the server
* is in a state that cannot be recovered from.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function manage(Request $request, Server $server): View
{
diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php
index 16a282bf3c..f56b75dd3d 100644
--- a/app/Http/Controllers/Admin/ServersController.php
+++ b/app/Http/Controllers/Admin/ServersController.php
@@ -57,14 +57,14 @@ public function __construct(
protected NestRepositoryInterface $nestRepository,
protected ServerConfigurationStructureService $serverConfigurationStructureService,
protected StartupModificationService $startupModificationService,
- protected SuspensionService $suspensionService
+ protected SuspensionService $suspensionService,
) {
}
/**
* Update the details for a server.
*
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+ * @throws DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function setDetails(Request $request, Server $server): RedirectResponse
@@ -81,8 +81,8 @@ public function setDetails(Request $request, Server $server): RedirectResponse
/**
* Toggles the installation status for a server.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+ * @throws DisplayException
+ * @throws DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function toggleInstall(Server $server): RedirectResponse
@@ -103,8 +103,8 @@ public function toggleInstall(Server $server): RedirectResponse
/**
* Reinstalls the server with the currently assigned service.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+ * @throws DisplayException
+ * @throws DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function reinstallServer(Server $server): RedirectResponse
@@ -118,8 +118,8 @@ public function reinstallServer(Server $server): RedirectResponse
/**
* Manage the suspension status for a server.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+ * @throws DisplayException
+ * @throws DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function manageSuspension(Request $request, Server $server): RedirectResponse
@@ -135,9 +135,9 @@ public function manageSuspension(Request $request, Server $server): RedirectResp
/**
* Update the build configuration for a server.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
- * @throws \Illuminate\Validation\ValidationException
+ * @throws ValidationException
*/
public function updateBuild(Request $request, Server $server): RedirectResponse
{
@@ -159,7 +159,7 @@ public function updateBuild(Request $request, Server $server): RedirectResponse
/**
* Start the server deletion process.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
* @throws \Throwable
*/
public function delete(Request $request, Server $server): RedirectResponse
@@ -173,7 +173,7 @@ public function delete(Request $request, Server $server): RedirectResponse
/**
* Update the startup command as well as variables.
*
- * @throws \Illuminate\Validation\ValidationException
+ * @throws ValidationException
*/
public function saveStartup(Request $request, Server $server): RedirectResponse
{
@@ -220,7 +220,7 @@ public function newDatabase(StoreServerDatabaseRequest $request, Server $server)
*/
public function resetDatabasePassword(Request $request, Server $server): Response
{
- /** @var \Pterodactyl\Models\Database $database */
+ /** @var Database $database */
$database = $server->databases()->findOrFail($request->input('database'));
$this->databasePasswordService->handle($database);
diff --git a/app/Http/Controllers/Admin/Settings/AdvancedController.php b/app/Http/Controllers/Admin/Settings/AdvancedController.php
index 53f8b1f9dd..238f91b0a2 100644
--- a/app/Http/Controllers/Admin/Settings/AdvancedController.php
+++ b/app/Http/Controllers/Admin/Settings/AdvancedController.php
@@ -22,7 +22,7 @@ public function __construct(
private ConfigRepository $config,
private Kernel $kernel,
private SettingsRepositoryInterface $settings,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Settings/IndexController.php b/app/Http/Controllers/Admin/Settings/IndexController.php
index 3e5e33ac00..297dd80bd6 100644
--- a/app/Http/Controllers/Admin/Settings/IndexController.php
+++ b/app/Http/Controllers/Admin/Settings/IndexController.php
@@ -25,7 +25,7 @@ public function __construct(
private Kernel $kernel,
private SettingsRepositoryInterface $settings,
private SoftwareVersionService $versionService,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/Settings/MailController.php b/app/Http/Controllers/Admin/Settings/MailController.php
index ce422e3342..3054185f2a 100644
--- a/app/Http/Controllers/Admin/Settings/MailController.php
+++ b/app/Http/Controllers/Admin/Settings/MailController.php
@@ -27,7 +27,7 @@ public function __construct(
private Encrypter $encrypter,
private Kernel $kernel,
private SettingsRepositoryInterface $settings,
- private ViewFactory $view
+ private ViewFactory $view,
) {
}
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 1d6db65691..76f9bacb8a 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -36,7 +36,7 @@ public function __construct(
protected Translator $translator,
protected UserUpdateService $updateService,
protected UserRepositoryInterface $repository,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
@@ -85,7 +85,7 @@ public function view(User $user): View
* Delete a user from the system.
*
* @throws \Exception
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function delete(Request $request, User $user): RedirectResponse
{
diff --git a/app/Http/Controllers/Api/Application/Locations/LocationController.php b/app/Http/Controllers/Api/Application/Locations/LocationController.php
index b95a0776a9..ae67d13907 100644
--- a/app/Http/Controllers/Api/Application/Locations/LocationController.php
+++ b/app/Http/Controllers/Api/Application/Locations/LocationController.php
@@ -25,7 +25,7 @@ class LocationController extends ApplicationApiController
public function __construct(
private LocationCreationService $creationService,
private LocationDeletionService $deletionService,
- private LocationUpdateService $updateService
+ private LocationUpdateService $updateService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
index 77404945a4..07c2017234 100644
--- a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
@@ -23,7 +23,7 @@ class AllocationController extends ApplicationApiController
*/
public function __construct(
private AssignmentService $assignmentService,
- private AllocationDeletionService $deletionService
+ private AllocationDeletionService $deletionService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeController.php b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
index e0e3575d81..5c40f77f66 100644
--- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
@@ -24,7 +24,7 @@ class NodeController extends ApplicationApiController
public function __construct(
private NodeCreationService $creationService,
private NodeDeletionService $deletionService,
- private NodeUpdateService $updateService
+ private NodeUpdateService $updateService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Servers/DatabaseController.php b/app/Http/Controllers/Api/Application/Servers/DatabaseController.php
index 1717c5dd88..43fc9a551c 100644
--- a/app/Http/Controllers/Api/Application/Servers/DatabaseController.php
+++ b/app/Http/Controllers/Api/Application/Servers/DatabaseController.php
@@ -22,7 +22,7 @@ class DatabaseController extends ApplicationApiController
*/
public function __construct(
private DatabaseManagementService $databaseManagementService,
- private DatabasePasswordService $databasePasswordService
+ private DatabasePasswordService $databasePasswordService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Servers/ServerController.php b/app/Http/Controllers/Api/Application/Servers/ServerController.php
index 2eb69162dd..b1e80c4719 100644
--- a/app/Http/Controllers/Api/Application/Servers/ServerController.php
+++ b/app/Http/Controllers/Api/Application/Servers/ServerController.php
@@ -22,7 +22,7 @@ class ServerController extends ApplicationApiController
*/
public function __construct(
private ServerCreationService $creationService,
- private ServerDeletionService $deletionService
+ private ServerDeletionService $deletionService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php b/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php
index ae5f5438ca..20ea05422e 100644
--- a/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php
+++ b/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php
@@ -17,7 +17,7 @@ class ServerDetailsController extends ApplicationApiController
*/
public function __construct(
private BuildModificationService $buildModificationService,
- private DetailsModificationService $detailsModificationService
+ private DetailsModificationService $detailsModificationService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php b/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php
index d4dcaa24cb..51a1476fec 100644
--- a/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php
+++ b/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php
@@ -16,7 +16,7 @@ class ServerManagementController extends ApplicationApiController
*/
public function __construct(
private ReinstallServerService $reinstallServerService,
- private SuspensionService $suspensionService
+ private SuspensionService $suspensionService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Application/Users/UserController.php b/app/Http/Controllers/Api/Application/Users/UserController.php
index 0ddae27b1e..4e251573df 100644
--- a/app/Http/Controllers/Api/Application/Users/UserController.php
+++ b/app/Http/Controllers/Api/Application/Users/UserController.php
@@ -23,7 +23,7 @@ class UserController extends ApplicationApiController
public function __construct(
private UserCreationService $creationService,
private UserDeletionService $deletionService,
- private UserUpdateService $updateService
+ private UserUpdateService $updateService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/ApiKeyController.php b/app/Http/Controllers/Api/Client/ApiKeyController.php
index 4cb096ec5d..278141451d 100644
--- a/app/Http/Controllers/Api/Client/ApiKeyController.php
+++ b/app/Http/Controllers/Api/Client/ApiKeyController.php
@@ -25,7 +25,7 @@ public function index(ClientApiRequest $request): array
/**
* Store a new API key for a user's account.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function store(StoreApiKeyRequest $request): array
{
@@ -54,7 +54,7 @@ public function store(StoreApiKeyRequest $request): array
*/
public function delete(ClientApiRequest $request, string $identifier): JsonResponse
{
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = $request->user()->apiKeys()
->where('key_type', ApiKey::TYPE_ACCOUNT)
->where('identifier', $identifier)
diff --git a/app/Http/Controllers/Api/Client/Servers/BackupController.php b/app/Http/Controllers/Api/Client/Servers/BackupController.php
index 0c7d17f716..94625dd6d7 100644
--- a/app/Http/Controllers/Api/Client/Servers/BackupController.php
+++ b/app/Http/Controllers/Api/Client/Servers/BackupController.php
@@ -30,7 +30,7 @@ public function __construct(
private DeleteBackupService $deleteBackupService,
private InitiateBackupService $initiateBackupService,
private DownloadLinkService $downloadLinkService,
- private BackupRepository $repository
+ private BackupRepository $repository,
) {
parent::__construct();
}
@@ -39,7 +39,7 @@ public function __construct(
* Returns all the backups for a given server instance in a paginated
* result set.
*
- * @throws \Illuminate\Auth\Access\AuthorizationException
+ * @throws AuthorizationException
*/
public function index(Request $request, Server $server): array
{
@@ -93,7 +93,7 @@ public function store(StoreBackupRequest $request, Server $server): array
* Toggles the lock status of a given backup for a server.
*
* @throws \Throwable
- * @throws \Illuminate\Auth\Access\AuthorizationException
+ * @throws AuthorizationException
*/
public function toggleLock(Request $request, Server $server, Backup $backup): array
{
@@ -115,7 +115,7 @@ public function toggleLock(Request $request, Server $server, Backup $backup): ar
/**
* Returns information about a single backup.
*
- * @throws \Illuminate\Auth\Access\AuthorizationException
+ * @throws AuthorizationException
*/
public function view(Request $request, Server $server, Backup $backup): array
{
@@ -156,7 +156,7 @@ public function delete(Request $request, Server $server, Backup $backup): JsonRe
* which the user is redirected to.
*
* @throws \Throwable
- * @throws \Illuminate\Auth\Access\AuthorizationException
+ * @throws AuthorizationException
*/
public function download(Request $request, Server $server, Backup $backup): JsonResponse
{
diff --git a/app/Http/Controllers/Api/Client/Servers/CommandController.php b/app/Http/Controllers/Api/Client/Servers/CommandController.php
index 61ee27673b..a169c66e89 100644
--- a/app/Http/Controllers/Api/Client/Servers/CommandController.php
+++ b/app/Http/Controllers/Api/Client/Servers/CommandController.php
@@ -26,7 +26,7 @@ public function __construct(private DaemonCommandRepository $repository)
/**
* Send a command to a running server.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function index(SendCommandRequest $request, Server $server): Response
{
diff --git a/app/Http/Controllers/Api/Client/Servers/DatabaseController.php b/app/Http/Controllers/Api/Client/Servers/DatabaseController.php
index 728c67e913..c4bb888759 100644
--- a/app/Http/Controllers/Api/Client/Servers/DatabaseController.php
+++ b/app/Http/Controllers/Api/Client/Servers/DatabaseController.php
@@ -24,7 +24,7 @@ class DatabaseController extends ClientApiController
public function __construct(
private DeployServerDatabaseService $deployDatabaseService,
private DatabaseManagementService $managementService,
- private DatabasePasswordService $passwordService
+ private DatabasePasswordService $passwordService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/Servers/FileController.php b/app/Http/Controllers/Api/Client/Servers/FileController.php
index cabac3a038..6f479b2220 100644
--- a/app/Http/Controllers/Api/Client/Servers/FileController.php
+++ b/app/Http/Controllers/Api/Client/Servers/FileController.php
@@ -30,7 +30,7 @@ class FileController extends ClientApiController
*/
public function __construct(
private NodeJWTService $jwtService,
- private DaemonFileRepository $fileRepository
+ private DaemonFileRepository $fileRepository,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/Servers/FileUploadController.php b/app/Http/Controllers/Api/Client/Servers/FileUploadController.php
index 98fcd587dc..d2741e2f41 100644
--- a/app/Http/Controllers/Api/Client/Servers/FileUploadController.php
+++ b/app/Http/Controllers/Api/Client/Servers/FileUploadController.php
@@ -16,7 +16,7 @@ class FileUploadController extends ClientApiController
* FileUploadController constructor.
*/
public function __construct(
- private NodeJWTService $jwtService
+ private NodeJWTService $jwtService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php b/app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php
index c20c51ddf8..199861d1e8 100644
--- a/app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php
+++ b/app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php
@@ -24,7 +24,7 @@ class NetworkAllocationController extends ClientApiController
*/
public function __construct(
private FindAssignableAllocationService $assignableAllocationService,
- private ServerRepository $serverRepository
+ private ServerRepository $serverRepository,
) {
parent::__construct();
}
@@ -88,7 +88,7 @@ public function setPrimary(SetPrimaryAllocationRequest $request, Server $server,
* Set the notes for the allocation for a server.
*s.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function store(NewAllocationRequest $request, Server $server): array
{
@@ -111,7 +111,7 @@ public function store(NewAllocationRequest $request, Server $server): array
/**
* Delete an allocation from a server.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function delete(DeleteAllocationRequest $request, Server $server, Allocation $allocation): JsonResponse
{
diff --git a/app/Http/Controllers/Api/Client/Servers/ScheduleController.php b/app/Http/Controllers/Api/Client/Servers/ScheduleController.php
index 400715f73b..1543dbd9ac 100644
--- a/app/Http/Controllers/Api/Client/Servers/ScheduleController.php
+++ b/app/Http/Controllers/Api/Client/Servers/ScheduleController.php
@@ -47,12 +47,12 @@ public function index(ViewScheduleRequest $request, Server $server): array
/**
* Store a new schedule for a server.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
public function store(StoreScheduleRequest $request, Server $server): array
{
- /** @var \Pterodactyl\Models\Schedule $model */
+ /** @var Schedule $model */
$model = $this->repository->create([
'server_id' => $server->id,
'name' => $request->input('name'),
@@ -95,7 +95,7 @@ public function view(ViewScheduleRequest $request, Server $server, Schedule $sch
/**
* Updates a given schedule with the new data provided.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
@@ -165,7 +165,7 @@ public function delete(DeleteScheduleRequest $request, Server $server, Schedule
/**
* Get the next run timestamp based on the cron data provided.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
protected function getNextRunAt(Request $request): Carbon
{
diff --git a/app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php b/app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php
index fb24a67b29..a74a44572b 100644
--- a/app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php
+++ b/app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php
@@ -26,7 +26,7 @@ class ScheduleTaskController extends ClientApiController
*/
public function __construct(
private ConnectionInterface $connection,
- private TaskRepository $repository
+ private TaskRepository $repository,
) {
parent::__construct();
}
@@ -35,7 +35,7 @@ public function __construct(
* Create a new task for a given schedule and store it in the database.
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
- * @throws \Pterodactyl\Exceptions\Service\ServiceLimitExceededException
+ * @throws ServiceLimitExceededException
*/
public function store(StoreTaskRequest $request, Server $server, Schedule $schedule): array
{
@@ -48,10 +48,10 @@ public function store(StoreTaskRequest $request, Server $server, Schedule $sched
throw new HttpForbiddenException('当服务器的备份限制设置为 0 时，则不能创建备份任务。');
}
- /** @var \Pterodactyl\Models\Task|null $lastTask */
+ /** @var Task|null $lastTask */
$lastTask = $schedule->tasks()->orderByDesc('sequence_id')->first();
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = $this->connection->transaction(function () use ($request, $schedule, $lastTask) {
$sequenceId = ($lastTask->sequence_id ?? 0) + 1;
$requestSequenceId = $request->integer('sequence_id', $sequenceId);
diff --git a/app/Http/Controllers/Api/Client/Servers/SettingsController.php b/app/Http/Controllers/Api/Client/Servers/SettingsController.php
index 5d4102b07b..527f62990e 100644
--- a/app/Http/Controllers/Api/Client/Servers/SettingsController.php
+++ b/app/Http/Controllers/Api/Client/Servers/SettingsController.php
@@ -21,7 +21,7 @@ class SettingsController extends ClientApiController
*/
public function __construct(
private ServerRepository $repository,
- private ReinstallServerService $reinstallServerService
+ private ReinstallServerService $reinstallServerService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/Servers/StartupController.php b/app/Http/Controllers/Api/Client/Servers/StartupController.php
index 5d34ef2d9f..aa712aa25a 100644
--- a/app/Http/Controllers/Api/Client/Servers/StartupController.php
+++ b/app/Http/Controllers/Api/Client/Servers/StartupController.php
@@ -19,7 +19,7 @@ class StartupController extends ClientApiController
*/
public function __construct(
private StartupCommandService $startupCommandService,
- private ServerVariableRepository $repository
+ private ServerVariableRepository $repository,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/Servers/SubuserController.php b/app/Http/Controllers/Api/Client/Servers/SubuserController.php
index 2c403c691d..f868a4154f 100644
--- a/app/Http/Controllers/Api/Client/Servers/SubuserController.php
+++ b/app/Http/Controllers/Api/Client/Servers/SubuserController.php
@@ -27,7 +27,7 @@ class SubuserController extends ClientApiController
public function __construct(
private SubuserRepository $repository,
private SubuserCreationService $creationService,
- private DaemonServerRepository $serverRepository
+ private DaemonServerRepository $serverRepository,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/Servers/WebsocketController.php b/app/Http/Controllers/Api/Client/Servers/WebsocketController.php
index 45e310cf21..b75424a843 100644
--- a/app/Http/Controllers/Api/Client/Servers/WebsocketController.php
+++ b/app/Http/Controllers/Api/Client/Servers/WebsocketController.php
@@ -19,7 +19,7 @@ class WebsocketController extends ClientApiController
*/
public function __construct(
private NodeJWTService $jwtService,
- private GetUserPermissionsService $permissionsService
+ private GetUserPermissionsService $permissionsService,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Client/TwoFactorController.php b/app/Http/Controllers/Api/Client/TwoFactorController.php
index 0858318018..013b1c3350 100644
--- a/app/Http/Controllers/Api/Client/TwoFactorController.php
+++ b/app/Http/Controllers/Api/Client/TwoFactorController.php
@@ -20,7 +20,7 @@ class TwoFactorController extends ClientApiController
public function __construct(
private ToggleTwoFactorService $toggleTwoFactorService,
private TwoFactorSetupService $setupService,
- private ValidationFactory $validation
+ private ValidationFactory $validation,
) {
parent::__construct();
}
diff --git a/app/Http/Controllers/Api/Remote/ActivityProcessingController.php b/app/Http/Controllers/Api/Remote/ActivityProcessingController.php
index b9d12c248b..b88d7ae7a7 100644
--- a/app/Http/Controllers/Api/Remote/ActivityProcessingController.php
+++ b/app/Http/Controllers/Api/Remote/ActivityProcessingController.php
@@ -27,7 +27,7 @@ public function __invoke(ActivityEventRequest $request)
$logs = [];
foreach ($request->input('data') as $datum) {
- /** @var \Pterodactyl\Models\Server|null $server */
+ /** @var Server|null $server */
$server = $servers->get($datum['server']);
if (is_null($server) || !Str::startsWith($datum['event'], 'server:')) {
continue;
diff --git a/app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php b/app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php
index 15fe8d9bd1..aa01e6b3c4 100644
--- a/app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php
+++ b/app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php
@@ -42,7 +42,7 @@ public function __invoke(Request $request, string $backup): JsonResponse
throw new BadRequestHttpException('A non-empty "size" query parameter must be provided.');
}
- /** @var \Pterodactyl\Models\Backup $model */
+ /** @var Backup $model */
$model = Backup::query()
->where('uuid', $backup)
->firstOrFail();
diff --git a/app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php b/app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
index a7535a9ecf..60eefd1e1f 100644
--- a/app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
+++ b/app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
@@ -35,7 +35,7 @@ public function index(ReportBackupCompleteRequest $request, string $backup): Jso
/** @var \Pterodactyl\Models\Node $node */
$node = $request->attributes->get('node');
- /** @var \Pterodactyl\Models\Backup $model */
+ /** @var Backup $model */
$model = Backup::query()
->where('uuid', $backup)
->firstOrFail();
@@ -92,7 +92,7 @@ public function index(ReportBackupCompleteRequest $request, string $backup): Jso
*/
public function restore(Request $request, string $backup): JsonResponse
{
- /** @var \Pterodactyl\Models\Backup $model */
+ /** @var Backup $model */
$model = Backup::query()->where('uuid', $backup)->firstOrFail();
$model->server->update(['status' => null]);
@@ -110,7 +110,7 @@ public function restore(Request $request, string $backup): JsonResponse
* the given backup.
*
* @throws \Exception
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
protected function completeMultipartUpload(Backup $backup, S3Filesystem $adapter, bool $successful, ?array $parts): void
{
diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php
index 8ce88e89ee..8f3bb321be 100644
--- a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php
+++ b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php
@@ -22,7 +22,7 @@ public function __construct(
protected ConnectionInterface $connection,
private ServerRepository $repository,
private ServerConfigurationStructureService $configurationStructureService,
- private EggConfigurationService $eggConfigurationService
+ private EggConfigurationService $eggConfigurationService,
) {
}
@@ -90,7 +90,7 @@ public function resetState(Request $request): JsonResponse
->get();
$this->connection->transaction(function () use ($node, $servers) {
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
foreach ($servers as $server) {
/** @var \Pterodactyl\Models\ActivityLog|null $activity */
$activity = $server->activity->first();
diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php
index 21f5f0804f..8c7bf746bb 100644
--- a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php
+++ b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php
@@ -22,7 +22,7 @@ class ServerTransferController extends Controller
public function __construct(
private ConnectionInterface $connection,
private ServerRepository $repository,
- private DaemonServerRepository $daemonServerRepository
+ private DaemonServerRepository $daemonServerRepository,
) {
}
diff --git a/app/Http/Controllers/Auth/AbstractLoginController.php b/app/Http/Controllers/Auth/AbstractLoginController.php
index f07282fbac..e1e3101b18 100644
--- a/app/Http/Controllers/Auth/AbstractLoginController.php
+++ b/app/Http/Controllers/Auth/AbstractLoginController.php
@@ -49,9 +49,9 @@ public function __construct()
/**
* Get the failed login response instance.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
- protected function sendFailedLoginResponse(Request $request, Authenticatable $user = null, string $message = null)
+ protected function sendFailedLoginResponse(Request $request, ?Authenticatable $user = null, ?string $message = null)
{
$this->incrementLoginAttempts($request);
$this->fireFailedLoginEvent($user, [
@@ -91,7 +91,7 @@ protected function sendLoginResponse(User $user, Request $request): JsonResponse
/**
* Determine if the user is logging in using an email or username.
*/
- protected function getField(string $input = null): string
+ protected function getField(?string $input = null): string
{
return ($input && str_contains($input, '@')) ? 'email' : 'username';
}
@@ -99,7 +99,7 @@ protected function getField(string $input = null): string
/**
* Fire a failed login event.
*/
- protected function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = [])
+ protected function fireFailedLoginEvent(?Authenticatable $user = null, array $credentials = [])
{
Event::dispatch(new Failed('auth', $user, $credentials));
}
diff --git a/app/Http/Controllers/Auth/LoginCheckpointController.php b/app/Http/Controllers/Auth/LoginCheckpointController.php
index 807dad6cd2..427bcddcca 100644
--- a/app/Http/Controllers/Auth/LoginCheckpointController.php
+++ b/app/Http/Controllers/Auth/LoginCheckpointController.php
@@ -24,7 +24,7 @@ class LoginCheckpointController extends AbstractLoginController
public function __construct(
private Encrypter $encrypter,
private Google2FA $google2FA,
- private ValidationFactory $validation
+ private ValidationFactory $validation,
) {
parent::__construct();
}
@@ -56,7 +56,7 @@ public function __invoke(LoginCheckpointRequest $request): JsonResponse
}
try {
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::query()->findOrFail($details['user_id']);
} catch (ModelNotFoundException) {
$this->sendFailedLoginResponse($request, null, self::TOKEN_EXPIRED_MESSAGE);
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 2dbb34ee36..0de1dfea00 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -48,7 +48,7 @@ public function login(Request $request): JsonResponse
try {
$username = $request->input('user');
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::query()->where($this->getField($username), $username)->firstOrFail();
} catch (ModelNotFoundException) {
$this->sendFailedLoginResponse($request);
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 3325a1e6b3..292eb25cb2 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -31,14 +31,14 @@ class ResetPasswordController extends Controller
public function __construct(
private Dispatcher $dispatcher,
private Hasher $hasher,
- private UserRepositoryInterface $userRepository
+ private UserRepositoryInterface $userRepository,
) {
}
/**
* Reset the given user's password.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function __invoke(ResetPasswordRequest $request): JsonResponse
{
diff --git a/app/Http/Controllers/Base/IndexController.php b/app/Http/Controllers/Base/IndexController.php
index fecaa91a3e..a7a8d45f95 100644
--- a/app/Http/Controllers/Base/IndexController.php
+++ b/app/Http/Controllers/Base/IndexController.php
@@ -14,7 +14,7 @@ class IndexController extends Controller
*/
public function __construct(
protected ServerRepositoryInterface $repository,
- protected ViewFactory $view
+ protected ViewFactory $view,
) {
}
diff --git a/app/Http/Middleware/Admin/Servers/ServerInstalled.php b/app/Http/Middleware/Admin/Servers/ServerInstalled.php
index ae99b896ef..d3fa75951e 100644
--- a/app/Http/Middleware/Admin/Servers/ServerInstalled.php
+++ b/app/Http/Middleware/Admin/Servers/ServerInstalled.php
@@ -15,7 +15,7 @@ class ServerInstalled
*/
public function handle(Request $request, \Closure $next): mixed
{
- /** @var \Pterodactyl\Models\Server|null $server */
+ /** @var Server|null $server */
$server = $request->route()->parameter('server');
if (!$server instanceof Server) {
diff --git a/app/Http/Middleware/AdminAuthenticate.php b/app/Http/Middleware/AdminAuthenticate.php
index 4c7f48befb..2e61f64296 100644
--- a/app/Http/Middleware/AdminAuthenticate.php
+++ b/app/Http/Middleware/AdminAuthenticate.php
@@ -10,7 +10,7 @@ class AdminAuthenticate
/**
* Handle an incoming request.
*
- * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+ * @throws AccessDeniedHttpException
*/
public function handle(Request $request, \Closure $next): mixed
{
diff --git a/app/Http/Middleware/Api/AuthenticateIPAccess.php b/app/Http/Middleware/Api/AuthenticateIPAccess.php
index b8a9937ab8..e2332de3ad 100644
--- a/app/Http/Middleware/Api/AuthenticateIPAccess.php
+++ b/app/Http/Middleware/Api/AuthenticateIPAccess.php
@@ -15,11 +15,11 @@ class AuthenticateIPAccess
* Determine if a request IP has permission to access the API.
*
* @throws \Exception
- * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+ * @throws AccessDeniedHttpException
*/
public function handle(Request $request, \Closure $next): mixed
{
- /** @var \Laravel\Sanctum\TransientToken|\Pterodactyl\Models\ApiKey $token */
+ /** @var TransientToken|\Pterodactyl\Models\ApiKey $token */
$token = $request->user()->currentAccessToken();
// If this is a stateful request just push the request through to the next
diff --git a/app/Http/Middleware/Api/Client/Server/ResourceBelongsToServer.php b/app/Http/Middleware/Api/Client/Server/ResourceBelongsToServer.php
index 1157ddcedf..9197b415e7 100644
--- a/app/Http/Middleware/Api/Client/Server/ResourceBelongsToServer.php
+++ b/app/Http/Middleware/Api/Client/Server/ResourceBelongsToServer.php
@@ -31,7 +31,7 @@ public function handle(Request $request, \Closure $next): mixed
throw new \InvalidArgumentException('This middleware cannot be used in a context that is missing a server in the parameters.');
}
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
$server = $request->route()->parameter('server');
$exception = new NotFoundHttpException('The requested resource was not found for this server.');
foreach ($params as $key => $model) {
diff --git a/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php b/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php
index 8b224c351a..97976c469f 100644
--- a/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php
+++ b/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php
@@ -29,7 +29,7 @@ public function __construct(private Encrypter $encrypter, private NodeRepository
/**
* Check if a request from the daemon can be properly attributed back to a single node instance.
*
- * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ * @throws HttpException
*/
public function handle(Request $request, \Closure $next): mixed
{
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index ad3eecdc7b..2889506c96 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -17,7 +17,7 @@ public function __construct(private AuthManager $authManager)
/**
* Handle an incoming request.
*/
- public function handle(Request $request, \Closure $next, string $guard = null): mixed
+ public function handle(Request $request, \Closure $next, ?string $guard = null): mixed
{
if ($this->authManager->guard($guard)->check()) {
return redirect()->route('index');
diff --git a/app/Http/Middleware/RequireTwoFactorAuthentication.php b/app/Http/Middleware/RequireTwoFactorAuthentication.php
index 090e146c4e..a97e3796e8 100644
--- a/app/Http/Middleware/RequireTwoFactorAuthentication.php
+++ b/app/Http/Middleware/RequireTwoFactorAuthentication.php
@@ -31,7 +31,7 @@ public function __construct(private AlertsMessageBag $alert)
* order to perform actions. If so, we check the level at which it is required (all users
* or just admins) and then check if the user has enabled it for their account.
*
- * @throws \Pterodactyl\Exceptions\Http\TwoFactorAuthRequiredException
+ * @throws TwoFactorAuthRequiredException
*/
public function handle(Request $request, \Closure $next): mixed
{
diff --git a/app/Http/Requests/Admin/AdminFormRequest.php b/app/Http/Requests/Admin/AdminFormRequest.php
index 8597e1d939..59ba0db64d 100644
--- a/app/Http/Requests/Admin/AdminFormRequest.php
+++ b/app/Http/Requests/Admin/AdminFormRequest.php
@@ -28,7 +28,7 @@ public function authorize(): bool
* Return only the fields that we are interested in from the request.
* This will include empty fields as a null value.
*/
- public function normalize(array $only = null): array
+ public function normalize(?array $only = null): array
{
return $this->only($only ?? array_keys($this->rules()));
}
diff --git a/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php b/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
index 3f014e9821..9836980703 100644
--- a/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
+++ b/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
@@ -27,7 +27,7 @@ public function rules(): array
* Override the default normalization function for this type of request
* as we need to accept empty values on the keys.
*/
- public function normalize(array $only = null): array
+ public function normalize(?array $only = null): array
{
$keys = array_flip(array_keys($this->rules()));
diff --git a/app/Http/Requests/Api/Application/ApplicationApiRequest.php b/app/Http/Requests/Api/Application/ApplicationApiRequest.php
index 2e0ed133a5..e6d36a8a3c 100644
--- a/app/Http/Requests/Api/Application/ApplicationApiRequest.php
+++ b/app/Http/Requests/Api/Application/ApplicationApiRequest.php
@@ -29,7 +29,7 @@ abstract class ApplicationApiRequest extends FormRequest
* Determine if the current user is authorized to perform
* the requested action against the API.
*
- * @throws \Pterodactyl\Exceptions\PterodactylException
+ * @throws PterodactylException
*/
public function authorize(): bool
{
diff --git a/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php b/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
index 4fe7054485..e80fdd4a76 100644
--- a/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
+++ b/app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
@@ -15,7 +15,7 @@ class StoreNodeRequest extends ApplicationApiRequest
/**
* Validation rules to apply to this request.
*/
- public function rules(array $rules = null): array
+ public function rules(?array $rules = null): array
{
return collect($rules ?? Node::getRules())->only([
'public',
diff --git a/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php b/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
index 7133bd0b52..45aaea630a 100644
--- a/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
+++ b/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php
@@ -10,7 +10,7 @@ class UpdateNodeRequest extends StoreNodeRequest
* Apply validation rules to this request. Uses the parent class rules()
* function but passes in the rules for updating rather than creating.
*/
- public function rules(array $rules = null): array
+ public function rules(?array $rules = null): array
{
$node = $this->route()->parameter('node')->id;
diff --git a/app/Http/Requests/Api/Application/Users/StoreUserRequest.php b/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
index 1e8e54edf6..1ec02f6d11 100644
--- a/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
+++ b/app/Http/Requests/Api/Application/Users/StoreUserRequest.php
@@ -15,7 +15,7 @@ class StoreUserRequest extends ApplicationApiRequest
/**
* Return the validation rules for this request.
*/
- public function rules(array $rules = null): array
+ public function rules(?array $rules = null): array
{
$rules = $rules ?? User::getRules();
diff --git a/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php b/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
index fa2e1291c7..b31a3c52c2 100644
--- a/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
+++ b/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php
@@ -9,7 +9,7 @@ class UpdateUserRequest extends StoreUserRequest
/**
* Return the validation rules for this request.
*/
- public function rules(array $rules = null): array
+ public function rules(?array $rules = null): array
{
$userId = $this->parameter('user', User::class)->id;
diff --git a/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php b/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
index 6287ba5855..abafc2dc6a 100644
--- a/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
+++ b/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
@@ -11,7 +11,7 @@
class UpdateEmailRequest extends ClientApiRequest
{
/**
- * @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
+ * @throws InvalidPasswordProvidedException
*/
public function authorize(): bool
{
diff --git a/app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php b/app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php
index de8215b07e..8f003d0282 100644
--- a/app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php
+++ b/app/Http/Requests/Api/Client/Account/UpdatePasswordRequest.php
@@ -10,7 +10,7 @@
class UpdatePasswordRequest extends ClientApiRequest
{
/**
- * @throws \Pterodactyl\Exceptions\Http\Base\InvalidPasswordProvidedException
+ * @throws InvalidPasswordProvidedException
*/
public function authorize(): bool
{
diff --git a/app/Http/Requests/Api/Client/Servers/Settings/SetDockerImageRequest.php b/app/Http/Requests/Api/Client/Servers/Settings/SetDockerImageRequest.php
index f79cd1ab9b..a65e827988 100644
--- a/app/Http/Requests/Api/Client/Servers/Settings/SetDockerImageRequest.php
+++ b/app/Http/Requests/Api/Client/Servers/Settings/SetDockerImageRequest.php
@@ -18,7 +18,7 @@ public function permission(): string
public function rules(): array
{
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
$server = $this->route()->parameter('server');
Assert::isInstanceOf($server, Server::class);
diff --git a/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php b/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php
index 7c4fab9d22..7aec2263e1 100644
--- a/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php
+++ b/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php
@@ -63,8 +63,8 @@ protected function validatePermissionsCanBeAssigned(array $permissions)
// Otherwise, get the current subuser's permission set, and ensure that the
// permissions they are trying to assign are not _more_ than the ones they
// already have.
- /** @var \Pterodactyl\Models\Subuser|null $subuser */
- /** @var \Pterodactyl\Services\Servers\GetUserPermissionsService $service */
+ /** @var Subuser|null $subuser */
+ /** @var GetUserPermissionsService $service */
$service = $this->container->make(GetUserPermissionsService::class);
if (count(array_diff($permissions, $service->handle($server, $user))) > 0) {
diff --git a/app/Jobs/Schedule/RunTaskJob.php b/app/Jobs/Schedule/RunTaskJob.php
index 3796e4db85..8669d31d81 100644
--- a/app/Jobs/Schedule/RunTaskJob.php
+++ b/app/Jobs/Schedule/RunTaskJob.php
@@ -37,7 +37,7 @@ public function __construct(public Task $task, public bool $manualRun = false)
public function handle(
DaemonCommandRepository $commandRepository,
InitiateBackupService $backupService,
- DaemonPowerRepository $powerRepository
+ DaemonPowerRepository $powerRepository,
) {
// Do not process a task that is not set to active, unless it's been manually triggered.
if (!$this->task->schedule->is_active && !$this->manualRun) {
@@ -88,7 +88,7 @@ public function handle(
/**
* Handle a failure while sending the action to the daemon or otherwise processing the job.
*/
- public function failed(\Exception $exception = null)
+ public function failed(?\Exception $exception = null)
{
$this->markTaskNotQueued();
$this->markScheduleComplete();
@@ -99,7 +99,7 @@ public function failed(\Exception $exception = null)
*/
private function queueNextTask()
{
- /** @var \Pterodactyl\Models\Task|null $nextTask */
+ /** @var Task|null $nextTask */
$nextTask = Task::query()->where('schedule_id', $this->task->schedule_id)
->orderBy('sequence_id', 'asc')
->where('sequence_id', '>', $this->task->sequence_id)
diff --git a/app/Models/ActivityLog.php b/app/Models/ActivityLog.php
index e8f8a4e302..5c9ce6efd7 100644
--- a/app/Models/ActivityLog.php
+++ b/app/Models/ActivityLog.php
@@ -24,11 +24,11 @@
* @property int|null $actor_id
* @property int|null $api_key_id
* @property \Illuminate\Support\Collection|null $properties
- * @property \Carbon\Carbon $timestamp
+ * @property Carbon $timestamp
* @property IlluminateModel|\Eloquent $actor
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\ActivityLogSubject[] $subjects
* @property int|null $subjects_count
- * @property \Pterodactyl\Models\ApiKey|null $apiKey
+ * @property ApiKey|null $apiKey
*
* @method static Builder|ActivityLog forActor(\Illuminate\Database\Eloquent\Model $actor)
* @method static Builder|ActivityLog forEvent(string $action)
diff --git a/app/Models/ActivityLogSubject.php b/app/Models/ActivityLogSubject.php
index 6629b3e7d6..aabeb0ad22 100644
--- a/app/Models/ActivityLogSubject.php
+++ b/app/Models/ActivityLogSubject.php
@@ -11,7 +11,7 @@
* @property int $activity_log_id
* @property int $subject_id
* @property string $subject_type
- * @property \Pterodactyl\Models\ActivityLog|null $activityLog
+ * @property ActivityLog|null $activityLog
* @property \Illuminate\Database\Eloquent\Model|\Eloquent $subject
*
* @method static \Illuminate\Database\Eloquent\Builder|ActivityLogSubject newModelQuery()
diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php
index d16e3150ce..cf07750084 100644
--- a/app/Models/Allocation.php
+++ b/app/Models/Allocation.php
@@ -3,6 +3,7 @@
namespace Pterodactyl\Models;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* Pterodactyl\Models\Allocation.
@@ -18,8 +19,8 @@
* @property \Carbon\Carbon|null $updated_at
* @property string $alias
* @property bool $has_alias
- * @property \Pterodactyl\Models\Server|null $server
- * @property \Pterodactyl\Models\Node $node
+ * @property Server|null $server
+ * @property Node $node
* @property string $hashid
*
* @method static \Database\Factories\AllocationFactory factory(...$parameters)
@@ -40,6 +41,9 @@
*/
class Allocation extends Model
{
+ /** @use HasFactory<\Database\Factories\AllocationFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
@@ -74,9 +78,6 @@ class Allocation extends Model
'notes' => 'nullable|string|max:256',
];
- /**
- * {@inheritDoc}
- */
public function getRouteKeyName(): string
{
return $this->getKeyName();
diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php
index e141e89a22..4a6f1b65b2 100644
--- a/app/Models/ApiKey.php
+++ b/app/Models/ApiKey.php
@@ -6,6 +6,7 @@
use Webmozart\Assert\Assert;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* Pterodactyl\Models\ApiKey.
@@ -30,8 +31,8 @@
* @property int $r_eggs
* @property int $r_database_hosts
* @property int $r_server_databases
- * @property \Pterodactyl\Models\User $tokenable
- * @property \Pterodactyl\Models\User $user
+ * @property User $tokenable
+ * @property User $user
*
* @method static \Database\Factories\ApiKeyFactory factory(...$parameters)
* @method static \Illuminate\Database\Eloquent\Builder|ApiKey newModelQuery()
@@ -61,6 +62,9 @@
*/
class ApiKey extends Model
{
+ /** @use HasFactory<\Database\Factories\ApiKeyFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
diff --git a/app/Models/AuditLog.php b/app/Models/AuditLog.php
index f42acbfffb..ed5c884be7 100644
--- a/app/Models/AuditLog.php
+++ b/app/Models/AuditLog.php
@@ -58,7 +58,7 @@ public function server(): BelongsTo
*/
public static function instance(string $action, array $metadata, bool $isSystem = false): self
{
- /** @var \Illuminate\Http\Request $request */
+ /** @var Request $request */
$request = Container::getInstance()->make('request');
if ($isSystem || !$request instanceof Request) {
$request = null;
diff --git a/app/Models/Backup.php b/app/Models/Backup.php
index c9a75ccfcc..9b546ba281 100644
--- a/app/Models/Backup.php
+++ b/app/Models/Backup.php
@@ -4,6 +4,7 @@
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property int $id
@@ -21,11 +22,13 @@
* @property \Carbon\CarbonImmutable $created_at
* @property \Carbon\CarbonImmutable $updated_at
* @property \Carbon\CarbonImmutable|null $deleted_at
- * @property \Pterodactyl\Models\Server $server
+ * @property Server $server
* @property \Pterodactyl\Models\AuditLog[] $audits
*/
class Backup extends Model
{
+ /** @use HasFactory<\Database\Factories\BackupFactory> */
+ use HasFactory;
use SoftDeletes;
public const RESOURCE_NAME = 'backup';
diff --git a/app/Models/Database.php b/app/Models/Database.php
index e3856a4e2d..c6a06c3652 100644
--- a/app/Models/Database.php
+++ b/app/Models/Database.php
@@ -4,6 +4,7 @@
use Illuminate\Container\Container;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Pterodactyl\Contracts\Extensions\HashidsInterface;
/**
@@ -17,11 +18,14 @@
* @property int $max_connections
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
- * @property \Pterodactyl\Models\Server $server
- * @property \Pterodactyl\Models\DatabaseHost $host
+ * @property Server $server
+ * @property DatabaseHost $host
*/
class Database extends Model
{
+ /** @use HasFactory<\Database\Factories\DatabaseFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
@@ -64,9 +68,6 @@ class Database extends Model
'password' => 'string',
];
- /**
- * {@inheritDoc}
- */
public function getRouteKeyName(): string
{
return $this->getKeyName();
@@ -76,7 +77,6 @@ public function getRouteKeyName(): string
* Resolves the database using the ID by checking if the value provided is a HashID
* string value, or just the ID to the database itself.
*
- * @param mixed $value
* @param string|null $field
*
* @throws \Illuminate\Contracts\Container\BindingResolutionException
diff --git a/app/Models/DatabaseHost.php b/app/Models/DatabaseHost.php
index df56eb7c72..f489998319 100644
--- a/app/Models/DatabaseHost.php
+++ b/app/Models/DatabaseHost.php
@@ -4,6 +4,7 @@
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property int $id
@@ -19,6 +20,9 @@
*/
class DatabaseHost extends Model
{
+ /** @use HasFactory<\Database\Factories\DatabaseHostFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
diff --git a/app/Models/Egg.php b/app/Models/Egg.php
index 3ab8730bc7..618887affc 100644
--- a/app/Models/Egg.php
+++ b/app/Models/Egg.php
@@ -4,6 +4,7 @@
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property int $id
@@ -40,14 +41,17 @@
* @property string|null $inherit_config_stop
* @property string $inherit_file_denylist
* @property array|null $inherit_features
- * @property \Pterodactyl\Models\Nest $nest
+ * @property Nest $nest
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Server[] $servers
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\EggVariable[] $variables
- * @property \Pterodactyl\Models\Egg|null $scriptFrom
- * @property \Pterodactyl\Models\Egg|null $configFrom
+ * @property Egg|null $scriptFrom
+ * @property Egg|null $configFrom
*/
class Egg extends Model
{
+ /** @use HasFactory<\Database\Factories\EggFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
diff --git a/app/Models/EggMount.php b/app/Models/EggMount.php
index ed494a13ed..2016f54236 100644
--- a/app/Models/EggMount.php
+++ b/app/Models/EggMount.php
@@ -6,7 +6,7 @@ class EggMount extends Model
{
protected $table = 'egg_mount';
- protected $primaryKey = null;
+ protected $primaryKey;
public $incrementing = false;
}
diff --git a/app/Models/EggVariable.php b/app/Models/EggVariable.php
index 8c34bb3980..887adc795c 100644
--- a/app/Models/EggVariable.php
+++ b/app/Models/EggVariable.php
@@ -4,6 +4,7 @@
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property int $id
@@ -18,8 +19,8 @@
* @property \Carbon\CarbonImmutable $created_at
* @property \Carbon\CarbonImmutable $updated_at
* @property bool $required
- * @property \Pterodactyl\Models\Egg $egg
- * @property \Pterodactyl\Models\ServerVariable $serverVariable
+ * @property Egg $egg
+ * @property ServerVariable $serverVariable
*
* The "server_value" variable is only present on the object if you've loaded this model
* using the server relationship.
@@ -27,6 +28,9 @@
*/
class EggVariable extends Model
{
+ /** @use HasFactory<\Database\Factories\EggVariableFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 47a30354b3..656d6ce01e 100644
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -3,6 +3,7 @@
namespace Pterodactyl\Models;
use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
/**
@@ -16,6 +17,9 @@
*/
class Location extends Model
{
+ /** @use HasFactory<\Database\Factories\LocationFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
@@ -40,9 +44,6 @@ class Location extends Model
'long' => 'string|nullable|between:1,191',
];
- /**
- * {@inheritDoc}
- */
public function getRouteKeyName(): string
{
return $this->getKeyName();
diff --git a/app/Models/Model.php b/app/Models/Model.php
index 2e371d9d9c..2a1c93c678 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -10,15 +10,12 @@
use Illuminate\Container\Container;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Validation\ValidationException;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
use Pterodactyl\Exceptions\Model\DataValidationException;
use Illuminate\Database\Eloquent\Model as IlluminateModel;
use Illuminate\Contracts\Validation\Factory as ValidationFactory;
abstract class Model extends IlluminateModel
{
- use HasFactory;
-
/**
* Set to true to return immutable Carbon date instances from the model.
*/
@@ -147,7 +144,7 @@ public static function getRulesForUpdate($model, string $column = 'id'): array
/**
* Determines if the model is in a valid state or not.
*
- * @throws \Illuminate\Validation\ValidationException
+ * @throws ValidationException
*/
public function validate(): void
{
@@ -173,8 +170,6 @@ public function validate(): void
/**
* Return a timestamp as DateTime object.
- *
- * @param mixed $value
*/
protected function asDateTime($value): Carbon|CarbonImmutable
{
diff --git a/app/Models/MountNode.php b/app/Models/MountNode.php
index 3a189c46b5..dae6b3179e 100644
--- a/app/Models/MountNode.php
+++ b/app/Models/MountNode.php
@@ -8,7 +8,7 @@ class MountNode extends Model
{
protected $table = 'mount_node';
- protected $primaryKey = null;
+ protected $primaryKey;
public $incrementing = false;
}
diff --git a/app/Models/MountServer.php b/app/Models/MountServer.php
index b9c0219e33..61d9bcb658 100644
--- a/app/Models/MountServer.php
+++ b/app/Models/MountServer.php
@@ -10,7 +10,7 @@ class MountServer extends Model
public $timestamps = false;
- protected $primaryKey = null;
+ protected $primaryKey;
public $incrementing = false;
}
diff --git a/app/Models/Nest.php b/app/Models/Nest.php
index 9a06ba2990..22582fdd49 100644
--- a/app/Models/Nest.php
+++ b/app/Models/Nest.php
@@ -3,6 +3,7 @@
namespace Pterodactyl\Models;
use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property int $id
@@ -17,6 +18,9 @@
*/
class Nest extends Model
{
+ /** @use HasFactory<\Database\Factories\NestFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
diff --git a/app/Models/Node.php b/app/Models/Node.php
index 62ec828712..fdb1a43e95 100644
--- a/app/Models/Node.php
+++ b/app/Models/Node.php
@@ -9,6 +9,7 @@
use Illuminate\Contracts\Encryption\Encrypter;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
/**
@@ -34,13 +35,15 @@
* @property string $daemonBase
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
- * @property \Pterodactyl\Models\Location $location
+ * @property Location $location
* @property \Pterodactyl\Models\Mount[]|\Illuminate\Database\Eloquent\Collection $mounts
* @property \Pterodactyl\Models\Server[]|\Illuminate\Database\Eloquent\Collection $servers
* @property \Pterodactyl\Models\Allocation[]|\Illuminate\Database\Eloquent\Collection $allocations
*/
class Node extends Model
{
+ /** @use HasFactory<\Database\Factories\NodeFactory> */
+ use HasFactory;
use Notifiable;
/**
diff --git a/app/Models/RecoveryToken.php b/app/Models/RecoveryToken.php
index d4ca764a08..cb64a6886d 100644
--- a/app/Models/RecoveryToken.php
+++ b/app/Models/RecoveryToken.php
@@ -9,7 +9,7 @@
* @property int $user_id
* @property string $token
* @property \Carbon\CarbonImmutable $created_at
- * @property \Pterodactyl\Models\User $user
+ * @property User $user
*/
class RecoveryToken extends Model
{
diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php
index a61bd3cd8f..2d85314f0c 100644
--- a/app/Models/Schedule.php
+++ b/app/Models/Schedule.php
@@ -7,6 +7,7 @@
use Illuminate\Container\Container;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Pterodactyl\Contracts\Extensions\HashidsInterface;
/**
@@ -26,11 +27,14 @@
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property string $hashid
- * @property \Pterodactyl\Models\Server $server
+ * @property Server $server
* @property \Pterodactyl\Models\Task[]|\Illuminate\Support\Collection $tasks
*/
class Schedule extends Model
{
+ /** @use HasFactory<\Database\Factories\ScheduleFactory> */
+ use HasFactory;
+
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
@@ -102,9 +106,6 @@ class Schedule extends Model
'next_run_at' => 'nullable|date',
];
- /**
- * {@inheritDoc}
- */
public function getRouteKeyName(): string
{
return $this->getKeyName();
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 748104db4e..36d92f54f4 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -8,6 +8,7 @@
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Pterodactyl\Exceptions\Http\Server\ServerStateConflictException;
@@ -45,26 +46,26 @@
* @property \Illuminate\Support\Carbon|null $installed_at
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\ActivityLog[] $activity
* @property int|null $activity_count
- * @property \Pterodactyl\Models\Allocation|null $allocation
+ * @property Allocation|null $allocation
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Allocation[] $allocations
* @property int|null $allocations_count
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Backup[] $backups
* @property int|null $backups_count
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Database[] $databases
* @property int|null $databases_count
- * @property \Pterodactyl\Models\Egg|null $egg
+ * @property Egg|null $egg
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Mount[] $mounts
* @property int|null $mounts_count
- * @property \Pterodactyl\Models\Nest $nest
- * @property \Pterodactyl\Models\Node $node
+ * @property Nest $nest
+ * @property Node $node
* @property \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
* @property int|null $notifications_count
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Schedule[] $schedules
* @property int|null $schedules_count
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Subuser[] $subusers
* @property int|null $subusers_count
- * @property \Pterodactyl\Models\ServerTransfer|null $transfer
- * @property \Pterodactyl\Models\User $user
+ * @property ServerTransfer|null $transfer
+ * @property User $user
* @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\EggVariable[] $variables
* @property int|null $variables_count
*
@@ -104,6 +105,8 @@
*/
class Server extends Model
{
+ /** @use HasFactory<\Database\Factories\ServerFactory> */
+ use HasFactory;
use BelongsToThrough;
use Notifiable;
@@ -348,16 +351,16 @@ public function activity(): MorphToMany
* exception is raised. This should be called whenever something needs to make
* sure the server is not in a weird state that should block user access.
*
- * @throws \Pterodactyl\Exceptions\Http\Server\ServerStateConflictException
+ * @throws ServerStateConflictException
*/
public function validateCurrentState()
{
if (
- $this->isSuspended() ||
- $this->node->isUnderMaintenance() ||
- !$this->isInstalled() ||
- $this->status === self::STATUS_RESTORING_BACKUP ||
- !is_null($this->transfer)
+ $this->isSuspended()
+ || $this->node->isUnderMaintenance()
+ || !$this->isInstalled()
+ || $this->status === self::STATUS_RESTORING_BACKUP
+ || !is_null($this->transfer)
) {
throw new ServerStateConflictException($this);
}
@@ -372,9 +375,9 @@ public function validateCurrentState()
public function validateTransferState()
{
if (
- !$this->isInstalled() ||
- $this->status === self::STATUS_RESTORING_BACKUP ||
- !is_null($this->transfer)
+ !$this->isInstalled()
+ || $this->status === self::STATUS_RESTORING_BACKUP
+ || !is_null($this->transfer)
) {
throw new ServerStateConflictException($this);
}
diff --git a/app/Models/ServerTransfer.php b/app/Models/ServerTransfer.php
index da46188282..861252c661 100644
--- a/app/Models/ServerTransfer.php
+++ b/app/Models/ServerTransfer.php
@@ -18,9 +18,9 @@
* @property bool $archived
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
- * @property \Pterodactyl\Models\Server $server
- * @property \Pterodactyl\Models\Node $oldNode
- * @property \Pterodactyl\Models\Node $newNode
+ * @property Server $server
+ * @property Node $oldNode
+ * @property Node $newNode
*/
class ServerTransfer extends Model
{
diff --git a/app/Models/ServerVariable.php b/app/Models/ServerVariable.php
index 46ae57dd4b..7acca466ae 100644
--- a/app/Models/ServerVariable.php
+++ b/app/Models/ServerVariable.php
@@ -11,8 +11,8 @@
* @property string $variable_value
* @property \Carbon\CarbonImmutable|null $created_at
* @property \Carbon\CarbonImmutable|null $updated_at
- * @property \Pterodactyl\Models\EggVariable $variable
- * @property \Pterodactyl\Models\Server $server
+ * @property EggVariable $variable
+ * @property Server $server
*/
class ServerVariable extends Model
{
diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php
index 40950d5b2d..e8c74a49d6 100644
--- a/app/Models/Subuser.php
+++ b/app/Models/Subuser.php
@@ -5,6 +5,7 @@
use Illuminate\Notifications\Notifiable;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property int $id
@@ -13,11 +14,13 @@
* @property array $permissions
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
- * @property \Pterodactyl\Models\User $user
- * @property \Pterodactyl\Models\Server $server
+ * @property User $user
+ * @property Server $server
*/
class Subuser extends Model
{
+ /** @use HasFactory<\Database\Factories\SubuserFactory> */
+ use HasFactory;
use Notifiable;
/**
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 8e772731e1..15d699473e 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -5,6 +5,7 @@
use Illuminate\Container\Container;
use Znck\Eloquent\Traits\BelongsToThrough;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Pterodactyl\Contracts\Extensions\HashidsInterface;
/**
@@ -19,11 +20,13 @@
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property string $hashid
- * @property \Pterodactyl\Models\Schedule $schedule
- * @property \Pterodactyl\Models\Server $server
+ * @property Schedule $schedule
+ * @property Server $server
*/
class Task extends Model
{
+ /** @use HasFactory<\Database\Factories\TaskFactory> */
+ use HasFactory;
use BelongsToThrough;
/**
@@ -93,9 +96,6 @@ class Task extends Model
'continue_on_failure' => 'boolean',
];
- /**
- * {@inheritDoc}
- */
public function getRouteKeyName(): string
{
return $this->getKeyName();
diff --git a/app/Models/Traits/HasAccessTokens.php b/app/Models/Traits/HasAccessTokens.php
index ed042ccfa0..ff50c3f77f 100644
--- a/app/Models/Traits/HasAccessTokens.php
+++ b/app/Models/Traits/HasAccessTokens.php
@@ -26,7 +26,7 @@ public function tokens(): HasMany
public function createToken(?string $memo, ?array $ips): NewAccessToken
{
- /** @var \Pterodactyl\Models\ApiKey $token */
+ /** @var ApiKey $token */
$token = $this->tokens()->forceCreate([
'user_id' => $this->id,
'key_type' => ApiKey::TYPE_ACCOUNT,
diff --git a/app/Models/User.php b/app/Models/User.php
index bf66198bd6..60d26d9087 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -14,6 +14,7 @@
use Pterodactyl\Traits\Helpers\AvailableLanguages;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Foundation\Auth\Access\Authorizable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
@@ -89,6 +90,8 @@ class User extends Model implements
use CanResetPassword;
use HasAccessTokens;
use Notifiable;
+ /** @use HasFactory<\Database\Factories\UserFactory> */
+ use HasFactory;
public const USER_LEVEL_USER = 0;
public const USER_LEVEL_ADMIN = 1;
diff --git a/app/Models/UserSSHKey.php b/app/Models/UserSSHKey.php
index fb3c8f395d..97b4725b84 100644
--- a/app/Models/UserSSHKey.php
+++ b/app/Models/UserSSHKey.php
@@ -4,6 +4,7 @@
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* \Pterodactyl\Models\UserSSHKey.
@@ -16,7 +17,7 @@
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at
- * @property \Pterodactyl\Models\User $user
+ * @property User $user
*
* @method static \Illuminate\Database\Eloquent\Builder|UserSSHKey newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserSSHKey newQuery()
@@ -39,6 +40,8 @@
*/
class UserSSHKey extends Model
{
+ /** @use HasFactory<\Database\Factories\UserSSHKeyFactory> */
+ use HasFactory;
use SoftDeletes;
public const RESOURCE_NAME = 'ssh_key';
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 9f9556b9a3..28222f0067 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -21,9 +21,4 @@ public function boot(): void
{
Sanctum::usePersonalAccessTokenModel(ApiKey::class);
}
-
- public function register(): void
- {
- Sanctum::ignoreMigrations();
- }
}
diff --git a/app/Repositories/Eloquent/EggRepository.php b/app/Repositories/Eloquent/EggRepository.php
index 8c4a01a270..0e09ab20fa 100644
--- a/app/Repositories/Eloquent/EggRepository.php
+++ b/app/Repositories/Eloquent/EggRepository.php
@@ -22,7 +22,7 @@ public function model(): string
/**
* Return an egg with the variables relation attached.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithVariables(int $id): Egg
{
@@ -46,7 +46,7 @@ public function getAllWithCopyAttributes(): Collection
*
* @param int|string $value
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithCopyAttributes($value, string $column = 'id'): Egg
{
@@ -62,7 +62,7 @@ public function getWithCopyAttributes($value, string $column = 'id'): Egg
/**
* Return all the data needed to export a service.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithExportAttributes(int $id): Egg
{
diff --git a/app/Repositories/Eloquent/EloquentRepository.php b/app/Repositories/Eloquent/EloquentRepository.php
index a4e7f2fd78..443accfd36 100644
--- a/app/Repositories/Eloquent/EloquentRepository.php
+++ b/app/Repositories/Eloquent/EloquentRepository.php
@@ -71,7 +71,7 @@ public function getBuilder(): Builder
/**
* Create a new record in the database and return the associated model.
*
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+ * @throws DataValidationException
*/
public function create(array $fields, bool $validate = true, bool $force = false): Model|bool
{
@@ -92,7 +92,7 @@ public function create(array $fields, bool $validate = true, bool $force = false
/**
* Find a model that has the specific ID passed.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function find(int $id): Model
{
@@ -114,7 +114,7 @@ public function findWhere(array $fields): Collection
/**
* Find and return the first matching instance for the given fields.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function findFirstWhere(array $fields): Model
{
@@ -154,8 +154,8 @@ public function deleteWhere(array $attributes, bool $force = false): int
/**
* Update a given ID with the passed array of fields.
*
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws DataValidationException
+ * @throws RecordNotFoundException
*/
public function update(int $id, array $fields, bool $validate = true, bool $force = false): Model|bool
{
@@ -200,8 +200,8 @@ public function updateWhereIn(string $column, array $values, array $fields): int
/**
* Update a record if it exists in the database, otherwise create it.
*
- * @throws \Pterodactyl\Exceptions\Model\DataValidationException
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws DataValidationException
+ * @throws RecordNotFoundException
*/
public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false): Model|bool
{
diff --git a/app/Repositories/Eloquent/LocationRepository.php b/app/Repositories/Eloquent/LocationRepository.php
index e25737cb36..066f6d2fa2 100644
--- a/app/Repositories/Eloquent/LocationRepository.php
+++ b/app/Repositories/Eloquent/LocationRepository.php
@@ -37,7 +37,7 @@ public function getAllWithNodes(): Collection
/**
* Return all the nodes and their respective count of servers for a location.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithNodes(int $id): Location
{
@@ -51,7 +51,7 @@ public function getWithNodes(int $id): Location
/**
* Return a location and the count of nodes in that location.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithNodeCount(int $id): Location
{
diff --git a/app/Repositories/Eloquent/MountRepository.php b/app/Repositories/Eloquent/MountRepository.php
index b33e6cb249..f0983aa0bf 100644
--- a/app/Repositories/Eloquent/MountRepository.php
+++ b/app/Repositories/Eloquent/MountRepository.php
@@ -29,7 +29,7 @@ public function getAllWithDetails(): Collection
/**
* Return all the mounts and their respective relations.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithRelations(string $id): Mount
{
diff --git a/app/Repositories/Eloquent/NestRepository.php b/app/Repositories/Eloquent/NestRepository.php
index f472e4b808..9d8ab3b746 100644
--- a/app/Repositories/Eloquent/NestRepository.php
+++ b/app/Repositories/Eloquent/NestRepository.php
@@ -20,9 +20,9 @@ public function model(): string
/**
* Return a nest or all nests with their associated eggs and variables.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
- public function getWithEggs(int $id = null): Collection|Nest
+ public function getWithEggs(?int $id = null): Collection|Nest
{
$instance = $this->getBuilder()->with('eggs', 'eggs.variables');
@@ -41,9 +41,9 @@ public function getWithEggs(int $id = null): Collection|Nest
/**
* Return a nest or all nests and the count of eggs and servers for that nest.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
- public function getWithCounts(int $id = null): Collection|Nest
+ public function getWithCounts(?int $id = null): Collection|Nest
{
$instance = $this->getBuilder()->withCount(['eggs', 'servers']);
@@ -62,7 +62,7 @@ public function getWithCounts(int $id = null): Collection|Nest
/**
* Return a nest along with its associated eggs and the servers relation on those eggs.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithEggServers(int $id): Nest
{
diff --git a/app/Repositories/Eloquent/ScheduleRepository.php b/app/Repositories/Eloquent/ScheduleRepository.php
index 145333f45f..cff1c1144f 100644
--- a/app/Repositories/Eloquent/ScheduleRepository.php
+++ b/app/Repositories/Eloquent/ScheduleRepository.php
@@ -29,7 +29,7 @@ public function findServerSchedules(int $server): Collection
/**
* Return a schedule model with all the associated tasks as a relationship.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getScheduleWithTasks(int $schedule): Schedule
{
diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php
index a353dba466..56097f9763 100644
--- a/app/Repositories/Eloquent/ServerRepository.php
+++ b/app/Repositories/Eloquent/ServerRepository.php
@@ -35,7 +35,7 @@ public function loadEggRelations(Server $server, bool $refresh = false): Server
/**
* Return a collection of servers with their associated data for rebuild operations.
*/
- public function getDataForRebuild(int $server = null, int $node = null): Collection
+ public function getDataForRebuild(?int $server = null, ?int $node = null): Collection
{
$instance = $this->getBuilder()->with(['allocation', 'allocations', 'egg', 'node']);
@@ -51,7 +51,7 @@ public function getDataForRebuild(int $server = null, int $node = null): Collect
/**
* Return a collection of servers with their associated data for reinstall operations.
*/
- public function getDataForReinstall(int $server = null, int $node = null): Collection
+ public function getDataForReinstall(?int $server = null, ?int $node = null): Collection
{
$instance = $this->getBuilder()->with(['allocation', 'allocations', 'egg', 'node']);
@@ -67,7 +67,7 @@ public function getDataForReinstall(int $server = null, int $node = null): Colle
/**
* Return a server model and all variables associated with the server.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function findWithVariables(int $id): Server
{
@@ -139,12 +139,12 @@ public function getDaemonServiceData(Server $server, bool $refresh = false): arr
/**
* Return a server by UUID.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getByUuid(string $uuid): Server
{
try {
- /** @var \Pterodactyl\Models\Server $model */
+ /** @var Server $model */
$model = $this->getBuilder()
->with('nest', 'node')
->where(function (Builder $query) use ($uuid) {
diff --git a/app/Repositories/Eloquent/SettingsRepository.php b/app/Repositories/Eloquent/SettingsRepository.php
index df22fce595..4deea80a70 100644
--- a/app/Repositories/Eloquent/SettingsRepository.php
+++ b/app/Repositories/Eloquent/SettingsRepository.php
@@ -24,7 +24,7 @@ public function model(): string
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
- public function set(string $key, string $value = null)
+ public function set(string $key, ?string $value = null)
{
// Clear item from the cache.
$this->clearCache($key);
diff --git a/app/Repositories/Eloquent/SubuserRepository.php b/app/Repositories/Eloquent/SubuserRepository.php
index 141378753d..01bc0c0cb9 100644
--- a/app/Repositories/Eloquent/SubuserRepository.php
+++ b/app/Repositories/Eloquent/SubuserRepository.php
@@ -51,7 +51,7 @@ public function getWithPermissions(Subuser $subuser, bool $refresh = false): Sub
/**
* Return a subuser and associated permissions given a user_id and server_id.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getWithPermissionsUsingUserAndServer(int $user, int $server): Subuser
{
diff --git a/app/Repositories/Eloquent/TaskRepository.php b/app/Repositories/Eloquent/TaskRepository.php
index 942c54d479..4a68167cfd 100644
--- a/app/Repositories/Eloquent/TaskRepository.php
+++ b/app/Repositories/Eloquent/TaskRepository.php
@@ -20,7 +20,7 @@ public function model(): string
/**
* Get a task and the server relationship for that task.
*
- * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+ * @throws RecordNotFoundException
*/
public function getTaskForJobProcess(int $id): Task
{
diff --git a/app/Repositories/Wings/DaemonBackupRepository.php b/app/Repositories/Wings/DaemonBackupRepository.php
index 4c164ee6b3..2287840897 100644
--- a/app/Repositories/Wings/DaemonBackupRepository.php
+++ b/app/Repositories/Wings/DaemonBackupRepository.php
@@ -9,6 +9,10 @@
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonBackupRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonBackupRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonBackupRepository extends DaemonRepository
{
protected ?string $adapter;
@@ -26,7 +30,7 @@ public function setBackupAdapter(string $adapter): self
/**
* Tells the remote Daemon to begin generating a backup for the server.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function backup(Backup $backup): ResponseInterface
{
@@ -51,9 +55,9 @@ public function backup(Backup $backup): ResponseInterface
/**
* Sends a request to Wings to begin restoring a backup for a server.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
- public function restore(Backup $backup, string $url = null, bool $truncate = false): ResponseInterface
+ public function restore(Backup $backup, ?string $url = null, bool $truncate = false): ResponseInterface
{
Assert::isInstanceOf($this->server, Server::class);
@@ -76,7 +80,7 @@ public function restore(Backup $backup, string $url = null, bool $truncate = fal
/**
* Deletes a backup from the daemon.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function delete(Backup $backup): ResponseInterface
{
diff --git a/app/Repositories/Wings/DaemonCommandRepository.php b/app/Repositories/Wings/DaemonCommandRepository.php
index cde29ff366..858d41a773 100644
--- a/app/Repositories/Wings/DaemonCommandRepository.php
+++ b/app/Repositories/Wings/DaemonCommandRepository.php
@@ -8,12 +8,16 @@
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonCommandRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonCommandRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonCommandRepository extends DaemonRepository
{
/**
* Sends a command or multiple commands to a running server instance.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function send(array|string $command): ResponseInterface
{
diff --git a/app/Repositories/Wings/DaemonConfigurationRepository.php b/app/Repositories/Wings/DaemonConfigurationRepository.php
index 5580f9a8be..90a7ef21ce 100644
--- a/app/Repositories/Wings/DaemonConfigurationRepository.php
+++ b/app/Repositories/Wings/DaemonConfigurationRepository.php
@@ -7,12 +7,16 @@
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonConfigurationRepository extends DaemonRepository
{
/**
* Returns system information from the wings instance.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function getSystemInformation(?int $version = null): array
{
@@ -30,7 +34,7 @@ public function getSystemInformation(?int $version = null): array
* this instance using a passed-in model. This allows us to change plenty of information
* in the model, and still use the old, pre-update model to actually make the HTTP request.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function update(Node $node): ResponseInterface
{
diff --git a/app/Repositories/Wings/DaemonFileRepository.php b/app/Repositories/Wings/DaemonFileRepository.php
index ca757151ed..af8db9be61 100644
--- a/app/Repositories/Wings/DaemonFileRepository.php
+++ b/app/Repositories/Wings/DaemonFileRepository.php
@@ -11,6 +11,10 @@
use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonFileRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonFileRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonFileRepository extends DaemonRepository
{
/**
@@ -18,11 +22,11 @@ class DaemonFileRepository extends DaemonRepository
*
* @param int|null $notLargerThan the maximum content length in bytes
*
- * @throws \GuzzleHttp\Exception\TransferException
- * @throws \Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws TransferException
+ * @throws FileSizeTooLargeException
+ * @throws DaemonConnectionException
*/
- public function getContent(string $path, int $notLargerThan = null): string
+ public function getContent(string $path, ?int $notLargerThan = null): string
{
Assert::isInstanceOf($this->server, Server::class);
@@ -49,7 +53,7 @@ public function getContent(string $path, int $notLargerThan = null): string
* Save new contents to a given file. This works for both creating and updating
* a file.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function putContent(string $path, string $content): ResponseInterface
{
@@ -71,7 +75,7 @@ public function putContent(string $path, string $content): ResponseInterface
/**
* Return a directory listing for a given path.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function getDirectory(string $path): array
{
@@ -94,7 +98,7 @@ public function getDirectory(string $path): array
/**
* Creates a new directory for the server in the given $path.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function createDirectory(string $name, string $path): ResponseInterface
{
@@ -118,7 +122,7 @@ public function createDirectory(string $name, string $path): ResponseInterface
/**
* Renames or moves a file on the remote machine.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function renameFiles(?string $root, array $files): ResponseInterface
{
@@ -142,7 +146,7 @@ public function renameFiles(?string $root, array $files): ResponseInterface
/**
* Copy a given file and give it a unique name.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function copyFile(string $location): ResponseInterface
{
@@ -165,7 +169,7 @@ public function copyFile(string $location): ResponseInterface
/**
* Delete a file or folder for the server.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function deleteFiles(?string $root, array $files): ResponseInterface
{
@@ -189,7 +193,7 @@ public function deleteFiles(?string $root, array $files): ResponseInterface
/**
* Compress the given files or folders in the given root.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function compressFiles(?string $root, array $files): array
{
@@ -218,7 +222,7 @@ public function compressFiles(?string $root, array $files): array
/**
* Decompresses a given archive file.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function decompressFile(?string $root, string $file): ResponseInterface
{
@@ -245,7 +249,7 @@ public function decompressFile(?string $root, string $file): ResponseInterface
/**
* Chmods the given files.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function chmodFiles(?string $root, array $files): ResponseInterface
{
@@ -269,7 +273,7 @@ public function chmodFiles(?string $root, array $files): ResponseInterface
/**
* Pulls a file from the given URL and saves it to the disk.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function pull(string $url, ?string $directory, array $params = []): ResponseInterface
{
diff --git a/app/Repositories/Wings/DaemonPowerRepository.php b/app/Repositories/Wings/DaemonPowerRepository.php
index 4e290cfc91..2b6f339a6d 100644
--- a/app/Repositories/Wings/DaemonPowerRepository.php
+++ b/app/Repositories/Wings/DaemonPowerRepository.php
@@ -8,12 +8,16 @@
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonPowerRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonPowerRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonPowerRepository extends DaemonRepository
{
/**
* Sends a power action to the server instance.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function send(string $action): ResponseInterface
{
diff --git a/app/Repositories/Wings/DaemonRepository.php b/app/Repositories/Wings/DaemonRepository.php
index 512626d73f..5803579c37 100644
--- a/app/Repositories/Wings/DaemonRepository.php
+++ b/app/Repositories/Wings/DaemonRepository.php
@@ -8,6 +8,10 @@
use Pterodactyl\Models\Server;
use Illuminate\Contracts\Foundation\Application;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonRepository setServer(\Pterodactyl\Models\Server $server)
+ */
abstract class DaemonRepository
{
protected ?Server $server;
diff --git a/app/Repositories/Wings/DaemonServerRepository.php b/app/Repositories/Wings/DaemonServerRepository.php
index f013ac08c4..d7ee51a81e 100644
--- a/app/Repositories/Wings/DaemonServerRepository.php
+++ b/app/Repositories/Wings/DaemonServerRepository.php
@@ -8,12 +8,16 @@
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonServerRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonServerRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonServerRepository extends DaemonRepository
{
/**
* Returns details about a server from the Daemon instance.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function getDetails(): array
{
@@ -33,7 +37,7 @@ public function getDetails(): array
/**
* Creates a new server on the Wings daemon.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function create(bool $startOnCompletion = true): void
{
@@ -54,7 +58,7 @@ public function create(bool $startOnCompletion = true): void
/**
* Triggers a server sync on Wings.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function sync(): void
{
@@ -70,7 +74,7 @@ public function sync(): void
/**
* Delete a server from the daemon, forcibly if passed.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function delete(): void
{
@@ -86,7 +90,7 @@ public function delete(): void
/**
* Reinstall a server on the daemon.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function reinstall(): void
{
@@ -106,7 +110,7 @@ public function reinstall(): void
* Requests the daemon to create a full archive of the server. Once the daemon is finished
* they will send a POST request to "/api/remote/servers/{uuid}/archive" with a boolean.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function requestArchive(): void
{
@@ -127,7 +131,7 @@ public function requestArchive(): void
* make it easier to revoke tokens on the fly. This ensures that the JTI key is formatted
* correctly and avoids any costly mistakes in the codebase.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function revokeUserJTI(int $id): void
{
@@ -140,7 +144,7 @@ public function revokeUserJTI(int $id): void
* Revokes an array of JWT JTI's by marking any token generated before the current time on
* the Wings instance as being invalid.
*
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
protected function revokeJTIs(array $jtis): void
{
diff --git a/app/Repositories/Wings/DaemonTransferRepository.php b/app/Repositories/Wings/DaemonTransferRepository.php
index 9c8745232b..9a2cd2160a 100644
--- a/app/Repositories/Wings/DaemonTransferRepository.php
+++ b/app/Repositories/Wings/DaemonTransferRepository.php
@@ -7,10 +7,14 @@
use GuzzleHttp\Exception\GuzzleException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+/**
+ * @method \Pterodactyl\Repositories\Wings\DaemonTransferRepository setNode(\Pterodactyl\Models\Node $node)
+ * @method \Pterodactyl\Repositories\Wings\DaemonTransferRepository setServer(\Pterodactyl\Models\Server $server)
+ */
class DaemonTransferRepository extends DaemonRepository
{
/**
- * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+ * @throws DaemonConnectionException
*/
public function notify(Node $targetNode, Plain $token): void
{
diff --git a/app/Rules/Fqdn.php b/app/Rules/Fqdn.php
index d88ff5f34c..aa637a84cd 100644
--- a/app/Rules/Fqdn.php
+++ b/app/Rules/Fqdn.php
@@ -27,7 +27,6 @@ public function setData($data): self
* specified when this rule is created additional checks will be applied.
*
* @param string $attribute
- * @param mixed $value
*/
public function passes($attribute, $value): bool
{
@@ -71,7 +70,7 @@ public function message(): string
/**
* Returns a new instance of the rule with a defined scheme set.
*/
- public static function make(string $schemeField = null): self
+ public static function make(?string $schemeField = null): self
{
return tap(new static(), function ($fqdn) use ($schemeField) {
$fqdn->schemeField = $schemeField;
diff --git a/app/Rules/Username.php b/app/Rules/Username.php
index cc869b9312..25c6681989 100644
--- a/app/Rules/Username.php
+++ b/app/Rules/Username.php
@@ -18,7 +18,6 @@ class Username implements Rule
* Allowed characters: a-z0-9_-.
*
* @param string $attribute
- * @param mixed $value
*/
public function passes($attribute, $value): bool
{
diff --git a/app/Services/Activity/ActivityLogService.php b/app/Services/Activity/ActivityLogService.php
index f863852149..fefffdc8c6 100644
--- a/app/Services/Activity/ActivityLogService.php
+++ b/app/Services/Activity/ActivityLogService.php
@@ -23,7 +23,7 @@ public function __construct(
protected AuthFactory $manager,
protected ActivityLogBatchService $batch,
protected ActivityLogTargetableService $targetable,
- protected ConnectionInterface $connection
+ protected ConnectionInterface $connection,
) {
}
@@ -102,7 +102,6 @@ public function actor(Model $actor): self
* Sets a custom property on the activity log instance.
*
* @param string|array $key
- * @param mixed $value
*/
public function property($key, $value = null): self
{
@@ -131,7 +130,7 @@ public function withRequestMetadata(): self
* performing this action it will be logged to the disk but will not interrupt
* the code flow.
*/
- public function log(string $description = null): ActivityLog
+ public function log(?string $description = null): ActivityLog
{
$activity = $this->getActivity();
diff --git a/app/Services/Allocations/AllocationDeletionService.php b/app/Services/Allocations/AllocationDeletionService.php
index 8ea677245e..be5d4372fa 100644
--- a/app/Services/Allocations/AllocationDeletionService.php
+++ b/app/Services/Allocations/AllocationDeletionService.php
@@ -19,7 +19,7 @@ public function __construct(private AllocationRepositoryInterface $repository)
* Delete an allocation from the database only if it does not have a server
* that is actively attached to it.
*
- * @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException
+ * @throws ServerUsingAllocationException
*/
public function handle(Allocation $allocation): int
{
diff --git a/app/Services/Allocations/AssignmentService.php b/app/Services/Allocations/AssignmentService.php
index 821255d49c..979f74bb92 100644
--- a/app/Services/Allocations/AssignmentService.php
+++ b/app/Services/Allocations/AssignmentService.php
@@ -31,11 +31,11 @@ public function __construct(protected AllocationRepositoryInterface $repository,
/**
* Insert allocations into the database and link them to a specific node.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
- * @throws \Pterodactyl\Exceptions\Service\Allocation\CidrOutOfRangeException
- * @throws \Pterodactyl\Exceptions\Service\Allocation\InvalidPortMappingException
- * @throws \Pterodactyl\Exceptions\Service\Allocation\PortOutOfRangeException
- * @throws \Pterodactyl\Exceptions\Service\Allocation\TooManyPortsInRangeException
+ * @throws DisplayException
+ * @throws CidrOutOfRangeException
+ * @throws InvalidPortMappingException
+ * @throws PortOutOfRangeException
+ * @throws TooManyPortsInRangeException
*/
public function handle(Node $node, array $data): void
{
diff --git a/app/Services/Allocations/FindAssignableAllocationService.php b/app/Services/Allocations/FindAssignableAllocationService.php
index 3374fa07ee..ffc15d0449 100644
--- a/app/Services/Allocations/FindAssignableAllocationService.php
+++ b/app/Services/Allocations/FindAssignableAllocationService.php
@@ -37,7 +37,7 @@ public function handle(Server $server): Allocation
// Attempt to find a given available allocation for a server. If one cannot be found
// we will fall back to attempting to create a new allocation that can be used for the
// server.
- /** @var \Pterodactyl\Models\Allocation|null $allocation */
+ /** @var Allocation|null $allocation */
$allocation = $server->node->allocations()
->where('ip', $server->allocation->ip)
->whereNull('server_id')
@@ -100,7 +100,7 @@ protected function createNewAllocation(Server $server): Allocation
'allocation_ports' => [$port],
]);
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = $server->node->allocations()
->where('ip', $server->allocation->ip)
->where('port', $port)
diff --git a/app/Services/Backups/DeleteBackupService.php b/app/Services/Backups/DeleteBackupService.php
index fd65969c17..b77ac8e1cb 100644
--- a/app/Services/Backups/DeleteBackupService.php
+++ b/app/Services/Backups/DeleteBackupService.php
@@ -16,7 +16,7 @@ class DeleteBackupService
public function __construct(
private ConnectionInterface $connection,
private BackupManager $manager,
- private DaemonBackupRepository $daemonBackupRepository
+ private DaemonBackupRepository $daemonBackupRepository,
) {
}
diff --git a/app/Services/Backups/InitiateBackupService.php b/app/Services/Backups/InitiateBackupService.php
index 16abe33961..9cb9f68171 100644
--- a/app/Services/Backups/InitiateBackupService.php
+++ b/app/Services/Backups/InitiateBackupService.php
@@ -28,7 +28,7 @@ public function __construct(
private ConnectionInterface $connection,
private DaemonBackupRepository $daemonBackupRepository,
private DeleteBackupService $deleteBackupService,
- private BackupManager $backupManager
+ private BackupManager $backupManager,
) {
}
@@ -70,10 +70,10 @@ public function setIgnoredFiles(?array $ignored): self
* Initiates the backup process for a server on Wings.
*
* @throws \Throwable
- * @throws \Pterodactyl\Exceptions\Service\Backup\TooManyBackupsException
- * @throws \Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException
+ * @throws TooManyBackupsException
+ * @throws TooManyRequestsHttpException
*/
- public function handle(Server $server, string $name = null, bool $override = false): Backup
+ public function handle(Server $server, ?string $name = null, bool $override = false): Backup
{
$limit = config('backups.throttles.limit');
$period = config('backups.throttles.period');
@@ -82,7 +82,7 @@ public function handle(Server $server, string $name = null, bool $override = fal
if ($previous->count() >= $limit) {
$message = sprintf('Only %d backups may be generated within a %d second span of time.', $limit, $period);
- throw new TooManyRequestsHttpException(CarbonImmutable::now()->diffInSeconds($previous->last()->created_at->addSeconds($period)), $message);
+ throw new TooManyRequestsHttpException((int) CarbonImmutable::now()->diffInSeconds($previous->last()->created_at->addSeconds($period)), $message);
}
}
@@ -98,7 +98,7 @@ public function handle(Server $server, string $name = null, bool $override = fal
// Get the oldest backup the server has that is not "locked" (indicating a backup that should
// never be automatically purged). If we find a backup we will delete it and then continue with
// this process. If no backup is found that can be used an exception is thrown.
- /** @var \Pterodactyl\Models\Backup $oldest */
+ /** @var Backup $oldest */
$oldest = $successful->where('is_locked', false)->orderBy('created_at')->first();
if (!$oldest) {
throw new TooManyBackupsException($server->backup_limit);
@@ -108,7 +108,7 @@ public function handle(Server $server, string $name = null, bool $override = fal
}
return $this->connection->transaction(function () use ($server, $name) {
- /** @var \Pterodactyl\Models\Backup $backup */
+ /** @var Backup $backup */
$backup = $this->repository->create([
'server_id' => $server->id,
'uuid' => Uuid::uuid4()->toString(),
diff --git a/app/Services/Databases/DatabaseManagementService.php b/app/Services/Databases/DatabaseManagementService.php
index 20de6a78f6..cb868cca6b 100644
--- a/app/Services/Databases/DatabaseManagementService.php
+++ b/app/Services/Databases/DatabaseManagementService.php
@@ -36,7 +36,7 @@ public function __construct(
protected ConnectionInterface $connection,
protected DynamicDatabaseConnection $dynamic,
protected Encrypter $encrypter,
- protected DatabaseRepository $repository
+ protected DatabaseRepository $repository,
) {
}
@@ -66,8 +66,8 @@ public function setValidateDatabaseLimit(bool $validate): self
* Create a new database that is linked to a specific host.
*
* @throws \Throwable
- * @throws \Pterodactyl\Exceptions\Service\Database\TooManyDatabasesException
- * @throws \Pterodactyl\Exceptions\Service\Database\DatabaseClientFeatureNotEnabledException
+ * @throws TooManyDatabasesException
+ * @throws DatabaseClientFeatureNotEnabledException
*/
public function create(Server $server, array $data): Database
{
@@ -153,7 +153,7 @@ public function delete(Database $database): ?bool
* have the same name across multiple hosts, for the sake of keeping this logic easy to understand
* and avoiding user confusion we will ignore the specific host and just look across all hosts.
*
- * @throws \Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException
+ * @throws DuplicateDatabaseNameException
* @throws \Throwable
*/
protected function createModel(array $data): Database
diff --git a/app/Services/Databases/DatabasePasswordService.php b/app/Services/Databases/DatabasePasswordService.php
index 3862b2393b..66c395df43 100644
--- a/app/Services/Databases/DatabasePasswordService.php
+++ b/app/Services/Databases/DatabasePasswordService.php
@@ -18,7 +18,7 @@ public function __construct(
private ConnectionInterface $connection,
private DynamicDatabaseConnection $dynamic,
private Encrypter $encrypter,
- private DatabaseRepositoryInterface $repository
+ private DatabaseRepositoryInterface $repository,
) {
}
diff --git a/app/Services/Databases/Hosts/HostCreationService.php b/app/Services/Databases/Hosts/HostCreationService.php
index d33a15856a..0eecd7971f 100644
--- a/app/Services/Databases/Hosts/HostCreationService.php
+++ b/app/Services/Databases/Hosts/HostCreationService.php
@@ -19,7 +19,7 @@ public function __construct(
private DatabaseManager $databaseManager,
private DynamicDatabaseConnection $dynamic,
private Encrypter $encrypter,
- private DatabaseHostRepositoryInterface $repository
+ private DatabaseHostRepositoryInterface $repository,
) {
}
diff --git a/app/Services/Databases/Hosts/HostDeletionService.php b/app/Services/Databases/Hosts/HostDeletionService.php
index 4a06af8da7..8904121082 100644
--- a/app/Services/Databases/Hosts/HostDeletionService.php
+++ b/app/Services/Databases/Hosts/HostDeletionService.php
@@ -13,7 +13,7 @@ class HostDeletionService
*/
public function __construct(
private DatabaseRepositoryInterface $databaseRepository,
- private DatabaseHostRepositoryInterface $repository
+ private DatabaseHostRepositoryInterface $repository,
) {
}
@@ -21,7 +21,7 @@ public function __construct(
* Delete a specified host from the Panel if no databases are
* attached to it.
*
- * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+ * @throws HasActiveServersException
*/
public function handle(int $host): int
{
diff --git a/app/Services/Databases/Hosts/HostUpdateService.php b/app/Services/Databases/Hosts/HostUpdateService.php
index 363deb1b33..e2efd46fca 100644
--- a/app/Services/Databases/Hosts/HostUpdateService.php
+++ b/app/Services/Databases/Hosts/HostUpdateService.php
@@ -19,7 +19,7 @@ public function __construct(
private DatabaseManager $databaseManager,
private DynamicDatabaseConnection $dynamic,
private Encrypter $encrypter,
- private DatabaseHostRepositoryInterface $repository
+ private DatabaseHostRepositoryInterface $repository,
) {
}
diff --git a/app/Services/Deployment/AllocationSelectionService.php b/app/Services/Deployment/AllocationSelectionService.php
index ae334edd25..7915fc5fe4 100644
--- a/app/Services/Deployment/AllocationSelectionService.php
+++ b/app/Services/Deployment/AllocationSelectionService.php
@@ -51,7 +51,7 @@ public function setNodes(array $nodes): self
* empty, all ports will be considered when finding an allocation. If set, only ports appearing
* in the array or range will be used.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function setPorts(array $ports): self
{
@@ -80,7 +80,7 @@ public function setPorts(array $ports): self
/**
* Return a single allocation that should be used as the default allocation for a server.
*
- * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableAllocationException
+ * @throws NoViableAllocationException
*/
public function handle(): Allocation
{
diff --git a/app/Services/Deployment/FindViableNodesService.php b/app/Services/Deployment/FindViableNodesService.php
index 71c830bf9e..cc76ad7182 100644
--- a/app/Services/Deployment/FindViableNodesService.php
+++ b/app/Services/Deployment/FindViableNodesService.php
@@ -64,9 +64,9 @@ public function setMemory(int $memory): self
* If "null" is provided as the value no pagination will
* be used.
*
- * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
+ * @throws NoViableNodeException
*/
- public function handle(int $perPage = null, int $page = null): LengthAwarePaginator|Collection
+ public function handle(?int $perPage = null, ?int $page = null): LengthAwarePaginator|Collection
{
Assert::integer($this->disk, 'Disk space must be an int, got %s');
Assert::integer($this->memory, 'Memory usage must be an int, got %s');
diff --git a/app/Services/Eggs/EggCreationService.php b/app/Services/Eggs/EggCreationService.php
index b084b0ccad..7379eae7c9 100644
--- a/app/Services/Eggs/EggCreationService.php
+++ b/app/Services/Eggs/EggCreationService.php
@@ -22,7 +22,7 @@ public function __construct(private ConfigRepository $config, private EggReposit
* Create a new service option and assign it to the given service.
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
- * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+ * @throws NoParentConfigurationFoundException
*/
public function handle(array $data): Egg
{
diff --git a/app/Services/Eggs/EggDeletionService.php b/app/Services/Eggs/EggDeletionService.php
index 7e40133513..50b4e1c6d0 100644
--- a/app/Services/Eggs/EggDeletionService.php
+++ b/app/Services/Eggs/EggDeletionService.php
@@ -14,15 +14,15 @@ class EggDeletionService
*/
public function __construct(
protected ServerRepositoryInterface $serverRepository,
- protected EggRepositoryInterface $repository
+ protected EggRepositoryInterface $repository,
) {
}
/**
* Delete an Egg from the database if it has no active servers attached to it.
*
- * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
- * @throws \Pterodactyl\Exceptions\Service\Egg\HasChildrenException
+ * @throws HasActiveServersException
+ * @throws HasChildrenException
*/
public function handle(int $egg): int
{
diff --git a/app/Services/Eggs/EggParserService.php b/app/Services/Eggs/EggParserService.php
index 6d8545bc2c..75add2352b 100644
--- a/app/Services/Eggs/EggParserService.php
+++ b/app/Services/Eggs/EggParserService.php
@@ -14,7 +14,7 @@ class EggParserService
* Takes an uploaded file and parses out the egg configuration from within.
*
* @throws \JsonException
- * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+ * @throws InvalidFileUploadException
*/
public function handle(UploadedFile $file): array
{
diff --git a/app/Services/Eggs/EggUpdateService.php b/app/Services/Eggs/EggUpdateService.php
index 7ca442ba33..64c2755bea 100644
--- a/app/Services/Eggs/EggUpdateService.php
+++ b/app/Services/Eggs/EggUpdateService.php
@@ -20,7 +20,7 @@ public function __construct(protected EggRepositoryInterface $repository)
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
- * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+ * @throws NoParentConfigurationFoundException
*/
public function handle(Egg $egg, array $data): void
{
diff --git a/app/Services/Eggs/Scripts/InstallScriptService.php b/app/Services/Eggs/Scripts/InstallScriptService.php
index 3341572363..a6f24f0b12 100644
--- a/app/Services/Eggs/Scripts/InstallScriptService.php
+++ b/app/Services/Eggs/Scripts/InstallScriptService.php
@@ -20,7 +20,7 @@ public function __construct(protected EggRepositoryInterface $repository)
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
- * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
+ * @throws InvalidCopyFromException
*/
public function handle(Egg $egg, array $data): void
{
diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index ecd6eadb6a..997dc9236e 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -26,7 +26,7 @@ public function handle(UploadedFile $file, int $nest): Egg
{
$parsed = $this->parser->handle($file);
- /** @var \Pterodactyl\Models\Nest $nest */
+ /** @var Nest $nest */
$nest = Nest::query()->with('eggs', 'eggs.variables')->findOrFail($nest);
return $this->connection->transaction(function () use ($nest, $parsed) {
diff --git a/app/Services/Eggs/Variables/VariableCreationService.php b/app/Services/Eggs/Variables/VariableCreationService.php
index a7e19f6bac..601a3513a8 100644
--- a/app/Services/Eggs/Variables/VariableCreationService.php
+++ b/app/Services/Eggs/Variables/VariableCreationService.php
@@ -33,7 +33,7 @@ protected function getValidator(): ValidationFactory
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
- * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+ * @throws ReservedVariableNameException
*/
public function handle(int $egg, array $data): EggVariable
{
diff --git a/app/Services/Eggs/Variables/VariableUpdateService.php b/app/Services/Eggs/Variables/VariableUpdateService.php
index ed70b260fe..c3ca303bde 100644
--- a/app/Services/Eggs/Variables/VariableUpdateService.php
+++ b/app/Services/Eggs/Variables/VariableUpdateService.php
@@ -33,10 +33,10 @@ protected function getValidator(): ValidationFactory
/**
* Update a specific egg variable.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
- * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+ * @throws ReservedVariableNameException
*/
public function handle(EggVariable $variable, array $data): mixed
{
diff --git a/app/Services/Helpers/SoftwareVersionService.php b/app/Services/Helpers/SoftwareVersionService.php
index f75c735bf6..d831318237 100644
--- a/app/Services/Helpers/SoftwareVersionService.php
+++ b/app/Services/Helpers/SoftwareVersionService.php
@@ -2,7 +2,6 @@
namespace Pterodactyl\Services\Helpers;
-use Exception;
use GuzzleHttp\Client;
use Carbon\CarbonImmutable;
use Illuminate\Support\Arr;
@@ -20,7 +19,7 @@ class SoftwareVersionService
*/
public function __construct(
protected CacheRepository $cache,
- protected Client $client
+ protected Client $client,
) {
self::$result = $this->cacheVersionData();
}
@@ -95,7 +94,7 @@ protected function cacheVersionData(): array
}
throw new CdnVersionFetchingException();
- } catch (Exception) {
+ } catch (\Exception) {
return [];
}
});
diff --git a/app/Services/Locations/LocationDeletionService.php b/app/Services/Locations/LocationDeletionService.php
index 5b4b9eba4e..8868418650 100644
--- a/app/Services/Locations/LocationDeletionService.php
+++ b/app/Services/Locations/LocationDeletionService.php
@@ -15,14 +15,14 @@ class LocationDeletionService
*/
public function __construct(
protected LocationRepositoryInterface $repository,
- protected NodeRepositoryInterface $nodeRepository
+ protected NodeRepositoryInterface $nodeRepository,
) {
}
/**
* Delete an existing location.
*
- * @throws \Pterodactyl\Exceptions\Service\Location\HasActiveNodesException
+ * @throws HasActiveNodesException
*/
public function handle(Location|int $location): ?int
{
diff --git a/app/Services/Nests/NestCreationService.php b/app/Services/Nests/NestCreationService.php
index c3513aefe8..7fbb1eb722 100644
--- a/app/Services/Nests/NestCreationService.php
+++ b/app/Services/Nests/NestCreationService.php
@@ -21,7 +21,7 @@ public function __construct(private ConfigRepository $config, private NestReposi
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
- public function handle(array $data, string $author = null): Nest
+ public function handle(array $data, ?string $author = null): Nest
{
return $this->repository->create([
'uuid' => Uuid::uuid4()->toString(),
diff --git a/app/Services/Nests/NestDeletionService.php b/app/Services/Nests/NestDeletionService.php
index 6babf45c3e..bb5271133d 100644
--- a/app/Services/Nests/NestDeletionService.php
+++ b/app/Services/Nests/NestDeletionService.php
@@ -13,14 +13,14 @@ class NestDeletionService
*/
public function __construct(
protected ServerRepositoryInterface $serverRepository,
- protected NestRepositoryInterface $repository
+ protected NestRepositoryInterface $repository,
) {
}
/**
* Delete a nest from the system only if there are no servers attached to it.
*
- * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+ * @throws HasActiveServersException
*/
public function handle(int $nest): int
{
diff --git a/app/Services/Nodes/NodeDeletionService.php b/app/Services/Nodes/NodeDeletionService.php
index adb9a0628a..f7966e009e 100644
--- a/app/Services/Nodes/NodeDeletionService.php
+++ b/app/Services/Nodes/NodeDeletionService.php
@@ -16,14 +16,14 @@ class NodeDeletionService
public function __construct(
protected NodeRepositoryInterface $repository,
protected ServerRepositoryInterface $serverRepository,
- protected Translator $translator
+ protected Translator $translator,
) {
}
/**
* Delete a node from the panel if no servers are attached to it.
*
- * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+ * @throws HasActiveServersException
*/
public function handle(int|Node $node): int
{
diff --git a/app/Services/Nodes/NodeUpdateService.php b/app/Services/Nodes/NodeUpdateService.php
index 28733e35a3..11078af531 100644
--- a/app/Services/Nodes/NodeUpdateService.php
+++ b/app/Services/Nodes/NodeUpdateService.php
@@ -21,7 +21,7 @@ public function __construct(
private ConnectionInterface $connection,
private DaemonConfigurationRepository $configurationRepository,
private Encrypter $encrypter,
- private NodeRepository $repository
+ private NodeRepository $repository,
) {
}
@@ -38,7 +38,7 @@ public function handle(Node $node, array $data, bool $resetToken = false): Node
}
[$updated, $exception] = $this->connection->transaction(function () use ($data, $node) {
- /** @var \Pterodactyl\Models\Node $updated */
+ /** @var Node $updated */
$updated = $this->repository->withFreshModel()->update($node->id, $data, true, true);
try {
diff --git a/app/Services/Servers/BuildModificationService.php b/app/Services/Servers/BuildModificationService.php
index 05553d7f10..a977f8381b 100644
--- a/app/Services/Servers/BuildModificationService.php
+++ b/app/Services/Servers/BuildModificationService.php
@@ -20,7 +20,7 @@ class BuildModificationService
public function __construct(
private ConnectionInterface $connection,
private DaemonServerRepository $daemonServerRepository,
- private ServerConfigurationStructureService $structureService
+ private ServerConfigurationStructureService $structureService,
) {
}
@@ -28,11 +28,11 @@ public function __construct(
* Change the build details for a specified server.
*
* @throws \Throwable
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function handle(Server $server, array $data): Server
{
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
$server = $this->connection->transaction(function () use ($server, $data) {
$this->processAllocations($server, $data);
@@ -77,7 +77,7 @@ public function handle(Server $server, array $data): Server
/**
* Process the allocations being assigned in the data and ensure they are available for a server.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
private function processAllocations(Server $server, array &$data): void
{
diff --git a/app/Services/Servers/ReinstallServerService.php b/app/Services/Servers/ReinstallServerService.php
index 5881d1fc63..1822238288 100644
--- a/app/Services/Servers/ReinstallServerService.php
+++ b/app/Services/Servers/ReinstallServerService.php
@@ -13,7 +13,7 @@ class ReinstallServerService
*/
public function __construct(
private ConnectionInterface $connection,
- private DaemonServerRepository $daemonServerRepository
+ private DaemonServerRepository $daemonServerRepository,
) {
}
diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php
index 2c9b4cf844..6f900b12d5 100644
--- a/app/Services/Servers/ServerCreationService.php
+++ b/app/Services/Servers/ServerCreationService.php
@@ -32,7 +32,7 @@ public function __construct(
private ServerRepository $repository,
private ServerDeletionService $serverDeletionService,
private ServerVariableRepository $serverVariableRepository,
- private VariableValidatorService $validatorService
+ private VariableValidatorService $validatorService,
) {
}
@@ -49,7 +49,7 @@ public function __construct(
* @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
* @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableAllocationException
*/
- public function handle(array $data, DeploymentObject $deployment = null): Server
+ public function handle(array $data, ?DeploymentObject $deployment = null): Server
{
// If a deployment object has been passed we need to get the allocation
// that the server should use, and assign the node from that allocation.
@@ -82,7 +82,7 @@ public function handle(array $data, DeploymentObject $deployment = null): Server
//
// If that connection fails out we will attempt to perform a cleanup by just
// deleting the server itself from the system.
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
$server = $this->connection->transaction(function () use ($data, $eggVariableData) {
// Create the server and assign any additional allocations to it.
$server = $this->createModel($data);
@@ -115,7 +115,7 @@ public function handle(array $data, DeploymentObject $deployment = null): Server
*/
private function configureDeployment(array $data, DeploymentObject $deployment): Allocation
{
- /** @var \Illuminate\Support\Collection $nodes */
+ /** @var Collection $nodes */
$nodes = $this->findViableNodesService->setLocations($deployment->getLocations())
->setDisk(Arr::get($data, 'disk'))
->setMemory(Arr::get($data, 'memory'))
@@ -136,7 +136,7 @@ private function createModel(array $data): Server
{
$uuid = $this->generateUniqueUuidCombo();
- /** @var \Pterodactyl\Models\Server $model */
+ /** @var Server $model */
$model = $this->repository->create([
'external_id' => Arr::get($data, 'external_id'),
'uuid' => $uuid,
diff --git a/app/Services/Servers/ServerDeletionService.php b/app/Services/Servers/ServerDeletionService.php
index a83c8feb6a..714e226230 100644
--- a/app/Services/Servers/ServerDeletionService.php
+++ b/app/Services/Servers/ServerDeletionService.php
@@ -20,7 +20,7 @@ class ServerDeletionService
public function __construct(
private ConnectionInterface $connection,
private DaemonServerRepository $daemonServerRepository,
- private DatabaseManagementService $databaseManagementService
+ private DatabaseManagementService $databaseManagementService,
) {
}
diff --git a/app/Services/Servers/StartupModificationService.php b/app/Services/Servers/StartupModificationService.php
index a0a5c4cb77..5397579001 100644
--- a/app/Services/Servers/StartupModificationService.php
+++ b/app/Services/Servers/StartupModificationService.php
@@ -70,7 +70,7 @@ protected function updateAdministrativeSettings(array $data, Server &$server): v
$eggId = Arr::get($data, 'egg_id');
if (is_digit($eggId) && $server->egg_id !== (int) $eggId) {
- /** @var \Pterodactyl\Models\Egg $egg */
+ /** @var Egg $egg */
$egg = Egg::query()->findOrFail($data['egg_id']);
$server = $server->forceFill([
diff --git a/app/Services/Servers/SuspensionService.php b/app/Services/Servers/SuspensionService.php
index d11ace22c8..eb9237c5db 100644
--- a/app/Services/Servers/SuspensionService.php
+++ b/app/Services/Servers/SuspensionService.php
@@ -16,7 +16,7 @@ class SuspensionService
* SuspensionService constructor.
*/
public function __construct(
- private DaemonServerRepository $daemonServerRepository
+ private DaemonServerRepository $daemonServerRepository,
) {
}
diff --git a/app/Services/Servers/VariableValidatorService.php b/app/Services/Servers/VariableValidatorService.php
index a198692653..676a84aba5 100644
--- a/app/Services/Servers/VariableValidatorService.php
+++ b/app/Services/Servers/VariableValidatorService.php
@@ -23,7 +23,7 @@ public function __construct(private ValidationFactory $validator)
/**
* Validate all of the passed data against the given service option variables.
*
- * @throws \Illuminate\Validation\ValidationException
+ * @throws ValidationException
*/
public function handle(int $egg, array $fields = []): Collection
{
diff --git a/app/Services/Subusers/SubuserCreationService.php b/app/Services/Subusers/SubuserCreationService.php
index 550c4ca450..346297ebb8 100644
--- a/app/Services/Subusers/SubuserCreationService.php
+++ b/app/Services/Subusers/SubuserCreationService.php
@@ -22,7 +22,7 @@ public function __construct(
private ConnectionInterface $connection,
private SubuserRepository $subuserRepository,
private UserCreationService $userCreationService,
- private UserRepositoryInterface $userRepository
+ private UserRepositoryInterface $userRepository,
) {
}
@@ -32,8 +32,8 @@ public function __construct(
* be created.
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
- * @throws \Pterodactyl\Exceptions\Service\Subuser\ServerSubuserExistsException
- * @throws \Pterodactyl\Exceptions\Service\Subuser\UserIsServerOwnerException
+ * @throws ServerSubuserExistsException
+ * @throws UserIsServerOwnerException
* @throws \Throwable
*/
public function handle(Server $server, string $email, array $permissions): Subuser
diff --git a/app/Services/Telemetry/TelemetryCollectionService.php b/app/Services/Telemetry/TelemetryCollectionService.php
index c2fd128308..1ece481410 100644
--- a/app/Services/Telemetry/TelemetryCollectionService.php
+++ b/app/Services/Telemetry/TelemetryCollectionService.php
@@ -2,7 +2,6 @@
namespace Pterodactyl\Services\Telemetry;
-use Exception;
use Ramsey\Uuid\Uuid;
use Illuminate\Support\Arr;
use Pterodactyl\Models\Egg;
@@ -26,7 +25,7 @@ class TelemetryCollectionService
*/
public function __construct(
private DaemonConfigurationRepository $daemonConfigurationRepository,
- private SettingsRepository $settingsRepository
+ private SettingsRepository $settingsRepository,
) {
}
@@ -37,7 +36,7 @@ public function __invoke(): void
{
try {
$data = $this->collect();
- } catch (Exception) {
+ } catch (\Exception) {
return;
}
@@ -60,7 +59,7 @@ public function collect(): array
$nodes = Node::all()->map(function ($node) {
try {
$info = $this->daemonConfigurationRepository->setNode($node)->getSystemInformation(2);
- } catch (Exception) {
+ } catch (\Exception) {
return null;
}
@@ -142,10 +141,10 @@ public function collect(): array
'count' => Egg::count(),
// Egg UUIDs are generated randomly on import, so there is not a consistent way to
// determine if servers are using default eggs or not.
-// 'server_usage' => Egg::all()
-// ->flatMap(fn (Egg $egg) => [$egg->uuid => $egg->servers->count()])
-// ->filter(fn (int $count) => $count > 0)
-// ->toArray(),
+ // 'server_usage' => Egg::all()
+ // ->flatMap(fn (Egg $egg) => [$egg->uuid => $egg->servers->count()])
+ // ->filter(fn (int $count) => $count > 0)
+ // ->toArray(),
],
'locations' => [
@@ -160,10 +159,10 @@ public function collect(): array
'count' => Nest::count(),
// Nest UUIDs are generated randomly on import, so there is not a consistent way to
// determine if servers are using default eggs or not.
-// 'server_usage' => Nest::all()
-// ->flatMap(fn (Nest $nest) => [$nest->uuid => $nest->eggs->sum(fn (Egg $egg) => $egg->servers->count())])
-// ->filter(fn (int $count) => $count > 0)
-// ->toArray(),
+ // 'server_usage' => Nest::all()
+ // ->flatMap(fn (Nest $nest) => [$nest->uuid => $nest->eggs->sum(fn (Egg $egg) => $egg->servers->count())])
+ // ->filter(fn (int $count) => $count > 0)
+ // ->toArray(),
],
'nodes' => [
diff --git a/app/Services/Users/ToggleTwoFactorService.php b/app/Services/Users/ToggleTwoFactorService.php
index a91615b1ce..6790b1e3fa 100644
--- a/app/Services/Users/ToggleTwoFactorService.php
+++ b/app/Services/Users/ToggleTwoFactorService.php
@@ -22,7 +22,7 @@ public function __construct(
private Encrypter $encrypter,
private Google2FA $google2FA,
private RecoveryTokenRepository $recoveryTokenRepository,
- private UserRepositoryInterface $repository
+ private UserRepositoryInterface $repository,
) {
}
@@ -33,9 +33,9 @@ public function __construct(
* @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
* @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
* @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid
+ * @throws TwoFactorAuthenticationTokenInvalid
*/
- public function handle(User $user, string $token, bool $toggleState = null): array
+ public function handle(User $user, string $token, ?bool $toggleState = null): array
{
$secret = $this->encrypter->decrypt($user->totp_secret);
diff --git a/app/Services/Users/TwoFactorSetupService.php b/app/Services/Users/TwoFactorSetupService.php
index 9ce8322150..c48a99dbdb 100644
--- a/app/Services/Users/TwoFactorSetupService.php
+++ b/app/Services/Users/TwoFactorSetupService.php
@@ -17,7 +17,7 @@ class TwoFactorSetupService
public function __construct(
private ConfigRepository $config,
private Encrypter $encrypter,
- private UserRepositoryInterface $repository
+ private UserRepositoryInterface $repository,
) {
}
diff --git a/app/Services/Users/UserCreationService.php b/app/Services/Users/UserCreationService.php
index 130ae1a4e2..ed92d7b58a 100644
--- a/app/Services/Users/UserCreationService.php
+++ b/app/Services/Users/UserCreationService.php
@@ -19,7 +19,7 @@ public function __construct(
private ConnectionInterface $connection,
private Hasher $hasher,
private PasswordBroker $passwordBroker,
- private UserRepositoryInterface $repository
+ private UserRepositoryInterface $repository,
) {
}
@@ -41,7 +41,7 @@ public function handle(array $data): User
$data['password'] = $this->hasher->make(str_random(30));
}
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = $this->repository->create(array_merge($data, [
'uuid' => Uuid::uuid4()->toString(),
]), true, true);
diff --git a/app/Services/Users/UserDeletionService.php b/app/Services/Users/UserDeletionService.php
index f7f060cee4..8428d8c804 100644
--- a/app/Services/Users/UserDeletionService.php
+++ b/app/Services/Users/UserDeletionService.php
@@ -16,14 +16,14 @@ class UserDeletionService
public function __construct(
protected UserRepositoryInterface $repository,
protected ServerRepositoryInterface $serverRepository,
- protected Translator $translator
+ protected Translator $translator,
) {
}
/**
* Delete a user from the panel only if they have no servers attached to their account.
*
- * @throws \Pterodactyl\Exceptions\DisplayException
+ * @throws DisplayException
*/
public function handle(int|User $user): ?bool
{
diff --git a/app/Traits/Commands/EnvironmentWriterTrait.php b/app/Traits/Commands/EnvironmentWriterTrait.php
index 3d1aa08999..533ec2aa32 100644
--- a/app/Traits/Commands/EnvironmentWriterTrait.php
+++ b/app/Traits/Commands/EnvironmentWriterTrait.php
@@ -23,7 +23,7 @@ public function escapeEnvironmentValue(string $value): string
/**
* Update the .env file for the application using the passed in values.
*
- * @throws \Pterodactyl\Exceptions\PterodactylException
+ * @throws PterodactylException
*/
public function writeToEnvironment(array $values = []): void
{
diff --git a/app/Traits/Services/ValidatesValidationRules.php b/app/Traits/Services/ValidatesValidationRules.php
index 5456cb0171..115649b0da 100644
--- a/app/Traits/Services/ValidatesValidationRules.php
+++ b/app/Traits/Services/ValidatesValidationRules.php
@@ -14,7 +14,7 @@ abstract protected function getValidator(): ValidationFactory;
* Validate that the rules being provided are valid for Laravel and can
* be resolved.
*
- * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
+ * @throws BadValidationRuleException
*/
public function validateRules(array|string $rules): void
{
diff --git a/app/Transformers/Api/Client/ActivityLogTransformer.php b/app/Transformers/Api/Client/ActivityLogTransformer.php
index 57c8ac30ed..43b11c229a 100644
--- a/app/Transformers/Api/Client/ActivityLogTransformer.php
+++ b/app/Transformers/Api/Client/ActivityLogTransformer.php
@@ -111,7 +111,7 @@ protected function hasAdditionalMetadata(ActivityLog $model): bool
* Determines if the user can view the IP address in the output either because they are the
* actor that performed the action, or because they are an administrator on the Panel.
*/
- protected function canViewIP(Model $actor = null): bool
+ protected function canViewIP(?Model $actor = null): bool
{
return optional($actor)->is($this->request->user()) || $this->request->user()->root_admin;
}
diff --git a/app/Transformers/Api/Client/ApiKeyTransformer.php b/app/Transformers/Api/Client/ApiKeyTransformer.php
index 92ee1a5c66..ee6efae219 100644
--- a/app/Transformers/Api/Client/ApiKeyTransformer.php
+++ b/app/Transformers/Api/Client/ApiKeyTransformer.php
@@ -6,9 +6,6 @@
class ApiKeyTransformer extends BaseClientTransformer
{
- /**
- * {@inheritdoc}
- */
public function getResourceName(): string
{
return ApiKey::RESOURCE_NAME;
diff --git a/app/Transformers/Api/Client/BaseClientTransformer.php b/app/Transformers/Api/Client/BaseClientTransformer.php
index 0388effb08..8e76629f70 100644
--- a/app/Transformers/Api/Client/BaseClientTransformer.php
+++ b/app/Transformers/Api/Client/BaseClientTransformer.php
@@ -24,16 +24,13 @@ public function getUser(): User
*
* @noinspection PhpParameterNameChangedDuringInheritanceInspection
*/
- protected function authorize(string $ability, Server $server = null): bool
+ protected function authorize(string $ability, ?Server $server = null): bool
{
Assert::isInstanceOf($server, Server::class);
return $this->request->user()->can($ability, [$server]);
}
- /**
- * {@inheritDoc}
- */
protected function makeTransformer(string $abstract)
{
Assert::subclassOf($abstract, self::class);
diff --git a/app/Transformers/Api/Client/ScheduleTransformer.php b/app/Transformers/Api/Client/ScheduleTransformer.php
index 98c783f45a..e98dc7bc85 100644
--- a/app/Transformers/Api/Client/ScheduleTransformer.php
+++ b/app/Transformers/Api/Client/ScheduleTransformer.php
@@ -12,9 +12,6 @@ class ScheduleTransformer extends BaseClientTransformer
protected array $defaultIncludes = ['tasks'];
- /**
- * {@inheritdoc}
- */
public function getResourceName(): string
{
return Schedule::RESOURCE_NAME;
diff --git a/app/Transformers/Api/Client/ServerTransformer.php b/app/Transformers/Api/Client/ServerTransformer.php
index 9f7bce958a..21f31603df 100644
--- a/app/Transformers/Api/Client/ServerTransformer.php
+++ b/app/Transformers/Api/Client/ServerTransformer.php
@@ -31,7 +31,7 @@ public function getResourceName(): string
*/
public function transform(Server $server): array
{
- /** @var \Pterodactyl\Services\Servers\StartupCommandService $service */
+ /** @var StartupCommandService $service */
$service = Container::getInstance()->make(StartupCommandService::class);
$user = $this->request->user();
diff --git a/app/Transformers/Api/Client/TaskTransformer.php b/app/Transformers/Api/Client/TaskTransformer.php
index 52f0e2b5d1..25b9eebc8e 100644
--- a/app/Transformers/Api/Client/TaskTransformer.php
+++ b/app/Transformers/Api/Client/TaskTransformer.php
@@ -6,9 +6,6 @@
class TaskTransformer extends BaseClientTransformer
{
- /**
- * {@inheritdoc}
- */
public function getResourceName(): string
{
return Task::RESOURCE_NAME;
diff --git a/bootstrap/tests.php b/bootstrap/tests.php
index 5b54493554..7cab352ecc 100644
--- a/bootstrap/tests.php
+++ b/bootstrap/tests.php
@@ -9,7 +9,7 @@
$app = require __DIR__ . '/app.php';
-/** @var \Pterodactyl\Console\Kernel $kernel */
+/** @var Pterodactyl\Console\Kernel $kernel */
$kernel = $app->make(Kernel::class);
/*
diff --git a/composer.json b/composer.json
index 25595571f0..3a89faea0d 100644
--- a/composer.json
+++ b/composer.json
@@ -17,52 +17,54 @@
}
],
"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",
- "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",
+ "aws/aws-sdk-php": "~3.324.7",
+ "guzzlehttp/guzzle": "~7.9.2",
+ "hashids/hashids": "~5.0.2",
+ "laracasts/utilities": "~3.2.3",
+ "laravel/framework": "~11.31.0",
+ "laravel/helpers": "~1.7.0",
+ "laravel/sanctum": "~4.0.3",
+ "laravel/tinker": "~2.10.0",
+ "laravel/ui": "~4.5.2",
+ "lcobucci/jwt": "~5.4.0",
+ "league/flysystem-aws-s3-v3": "~3.29.0",
+ "league/flysystem-memory": "~3.29.0",
+ "matriphe/iso-639": "~2.0",
+ "phpseclib/phpseclib": "~3.0.42",
+ "pragmarx/google2fa": "~8.0.3",
+ "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",
- "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",
+ "spatie/laravel-fractal": "~6.2.1",
+ "spatie/laravel-query-builder": "~6.2.1",
+ "staudenmeir/belongs-to-through": "~2.16.1",
+ "symfony/http-client": "~7.1.5",
+ "symfony/mailgun-mailer": "~7.1.3",
+ "symfony/postmark-mailer": "~7.1.1",
+ "symfony/yaml": "~7.1.5",
"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": "~3.2.0",
+ "fakerphp/faker": "~1.23.1",
+ "friendsofphp/php-cs-fixer": "~3.64.0",
+ "itsgoingd/clockwork": "~5.2.2",
+ "larastan/larastan": "~2.9.9",
+ "laravel/pail": "~1.1.5",
+ "laravel/sail": "~1.36.0",
+ "mockery/mockery": "~1.6.12",
+ "nunomaduro/collision": "~8.5.0",
+ "phpstan/phpstan": "~1.12.7",
+ "phpunit/phpunit": "~10.5.37",
+ "spatie/laravel-ignition": "~2.8.0"
},
"autoload": {
"files": [
@@ -90,7 +92,9 @@
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
- "@php artisan key:generate --ansi"
+ "@php artisan key:generate --ansi",
+ "@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
+ "@php artisan migrate --graceful --ansi"
]
},
"config": {
@@ -98,7 +102,7 @@
"preferred-install": "dist",
"sort-packages": true,
"platform": {
- "php": "8.1.0"
+ "php": "8.2.0"
}
},
"minimum-stability": "stable",
diff --git a/composer.lock b/composer.lock
index e1d83de066..aed91a8a29 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,31 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c825c79676768901c780446d7550a7f6",
+ "content-hash": "7b516fc3846bccca979db6b9e7010e4d",
"packages": [
{
"name": "aws/aws-crt-php",
- "version": "v1.0.4",
+ "version": "v1.2.7",
"source": {
"type": "git",
"url": "https://github.com/awslabs/aws-crt-php.git",
- "reference": "f5c64ee7c5fce196e2519b3d9b7138649efe032d"
+ "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/f5c64ee7c5fce196e2519b3d9b7138649efe032d",
- "reference": "f5c64ee7c5fce196e2519b3d9b7138649efe032d",
+ "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e",
+ "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e",
"shasum": ""
},
"require": {
"php": ">=5.5"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35|^5.6.3"
+ "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5",
+ "yoast/phpunit-polyfills": "^1.0"
+ },
+ "suggest": {
+ "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality."
},
"type": "library",
"autoload": {
@@ -43,7 +47,7 @@
}
],
"description": "AWS Common Runtime for PHP",
- "homepage": "http://aws.amazon.com/sdkforphp",
+ "homepage": "https://github.com/awslabs/aws-crt-php",
"keywords": [
"amazon",
"aws",
@@ -52,34 +56,35 @@
],
"support": {
"issues": "https://github.com/awslabs/aws-crt-php/issues",
- "source": "https://github.com/awslabs/aws-crt-php/tree/v1.0.4"
+ "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7"
},
- "time": "2023-01-31T23:08:25+00:00"
+ "time": "2024-10-18T22:15:13+00:00"
},
{
"name": "aws/aws-sdk-php",
- "version": "3.260.1",
+ "version": "3.324.13",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "964653acda337343e64344426fa609cf1df930e1"
+ "reference": "781cb9594f7d1754c888452f980748115fd159d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/964653acda337343e64344426fa609cf1df930e1",
- "reference": "964653acda337343e64344426fa609cf1df930e1",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/781cb9594f7d1754c888452f980748115fd159d3",
+ "reference": "781cb9594f7d1754c888452f980748115fd159d3",
"shasum": ""
},
"require": {
- "aws/aws-crt-php": "^1.0.4",
+ "aws/aws-crt-php": "^1.2.3",
"ext-json": "*",
"ext-pcre": "*",
"ext-simplexml": "*",
"guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
- "guzzlehttp/promises": "^1.4.0",
- "guzzlehttp/psr7": "^1.8.5 || ^2.3",
+ "guzzlehttp/promises": "^1.4.0 || ^2.0",
+ "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"mtdowling/jmespath.php": "^2.6",
- "php": ">=5.5"
+ "php": ">=7.2.5",
+ "psr/http-message": "^1.0 || ^2.0"
},
"require-dev": {
"andrewsville/php-token-reflection": "^1.4",
@@ -94,7 +99,7 @@
"ext-sockets": "*",
"nette/neon": "^2.3",
"paragonie/random_compat": ">= 2",
- "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5",
+ "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0",
"sebastian/comparator": "^1.2.3 || ^4.0",
@@ -119,7 +124,10 @@
],
"psr-4": {
"Aws\\": "src/"
- }
+ },
+ "exclude-from-classmap": [
+ "src/data/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -146,32 +154,31 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.260.1"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.324.13"
},
- "time": "2023-02-22T19:23:27+00:00"
+ "time": "2024-10-29T18:11:10+00:00"
},
{
"name": "brick/math",
- "version": "0.10.2",
+ "version": "0.12.1",
"source": {
"type": "git",
"url": "https://github.com/brick/math.git",
- "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f"
+ "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f",
- "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f",
+ "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+ "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
"shasum": ""
},
"require": {
- "ext-json": "*",
- "php": "^7.4 || ^8.0"
+ "php": "^8.1"
},
"require-dev": {
"php-coveralls/php-coveralls": "^2.2",
- "phpunit/phpunit": "^9.0",
- "vimeo/psalm": "4.25.0"
+ "phpunit/phpunit": "^10.1",
+ "vimeo/psalm": "5.16.0"
},
"type": "library",
"autoload": {
@@ -191,12 +198,17 @@
"arithmetic",
"bigdecimal",
"bignum",
+ "bignumber",
"brick",
- "math"
+ "decimal",
+ "integer",
+ "math",
+ "mathematics",
+ "rational"
],
"support": {
"issues": "https://github.com/brick/math/issues",
- "source": "https://github.com/brick/math/tree/0.10.2"
+ "source": "https://github.com/brick/math/tree/0.12.1"
},
"funding": [
{
@@ -204,20 +216,89 @@
"type": "github"
}
],
- "time": "2022-08-10T22:54:19+00:00"
+ "time": "2023-11-29T23:19:16+00:00"
+ },
+ {
+ "name": "carbonphp/carbon-doctrine-types",
+ "version": "3.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
+ "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+ "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^8.1"
+ },
+ "conflict": {
+ "doctrine/dbal": "<4.0.0 || >=5.0.0"
+ },
+ "require-dev": {
+ "doctrine/dbal": "^4.0.0",
+ "nesbot/carbon": "^2.71.0 || ^3.0.0",
+ "phpunit/phpunit": "^10.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "KyleKatarn",
+ "email": "kylekatarnls@gmail.com"
+ }
+ ],
+ "description": "Types to use Carbon in Doctrine",
+ "keywords": [
+ "carbon",
+ "date",
+ "datetime",
+ "doctrine",
+ "time"
+ ],
+ "support": {
+ "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
+ "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/kylekatarnls",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/Carbon",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-02-09T16:56:22+00:00"
},
{
"name": "dflydev/dot-access-data",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/dflydev/dflydev-dot-access-data.git",
- "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+ "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
- "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+ "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f",
+ "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f",
"shasum": ""
},
"require": {
@@ -277,42 +358,39 @@
],
"support": {
"issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
- "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+ "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3"
},
- "time": "2022-10-27T11:44:00+00:00"
+ "time": "2024-07-08T12:26:09+00:00"
},
{
- "name": "doctrine/cache",
- "version": "2.2.0",
+ "name": "doctrine/inflector",
+ "version": "2.0.10",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/cache.git",
- "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
+ "url": "https://github.com/doctrine/inflector.git",
+ "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
- "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+ "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
"shasum": ""
},
"require": {
- "php": "~7.1 || ^8.0"
- },
- "conflict": {
- "doctrine/common": ">2.2,<2.4"
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
- "cache/integration-tests": "dev-master",
- "doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "psr/cache": "^1.0 || ^2.0 || ^3.0",
- "symfony/cache": "^4.4 || ^5.4 || ^6",
- "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
+ "doctrine/coding-standard": "^11.0",
+ "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan-phpunit": "^1.1",
+ "phpstan/phpstan-strict-rules": "^1.3",
+ "phpunit/phpunit": "^8.5 || ^9.5",
+ "vimeo/psalm": "^4.25 || ^5.4"
},
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+ "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -341,22 +419,23 @@
"email": "schmittjoh@gmail.com"
}
],
- "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
- "homepage": "https://www.doctrine-project.org/projects/cache.html",
+ "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
+ "homepage": "https://www.doctrine-project.org/projects/inflector.html",
"keywords": [
- "abstraction",
- "apcu",
- "cache",
- "caching",
- "couchdb",
- "memcached",
+ "inflection",
+ "inflector",
+ "lowercase",
+ "manipulation",
"php",
- "redis",
- "xcache"
+ "plural",
+ "singular",
+ "strings",
+ "uppercase",
+ "words"
],
"support": {
- "issues": "https://github.com/doctrine/cache/issues",
- "source": "https://github.com/doctrine/cache/tree/2.2.0"
+ "issues": "https://github.com/doctrine/inflector/issues",
+ "source": "https://github.com/doctrine/inflector/tree/2.0.10"
},
"funding": [
{
@@ -368,58 +447,40 @@
"type": "patreon"
},
{
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
"type": "tidelift"
}
],
- "time": "2022-05-20T20:07:39+00:00"
+ "time": "2024-02-18T20:23:39+00:00"
},
{
- "name": "doctrine/dbal",
- "version": "3.6.0",
+ "name": "doctrine/lexer",
+ "version": "3.0.1",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/dbal.git",
- "reference": "85b98cb23c8af471a67abfe14485da696bcabc2e"
+ "url": "https://github.com/doctrine/lexer.git",
+ "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/85b98cb23c8af471a67abfe14485da696bcabc2e",
- "reference": "85b98cb23c8af471a67abfe14485da696bcabc2e",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+ "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
"shasum": ""
},
"require": {
- "composer-runtime-api": "^2",
- "doctrine/cache": "^1.11|^2.0",
- "doctrine/deprecations": "^0.5.3|^1",
- "doctrine/event-manager": "^1|^2",
- "php": "^7.4 || ^8.0",
- "psr/cache": "^1|^2|^3",
- "psr/log": "^1|^2|^3"
+ "php": "^8.1"
},
"require-dev": {
- "doctrine/coding-standard": "11.1.0",
- "fig/log-test": "^1",
- "jetbrains/phpstorm-stubs": "2022.3",
- "phpstan/phpstan": "1.9.14",
- "phpstan/phpstan-strict-rules": "^1.4",
- "phpunit/phpunit": "9.6.3",
- "psalm/plugin-phpunit": "0.18.4",
- "squizlabs/php_codesniffer": "3.7.1",
- "symfony/cache": "^5.4|^6.0",
- "symfony/console": "^4.4|^5.4|^6.0",
- "vimeo/psalm": "4.30.0"
- },
- "suggest": {
- "symfony/console": "For helpful console commands such as SQL execution and import of files."
+ "doctrine/coding-standard": "^12",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^10.5",
+ "psalm/plugin-phpunit": "^0.18.3",
+ "vimeo/psalm": "^5.21"
},
- "bin": [
- "bin/doctrine-dbal"
- ],
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\DBAL\\": "src"
+ "Doctrine\\Common\\Lexer\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -436,39 +497,22 @@
"email": "roman@code-factory.org"
},
{
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
- "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
- "homepage": "https://www.doctrine-project.org/projects/dbal.html",
- "keywords": [
- "abstraction",
- "database",
- "db2",
- "dbal",
- "mariadb",
- "mssql",
- "mysql",
- "oci8",
- "oracle",
- "pdo",
- "pgsql",
- "postgresql",
- "queryobject",
- "sasql",
- "sql",
- "sqlite",
- "sqlserver",
- "sqlsrv"
+ "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+ "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+ "keywords": [
+ "annotations",
+ "docblock",
+ "lexer",
+ "parser",
+ "php"
],
"support": {
- "issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.6.0"
+ "issues": "https://github.com/doctrine/lexer/issues",
+ "source": "https://github.com/doctrine/lexer/tree/3.0.1"
},
"funding": [
{
@@ -480,85 +524,112 @@
"type": "patreon"
},
{
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
"type": "tidelift"
}
],
- "time": "2023-02-07T22:52:03+00:00"
+ "time": "2024-02-05T11:56:58+00:00"
},
{
- "name": "doctrine/deprecations",
- "version": "v1.0.0",
+ "name": "dragonmantank/cron-expression",
+ "version": "v3.4.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/deprecations.git",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+ "url": "https://github.com/dragonmantank/cron-expression.git",
+ "reference": "8c784d071debd117328803d86b2097615b457500"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+ "reference": "8c784d071debd117328803d86b2097615b457500",
"shasum": ""
},
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.2|^8.0",
+ "webmozart/assert": "^1.0"
},
- "require-dev": {
- "doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3"
+ "replace": {
+ "mtdowling/cron-expression": "^1.0"
},
- "suggest": {
- "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+ "require-dev": {
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^1.0",
+ "phpunit/phpunit": "^7.0|^8.0|^9.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+ "Cron\\": "src/Cron/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
- "homepage": "https://www.doctrine-project.org/",
+ "authors": [
+ {
+ "name": "Chris Tankersley",
+ "email": "chris@ctankersley.com",
+ "homepage": "https://github.com/dragonmantank"
+ }
+ ],
+ "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+ "keywords": [
+ "cron",
+ "schedule"
+ ],
"support": {
- "issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ "issues": "https://github.com/dragonmantank/cron-expression/issues",
+ "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
},
- "time": "2022-05-02T15:47:09+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/dragonmantank",
+ "type": "github"
+ }
+ ],
+ "time": "2024-10-09T13:47:03+00:00"
},
{
- "name": "doctrine/event-manager",
- "version": "2.0.0",
+ "name": "egulias/email-validator",
+ "version": "4.0.2",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/event-manager.git",
- "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
+ "url": "https://github.com/egulias/EmailValidator.git",
+ "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
- "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
+ "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
"shasum": ""
},
"require": {
- "php": "^8.1"
- },
- "conflict": {
- "doctrine/common": "<2.9"
+ "doctrine/lexer": "^2.0 || ^3.0",
+ "php": ">=8.1",
+ "symfony/polyfill-intl-idn": "^1.26"
},
"require-dev": {
- "doctrine/coding-standard": "^10",
- "phpstan/phpstan": "^1.8.8",
- "phpunit/phpunit": "^9.5",
- "vimeo/psalm": "^4.28"
+ "phpunit/phpunit": "^10.2",
+ "vimeo/psalm": "^5.12"
+ },
+ "suggest": {
+ "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Doctrine\\Common\\": "src"
+ "Egulias\\EmailValidator\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -567,88 +638,62 @@
],
"authors": [
{
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- },
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com"
+ "name": "Eduardo Gulias Davis"
}
],
- "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
- "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
+ "description": "A library for validating emails against several RFCs",
+ "homepage": "https://github.com/egulias/EmailValidator",
"keywords": [
- "event",
- "event dispatcher",
- "event manager",
- "event system",
- "events"
+ "email",
+ "emailvalidation",
+ "emailvalidator",
+ "validation",
+ "validator"
],
"support": {
- "issues": "https://github.com/doctrine/event-manager/issues",
- "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
+ "issues": "https://github.com/egulias/EmailValidator/issues",
+ "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
},
"funding": [
{
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
- "type": "tidelift"
+ "url": "https://github.com/egulias",
+ "type": "github"
}
],
- "time": "2022-10-12T20:59:15+00:00"
+ "time": "2023-10-06T06:47:41+00:00"
},
{
- "name": "doctrine/inflector",
- "version": "2.0.6",
+ "name": "fruitcake/php-cors",
+ "version": "v1.3.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/inflector.git",
- "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
+ "url": "https://github.com/fruitcake/php-cors.git",
+ "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
- "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+ "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b",
+ "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0"
+ "php": "^7.4|^8.0",
+ "symfony/http-foundation": "^4.4|^5.4|^6|^7"
},
"require-dev": {
- "doctrine/coding-standard": "^10",
- "phpstan/phpstan": "^1.8",
- "phpstan/phpstan-phpunit": "^1.1",
- "phpstan/phpstan-strict-rules": "^1.3",
- "phpunit/phpunit": "^8.5 || ^9.5",
- "vimeo/psalm": "^4.25"
+ "phpstan/phpstan": "^1.4",
+ "phpunit/phpunit": "^9",
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+ "Fruitcake\\Cors\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -657,88 +702,62 @@
],
"authors": [
{
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
+ "name": "Fruitcake",
+ "homepage": "https://fruitcake.nl"
},
{
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
+ "name": "Barryvdh",
+ "email": "barryvdh@gmail.com"
}
],
- "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
- "homepage": "https://www.doctrine-project.org/projects/inflector.html",
+ "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
+ "homepage": "https://github.com/fruitcake/php-cors",
"keywords": [
- "inflection",
- "inflector",
- "lowercase",
- "manipulation",
- "php",
- "plural",
- "singular",
- "strings",
- "uppercase",
- "words"
+ "cors",
+ "laravel",
+ "symfony"
],
"support": {
- "issues": "https://github.com/doctrine/inflector/issues",
- "source": "https://github.com/doctrine/inflector/tree/2.0.6"
+ "issues": "https://github.com/fruitcake/php-cors/issues",
+ "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0"
},
"funding": [
{
- "url": "https://www.doctrine-project.org/sponsorship.html",
+ "url": "https://fruitcake.nl",
"type": "custom"
},
{
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
- "type": "tidelift"
+ "url": "https://github.com/barryvdh",
+ "type": "github"
}
],
- "time": "2022-10-20T09:10:12+00:00"
+ "time": "2023-10-12T05:21:21+00:00"
},
{
- "name": "doctrine/lexer",
- "version": "3.0.0",
+ "name": "graham-campbell/result-type",
+ "version": "v1.1.3",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/lexer.git",
- "reference": "84a527db05647743d50373e0ec53a152f2cde568"
+ "url": "https://github.com/GrahamCampbell/Result-Type.git",
+ "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
- "reference": "84a527db05647743d50373e0ec53a152f2cde568",
+ "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+ "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
"shasum": ""
},
"require": {
- "php": "^8.1"
+ "php": "^7.2.5 || ^8.0",
+ "phpoption/phpoption": "^1.9.3"
},
"require-dev": {
- "doctrine/coding-standard": "^10",
- "phpstan/phpstan": "^1.9",
- "phpunit/phpunit": "^9.5",
- "psalm/plugin-phpunit": "^0.18.3",
- "vimeo/psalm": "^5.0"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
},
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\Common\\Lexer\\": "src"
+ "GrahamCampbell\\ResultType\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -747,78 +766,86 @@
],
"authors": [
{
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
}
],
- "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
- "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+ "description": "An Implementation Of The Result Type",
"keywords": [
- "annotations",
- "docblock",
- "lexer",
- "parser",
- "php"
+ "Graham Campbell",
+ "GrahamCampbell",
+ "Result Type",
+ "Result-Type",
+ "result"
],
"support": {
- "issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/3.0.0"
+ "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
+ "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
},
"funding": [
{
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
},
{
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+ "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
"type": "tidelift"
}
],
- "time": "2022-12-15T16:57:16+00:00"
+ "time": "2024-07-20T21:45:45+00:00"
},
{
- "name": "dragonmantank/cron-expression",
- "version": "v3.3.2",
+ "name": "guzzlehttp/guzzle",
+ "version": "7.9.2",
"source": {
"type": "git",
- "url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8"
+ "url": "https://github.com/guzzle/guzzle.git",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8",
- "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
"shasum": ""
},
"require": {
- "php": "^7.2|^8.0",
- "webmozart/assert": "^1.0"
+ "ext-json": "*",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+ "guzzlehttp/psr7": "^2.7.0",
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-client": "^1.0",
+ "symfony/deprecation-contracts": "^2.2 || ^3.0"
},
- "replace": {
- "mtdowling/cron-expression": "^1.0"
+ "provide": {
+ "psr/http-client-implementation": "1.0"
},
"require-dev": {
- "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^1.0",
- "phpstan/phpstan-webmozart-assert": "^1.0",
- "phpunit/phpunit": "^7.0|^8.0|^9.0"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "ext-curl": "*",
+ "guzzle/client-integration-tests": "3.0.2",
+ "php-http/message-factory": "^1.1",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
+ },
+ "suggest": {
+ "ext-curl": "Required for CURL handler support",
+ "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+ "psr/log": "Required for using the Log middleware"
},
"type": "library",
+ "extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ }
+ },
"autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
"psr-4": {
- "Cron\\": "src/Cron/"
+ "GuzzleHttp\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -827,63 +854,104 @@
],
"authors": [
{
- "name": "Chris Tankersley",
- "email": "chris@ctankersley.com",
- "homepage": "https://github.com/dragonmantank"
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Jeremy Lindblom",
+ "email": "jeremeamia@gmail.com",
+ "homepage": "https://github.com/jeremeamia"
+ },
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
}
],
- "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+ "description": "Guzzle is a PHP HTTP client library",
"keywords": [
- "cron",
- "schedule"
+ "client",
+ "curl",
+ "framework",
+ "http",
+ "http client",
+ "psr-18",
+ "psr-7",
+ "rest",
+ "web service"
],
"support": {
- "issues": "https://github.com/dragonmantank/cron-expression/issues",
- "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2"
+ "issues": "https://github.com/guzzle/guzzle/issues",
+ "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
},
"funding": [
{
- "url": "https://github.com/dragonmantank",
+ "url": "https://github.com/GrahamCampbell",
"type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+ "type": "tidelift"
}
],
- "time": "2022-09-10T18:51:20+00:00"
+ "time": "2024-07-24T11:22:20+00:00"
},
{
- "name": "egulias/email-validator",
- "version": "4.0.1",
+ "name": "guzzlehttp/promises",
+ "version": "2.0.4",
"source": {
"type": "git",
- "url": "https://github.com/egulias/EmailValidator.git",
- "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff"
+ "url": "https://github.com/guzzle/promises.git",
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/3a85486b709bc384dae8eb78fb2eec649bdb64ff",
- "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
"shasum": ""
},
"require": {
- "doctrine/lexer": "^2.0 || ^3.0",
- "php": ">=8.1",
- "symfony/polyfill-intl-idn": "^1.26"
+ "php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5.27",
- "vimeo/psalm": "^4.30"
- },
- "suggest": {
- "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "4.0.x-dev"
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
}
},
"autoload": {
"psr-4": {
- "Egulias\\EmailValidator\\": "src"
+ "GuzzleHttp\\Promise\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -892,216 +960,92 @@
],
"authors": [
{
- "name": "Eduardo Gulias Davis"
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
}
],
- "description": "A library for validating emails against several RFCs",
- "homepage": "https://github.com/egulias/EmailValidator",
+ "description": "Guzzle promises library",
"keywords": [
- "email",
- "emailvalidation",
- "emailvalidator",
- "validation",
- "validator"
+ "promise"
],
"support": {
- "issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/4.0.1"
+ "issues": "https://github.com/guzzle/promises/issues",
+ "source": "https://github.com/guzzle/promises/tree/2.0.4"
},
"funding": [
{
- "url": "https://github.com/egulias",
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
"type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+ "type": "tidelift"
}
],
- "time": "2023-01-14T14:17:03+00:00"
+ "time": "2024-10-17T10:06:22+00:00"
},
{
- "name": "fruitcake/php-cors",
- "version": "v1.2.0",
+ "name": "guzzlehttp/psr7",
+ "version": "2.7.0",
"source": {
"type": "git",
- "url": "https://github.com/fruitcake/php-cors.git",
- "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e"
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e",
- "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
"shasum": ""
},
"require": {
- "php": "^7.4|^8.0",
- "symfony/http-foundation": "^4.4|^5.4|^6"
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.1 || ^2.0",
+ "ralouphie/getallheaders": "^3.0"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
},
"require-dev": {
- "phpstan/phpstan": "^1.4",
- "phpunit/phpunit": "^9",
- "squizlabs/php_codesniffer": "^3.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Fruitcake\\Cors\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fruitcake",
- "homepage": "https://fruitcake.nl"
- },
- {
- "name": "Barryvdh",
- "email": "barryvdh@gmail.com"
- }
- ],
- "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
- "homepage": "https://github.com/fruitcake/php-cors",
- "keywords": [
- "cors",
- "laravel",
- "symfony"
- ],
- "support": {
- "issues": "https://github.com/fruitcake/php-cors/issues",
- "source": "https://github.com/fruitcake/php-cors/tree/v1.2.0"
- },
- "funding": [
- {
- "url": "https://fruitcake.nl",
- "type": "custom"
- },
- {
- "url": "https://github.com/barryvdh",
- "type": "github"
- }
- ],
- "time": "2022-02-20T15:07:15+00:00"
- },
- {
- "name": "graham-campbell/result-type",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/GrahamCampbell/Result-Type.git",
- "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
- "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
- "shasum": ""
- },
- "require": {
- "php": "^7.2.5 || ^8.0",
- "phpoption/phpoption": "^1.9"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.5.28 || ^9.5.21"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "GrahamCampbell\\ResultType\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- }
- ],
- "description": "An Implementation Of The Result Type",
- "keywords": [
- "Graham Campbell",
- "GrahamCampbell",
- "Result Type",
- "Result-Type",
- "result"
- ],
- "support": {
- "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
- "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
- },
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
- "type": "tidelift"
- }
- ],
- "time": "2022-07-30T15:56:11+00:00"
- },
- {
- "name": "guzzlehttp/guzzle",
- "version": "7.5.0",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/guzzle.git",
- "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
- "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "guzzlehttp/promises": "^1.5",
- "guzzlehttp/psr7": "^1.9 || ^2.4",
- "php": "^7.2.5 || ^8.0",
- "psr/http-client": "^1.0",
- "symfony/deprecation-contracts": "^2.2 || ^3.0"
- },
- "provide": {
- "psr/http-client-implementation": "1.0"
- },
- "require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
- "ext-curl": "*",
- "php-http/client-integration-tests": "^3.0",
- "phpunit/phpunit": "^8.5.29 || ^9.5.23",
- "psr/log": "^1.1 || ^2.0 || ^3.0"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "http-interop/http-factory-tests": "0.9.0",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"suggest": {
- "ext-curl": "Required for CURL handler support",
- "ext-intl": "Required for Internationalized Domain Name (IDN) support",
- "psr/log": "Required for using the Log middleware"
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": false
- },
- "branch-alias": {
- "dev-master": "7.5-dev"
}
},
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
- "GuzzleHttp\\": "src/"
+ "GuzzleHttp\\Psr7\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1119,11 +1063,6 @@
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
- {
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia"
- },
{
"name": "George Mponos",
"email": "gmponos@gmail.com",
@@ -1143,23 +1082,27 @@
"name": "Tobias Schultze",
"email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
}
],
- "description": "Guzzle is a PHP HTTP client library",
+ "description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
- "client",
- "curl",
- "framework",
"http",
- "http client",
- "psr-18",
+ "message",
"psr-7",
- "rest",
- "web service"
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
],
"support": {
- "issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+ "issues": "https://github.com/guzzle/psr7/issues",
+ "source": "https://github.com/guzzle/psr7/tree/2.7.0"
},
"funding": [
{
@@ -1171,44 +1114,45 @@
"type": "github"
},
{
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
"type": "tidelift"
}
],
- "time": "2022-08-28T15:39:27+00:00"
+ "time": "2024-07-18T11:15:46+00:00"
},
{
- "name": "guzzlehttp/promises",
- "version": "1.5.2",
+ "name": "guzzlehttp/uri-template",
+ "version": "v1.0.3",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/promises.git",
- "reference": "b94b2807d85443f9719887892882d0329d1e2598"
+ "url": "https://github.com/guzzle/uri-template.git",
+ "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
- "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+ "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
+ "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
"shasum": ""
},
"require": {
- "php": ">=5.5"
+ "php": "^7.2.5 || ^8.0",
+ "symfony/polyfill-php80": "^1.24"
},
"require-dev": {
- "symfony/phpunit-bridge": "^4.4 || ^5.1"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+ "uri-template/tests": "1.0.0"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "1.5-dev"
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
}
},
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
- "GuzzleHttp\\Promise\\": "src/"
+ "GuzzleHttp\\UriTemplate\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1226,24 +1170,25 @@
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
"homepage": "https://github.com/Nyholm"
- },
- {
- "name": "Tobias Schultze",
- "email": "webmaster@tubo-world.de",
- "homepage": "https://github.com/Tobion"
}
],
- "description": "Guzzle promises library",
+ "description": "A polyfill class for uri_template of PHP",
"keywords": [
- "promise"
+ "guzzlehttp",
+ "uri-template"
],
"support": {
- "issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.5.2"
+ "issues": "https://github.com/guzzle/uri-template/issues",
+ "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
},
"funding": [
{
@@ -1255,57 +1200,46 @@
"type": "github"
},
{
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template",
"type": "tidelift"
}
],
- "time": "2022-08-28T14:55:35+00:00"
+ "time": "2023-12-03T19:50:20+00:00"
},
{
- "name": "guzzlehttp/psr7",
- "version": "2.4.3",
+ "name": "hashids/hashids",
+ "version": "5.0.2",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/psr7.git",
- "reference": "67c26b443f348a51926030c83481b85718457d3d"
+ "url": "https://github.com/vinkla/hashids.git",
+ "reference": "197171016b77ddf14e259e186559152eb3f8cf33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
- "reference": "67c26b443f348a51926030c83481b85718457d3d",
+ "url": "https://api.github.com/repos/vinkla/hashids/zipball/197171016b77ddf14e259e186559152eb3f8cf33",
+ "reference": "197171016b77ddf14e259e186559152eb3f8cf33",
"shasum": ""
},
"require": {
- "php": "^7.2.5 || ^8.0",
- "psr/http-factory": "^1.0",
- "psr/http-message": "^1.0",
- "ralouphie/getallheaders": "^3.0"
- },
- "provide": {
- "psr/http-factory-implementation": "1.0",
- "psr/http-message-implementation": "1.0"
+ "ext-mbstring": "*",
+ "php": "^8.1"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
- "http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+ "phpunit/phpunit": "^10.0"
},
"suggest": {
- "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+ "ext-bcmath": "Required to use BC Math arbitrary precision mathematics (*).",
+ "ext-gmp": "Required to use GNU multiple precision mathematics (*)."
},
"type": "library",
"extra": {
- "bamarni-bin": {
- "bin-links": true,
- "forward-command": false
- },
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
"psr-4": {
- "GuzzleHttp\\Psr7\\": "src/"
+ "Hashids\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1314,200 +1248,8 @@
],
"authors": [
{
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- },
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "George Mponos",
- "email": "gmponos@gmail.com",
- "homepage": "https://github.com/gmponos"
- },
- {
- "name": "Tobias Nyholm",
- "email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
- },
- {
- "name": "Márk Sági-Kazár",
- "email": "mark.sagikazar@gmail.com",
- "homepage": "https://github.com/sagikazarmark"
- },
- {
- "name": "Tobias Schultze",
- "email": "webmaster@tubo-world.de",
- "homepage": "https://github.com/Tobion"
- },
- {
- "name": "Márk Sági-Kazár",
- "email": "mark.sagikazar@gmail.com",
- "homepage": "https://sagikazarmark.hu"
- }
- ],
- "description": "PSR-7 message implementation that also provides common utility methods",
- "keywords": [
- "http",
- "message",
- "psr-7",
- "request",
- "response",
- "stream",
- "uri",
- "url"
- ],
- "support": {
- "issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.4.3"
- },
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://github.com/Nyholm",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
- "type": "tidelift"
- }
- ],
- "time": "2022-10-26T14:07:24+00:00"
- },
- {
- "name": "guzzlehttp/uri-template",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/uri-template.git",
- "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2",
- "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2",
- "shasum": ""
- },
- "require": {
- "php": "^7.2.5 || ^8.0",
- "symfony/polyfill-php80": "^1.17"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.5.19 || ^9.5.8",
- "uri-template/tests": "1.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "GuzzleHttp\\UriTemplate\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- },
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "George Mponos",
- "email": "gmponos@gmail.com",
- "homepage": "https://github.com/gmponos"
- },
- {
- "name": "Tobias Nyholm",
- "email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
- }
- ],
- "description": "A polyfill class for uri_template of PHP",
- "keywords": [
- "guzzlehttp",
- "uri-template"
- ],
- "support": {
- "issues": "https://github.com/guzzle/uri-template/issues",
- "source": "https://github.com/guzzle/uri-template/tree/v1.0.1"
- },
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://github.com/Nyholm",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template",
- "type": "tidelift"
- }
- ],
- "time": "2021-10-07T12:57:01+00:00"
- },
- {
- "name": "hashids/hashids",
- "version": "5.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/vinkla/hashids.git",
- "reference": "197171016b77ddf14e259e186559152eb3f8cf33"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/vinkla/hashids/zipball/197171016b77ddf14e259e186559152eb3f8cf33",
- "reference": "197171016b77ddf14e259e186559152eb3f8cf33",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "php": "^8.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^10.0"
- },
- "suggest": {
- "ext-bcmath": "Required to use BC Math arbitrary precision mathematics (*).",
- "ext-gmp": "Required to use GNU multiple precision mathematics (*)."
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Hashids\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ivan Akimov",
- "email": "ivan@barreleye.com"
+ "name": "Ivan Akimov",
+ "email": "ivan@barreleye.com"
},
{
"name": "Vincent Klaiber",
@@ -1535,20 +1277,20 @@
},
{
"name": "laracasts/utilities",
- "version": "3.2.2",
+ "version": "3.2.3",
"source": {
"type": "git",
"url": "https://github.com/laracasts/PHP-Vars-To-Js-Transformer.git",
- "reference": "1cc5d5b9670e5be392df38e0b648fa4842c5a1f8"
+ "reference": "4826fe062f58d07b13e72460141b21c8c07b736d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laracasts/PHP-Vars-To-Js-Transformer/zipball/1cc5d5b9670e5be392df38e0b648fa4842c5a1f8",
- "reference": "1cc5d5b9670e5be392df38e0b648fa4842c5a1f8",
+ "url": "https://api.github.com/repos/laracasts/PHP-Vars-To-Js-Transformer/zipball/4826fe062f58d07b13e72460141b21c8c07b736d",
+ "reference": "4826fe062f58d07b13e72460141b21c8c07b736d",
"shasum": ""
},
"require": {
- "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+ "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"php": ">=5.5.0|>=7.2.5|>=8.0.0"
},
"require-dev": {
@@ -1590,26 +1332,26 @@
],
"support": {
"issues": "https://github.com/laracasts/PHP-Vars-To-Js-Transformer/issues",
- "source": "https://github.com/laracasts/PHP-Vars-To-Js-Transformer/tree/3.2.2"
+ "source": "https://github.com/laracasts/PHP-Vars-To-Js-Transformer/tree/3.2.3"
},
- "time": "2023-02-03T13:22:09+00:00"
+ "time": "2024-03-03T16:53:37+00:00"
},
{
"name": "laravel/framework",
- "version": "v10.1.4",
+ "version": "v11.31.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "da95415a83fe6216dc78efebfc311365cf4cade0"
+ "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/da95415a83fe6216dc78efebfc311365cf4cade0",
- "reference": "da95415a83fe6216dc78efebfc311365cf4cade0",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40",
+ "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40",
"shasum": ""
},
"require": {
- "brick/math": "^0.9.3|^0.10.2|^0.11",
+ "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
"composer-runtime-api": "^2.2",
"doctrine/inflector": "^2.0.5",
"dragonmantank/cron-expression": "^3.3.2",
@@ -1621,39 +1363,44 @@
"ext-openssl": "*",
"ext-session": "*",
"ext-tokenizer": "*",
- "fruitcake/php-cors": "^1.2",
+ "fruitcake/php-cors": "^1.3",
+ "guzzlehttp/guzzle": "^7.8",
"guzzlehttp/uri-template": "^1.0",
+ "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
"laravel/serializable-closure": "^1.3",
"league/commonmark": "^2.2.1",
"league/flysystem": "^3.8.0",
"monolog/monolog": "^3.0",
- "nesbot/carbon": "^2.62.1",
- "nunomaduro/termwind": "^1.13",
- "php": "^8.1",
+ "nesbot/carbon": "^2.72.2|^3.0",
+ "nunomaduro/termwind": "^2.0",
+ "php": "^8.2",
"psr/container": "^1.1.1|^2.0.1",
"psr/log": "^1.0|^2.0|^3.0",
"psr/simple-cache": "^1.0|^2.0|^3.0",
"ramsey/uuid": "^4.7",
- "symfony/console": "^6.2",
- "symfony/error-handler": "^6.2",
- "symfony/finder": "^6.2",
- "symfony/http-foundation": "^6.2",
- "symfony/http-kernel": "^6.2",
- "symfony/mailer": "^6.2",
- "symfony/mime": "^6.2",
- "symfony/process": "^6.2",
- "symfony/routing": "^6.2",
- "symfony/uid": "^6.2",
- "symfony/var-dumper": "^6.2",
+ "symfony/console": "^7.0",
+ "symfony/error-handler": "^7.0",
+ "symfony/finder": "^7.0",
+ "symfony/http-foundation": "^7.0",
+ "symfony/http-kernel": "^7.0",
+ "symfony/mailer": "^7.0",
+ "symfony/mime": "^7.0",
+ "symfony/polyfill-php83": "^1.28",
+ "symfony/process": "^7.0",
+ "symfony/routing": "^7.0",
+ "symfony/uid": "^7.0",
+ "symfony/var-dumper": "^7.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.5",
"vlucas/phpdotenv": "^5.4.1",
"voku/portable-ascii": "^2.0"
},
"conflict": {
+ "mockery/mockery": "1.6.8",
"tightenco/collect": "<5.5.33"
},
"provide": {
"psr/container-implementation": "1.1|2.0",
+ "psr/log-implementation": "1.0|2.0|3.0",
"psr/simple-cache-implementation": "1.0|2.0|3.0"
},
"replace": {
@@ -1662,6 +1409,7 @@
"illuminate/bus": "self.version",
"illuminate/cache": "self.version",
"illuminate/collections": "self.version",
+ "illuminate/concurrency": "self.version",
"illuminate/conditionable": "self.version",
"illuminate/config": "self.version",
"illuminate/console": "self.version",
@@ -1689,35 +1437,35 @@
"illuminate/testing": "self.version",
"illuminate/translation": "self.version",
"illuminate/validation": "self.version",
- "illuminate/view": "self.version"
+ "illuminate/view": "self.version",
+ "spatie/once": "*"
},
"require-dev": {
"ably/ably-php": "^1.0",
"aws/aws-sdk-php": "^3.235.5",
- "doctrine/dbal": "^3.5.1",
"ext-gmp": "*",
- "fakerphp/faker": "^1.21",
- "guzzlehttp/guzzle": "^7.5",
+ "fakerphp/faker": "^1.23",
"league/flysystem-aws-s3-v3": "^3.0",
"league/flysystem-ftp": "^3.0",
"league/flysystem-path-prefixing": "^3.3",
"league/flysystem-read-only": "^3.3",
"league/flysystem-sftp-v3": "^3.0",
- "mockery/mockery": "^1.5.1",
- "orchestra/testbench-core": "^8.0",
- "pda/pheanstalk": "^4.0",
- "phpstan/phpdoc-parser": "^1.15",
- "phpstan/phpstan": "^1.4.7",
- "phpunit/phpunit": "^10.0.7",
+ "mockery/mockery": "^1.6",
+ "nyholm/psr7": "^1.2",
+ "orchestra/testbench-core": "^9.5",
+ "pda/pheanstalk": "^5.0",
+ "phpstan/phpstan": "^1.11.5",
+ "phpunit/phpunit": "^10.5|^11.0",
"predis/predis": "^2.0.2",
- "symfony/cache": "^6.2",
- "symfony/http-client": "^6.2.4"
+ "resend/resend-php": "^0.10.0",
+ "symfony/cache": "^7.0",
+ "symfony/http-client": "^7.0",
+ "symfony/psr-http-message-bridge": "^7.0"
},
"suggest": {
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
- "brianium/paratest": "Required to run tests in parallel (^6.0).",
- "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+ "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
"ext-apcu": "Required to use the APC cache driver.",
"ext-fileinfo": "Required to use the Filesystem class.",
"ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -1726,41 +1474,44 @@
"ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
"ext-pdo": "Required to use all database features.",
"ext-posix": "Required to use all features of the queue worker.",
- "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
+ "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
- "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
"league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
"league/flysystem-read-only": "Required to use read-only disks (^3.3)",
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
- "mockery/mockery": "Required to use mocking (^1.5.1).",
+ "mockery/mockery": "Required to use mocking (^1.6).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
- "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
- "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
+ "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
+ "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
"predis/predis": "Required to use the predis connector (^2.0.2).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
- "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
- "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
- "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
- "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
- "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
- "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
+ "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
+ "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
+ "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
+ "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
+ "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
+ "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
+ "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "10.x-dev"
+ "dev-master": "11.x-dev"
}
},
"autoload": {
"files": [
"src/Illuminate/Collections/helpers.php",
"src/Illuminate/Events/functions.php",
+ "src/Illuminate/Filesystem/functions.php",
"src/Illuminate/Foundation/helpers.php",
+ "src/Illuminate/Log/functions.php",
+ "src/Illuminate/Support/functions.php",
"src/Illuminate/Support/helpers.php"
],
"psr-4": {
@@ -1792,28 +1543,29 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2023-02-23T12:25:38+00:00"
+ "time": "2024-11-12T15:36:15+00:00"
},
{
"name": "laravel/helpers",
- "version": "v1.6.0",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/helpers.git",
- "reference": "4dd0f9436d3911611622a6ced8329a1710576f60"
+ "reference": "6caaa242a23bc39b4e3cf57304b5409260a7a346"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/helpers/zipball/4dd0f9436d3911611622a6ced8329a1710576f60",
- "reference": "4dd0f9436d3911611622a6ced8329a1710576f60",
+ "url": "https://api.github.com/repos/laravel/helpers/zipball/6caaa242a23bc39b4e3cf57304b5409260a7a346",
+ "reference": "6caaa242a23bc39b4e3cf57304b5409260a7a346",
"shasum": ""
},
"require": {
- "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
- "php": "^7.1.3|^8.0"
+ "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+ "php": "^7.2.0|^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.0|^8.0|^9.0"
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^7.0|^8.0|^9.0|^10.0"
},
"type": "library",
"extra": {
@@ -1846,42 +1598,100 @@
"laravel"
],
"support": {
- "source": "https://github.com/laravel/helpers/tree/v1.6.0"
+ "source": "https://github.com/laravel/helpers/tree/v1.7.0"
+ },
+ "time": "2023-11-30T14:09:05+00:00"
+ },
+ {
+ "name": "laravel/prompts",
+ "version": "v0.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/prompts.git",
+ "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+ "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+ "shasum": ""
+ },
+ "require": {
+ "composer-runtime-api": "^2.2",
+ "ext-mbstring": "*",
+ "php": "^8.1",
+ "symfony/console": "^6.2|^7.0"
+ },
+ "conflict": {
+ "illuminate/console": ">=10.17.0 <10.25.0",
+ "laravel/framework": ">=10.17.0 <10.25.0"
+ },
+ "require-dev": {
+ "illuminate/collections": "^10.0|^11.0",
+ "mockery/mockery": "^1.5",
+ "pestphp/pest": "^2.3|^3.4",
+ "phpstan/phpstan": "^1.11",
+ "phpstan/phpstan-mockery": "^1.1"
+ },
+ "suggest": {
+ "ext-pcntl": "Required for the spinner to be animated."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "0.3.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/helpers.php"
+ ],
+ "psr-4": {
+ "Laravel\\Prompts\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Add beautiful and user-friendly forms to your command-line applications.",
+ "support": {
+ "issues": "https://github.com/laravel/prompts/issues",
+ "source": "https://github.com/laravel/prompts/tree/v0.3.2"
},
- "time": "2023-01-09T14:48:11+00:00"
+ "time": "2024-11-12T14:59:47+00:00"
},
{
"name": "laravel/sanctum",
- "version": "v3.2.1",
+ "version": "v4.0.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/sanctum.git",
- "reference": "d09d69bac55708fcd4a3b305d760e673d888baf9"
+ "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/sanctum/zipball/d09d69bac55708fcd4a3b305d760e673d888baf9",
- "reference": "d09d69bac55708fcd4a3b305d760e673d888baf9",
+ "url": "https://api.github.com/repos/laravel/sanctum/zipball/54aea9d13743ae8a6cdd3c28dbef128a17adecab",
+ "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab",
"shasum": ""
},
"require": {
"ext-json": "*",
- "illuminate/console": "^9.21|^10.0",
- "illuminate/contracts": "^9.21|^10.0",
- "illuminate/database": "^9.21|^10.0",
- "illuminate/support": "^9.21|^10.0",
- "php": "^8.0.2"
+ "illuminate/console": "^11.0",
+ "illuminate/contracts": "^11.0",
+ "illuminate/database": "^11.0",
+ "illuminate/support": "^11.0",
+ "php": "^8.2",
+ "symfony/console": "^7.0"
},
"require-dev": {
- "mockery/mockery": "^1.0",
- "orchestra/testbench": "^7.0|^8.0",
- "phpunit/phpunit": "^9.3"
+ "mockery/mockery": "^1.6",
+ "orchestra/testbench": "^9.0",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^10.5"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "3.x-dev"
- },
"laravel": {
"providers": [
"Laravel\\Sanctum\\SanctumServiceProvider"
@@ -1913,30 +1723,31 @@
"issues": "https://github.com/laravel/sanctum/issues",
"source": "https://github.com/laravel/sanctum"
},
- "time": "2023-01-13T15:41:49+00:00"
+ "time": "2024-09-27T14:55:41+00:00"
},
{
"name": "laravel/serializable-closure",
- "version": "v1.3.0",
+ "version": "v1.3.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
- "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37"
+ "reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
- "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
+ "reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
"shasum": ""
},
"require": {
"php": "^7.3|^8.0"
},
"require-dev": {
- "nesbot/carbon": "^2.61",
+ "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+ "nesbot/carbon": "^2.61|^3.0",
"pestphp/pest": "^1.21.3",
"phpstan/phpstan": "^1.8.2",
- "symfony/var-dumper": "^5.4.11"
+ "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
},
"type": "library",
"extra": {
@@ -1973,42 +1784,40 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
- "time": "2023-01-30T18:31:20+00:00"
+ "time": "2024-11-11T17:06:04+00:00"
},
{
"name": "laravel/tinker",
- "version": "v2.8.1",
+ "version": "v2.10.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"
+ "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10",
- "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
+ "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
"shasum": ""
},
"require": {
- "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
- "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
- "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+ "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+ "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+ "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"php": "^7.2.5|^8.0",
- "psy/psysh": "^0.10.4|^0.11.1",
- "symfony/var-dumper": "^4.3.4|^5.0|^6.0"
+ "psy/psysh": "^0.11.1|^0.12.0",
+ "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
},
"require-dev": {
"mockery/mockery": "~1.3.3|^1.4.2",
+ "phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^8.5.8|^9.3.3"
},
"suggest": {
- "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)."
+ "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "2.x-dev"
- },
"laravel": {
"providers": [
"Laravel\\Tinker\\TinkerServiceProvider"
@@ -2039,34 +1848,35 @@
],
"support": {
"issues": "https://github.com/laravel/tinker/issues",
- "source": "https://github.com/laravel/tinker/tree/v2.8.1"
+ "source": "https://github.com/laravel/tinker/tree/v2.10.0"
},
- "time": "2023-02-15T16:40:09+00:00"
+ "time": "2024-09-23T13:32:56+00:00"
},
{
"name": "laravel/ui",
- "version": "v4.2.1",
+ "version": "v4.5.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
- "reference": "05ff7ac1eb55e2dfd10edcfb18c953684d693907"
+ "reference": "c75396f63268c95b053c8e4814eb70e0875e9628"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/ui/zipball/05ff7ac1eb55e2dfd10edcfb18c953684d693907",
- "reference": "05ff7ac1eb55e2dfd10edcfb18c953684d693907",
+ "url": "https://api.github.com/repos/laravel/ui/zipball/c75396f63268c95b053c8e4814eb70e0875e9628",
+ "reference": "c75396f63268c95b053c8e4814eb70e0875e9628",
"shasum": ""
},
"require": {
- "illuminate/console": "^9.21|^10.0",
- "illuminate/filesystem": "^9.21|^10.0",
- "illuminate/support": "^9.21|^10.0",
- "illuminate/validation": "^9.21|^10.0",
- "php": "^8.0"
+ "illuminate/console": "^9.21|^10.0|^11.0",
+ "illuminate/filesystem": "^9.21|^10.0|^11.0",
+ "illuminate/support": "^9.21|^10.0|^11.0",
+ "illuminate/validation": "^9.21|^10.0|^11.0",
+ "php": "^8.0",
+ "symfony/console": "^6.0|^7.0"
},
"require-dev": {
- "orchestra/testbench": "^7.0|^8.0",
- "phpunit/phpunit": "^9.3"
+ "orchestra/testbench": "^7.35|^8.15|^9.0",
+ "phpunit/phpunit": "^9.3|^10.4|^11.0"
},
"type": "library",
"extra": {
@@ -2101,61 +1911,70 @@
"ui"
],
"support": {
- "source": "https://github.com/laravel/ui/tree/v4.2.1"
+ "source": "https://github.com/laravel/ui/tree/v4.5.2"
},
- "time": "2023-02-17T09:17:24+00:00"
+ "time": "2024-05-08T18:07:10+00:00"
},
{
- "name": "lcobucci/clock",
- "version": "3.0.0",
+ "name": "lcobucci/jwt",
+ "version": "5.4.2",
"source": {
"type": "git",
- "url": "https://github.com/lcobucci/clock.git",
- "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc"
+ "url": "https://github.com/lcobucci/jwt.git",
+ "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
- "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
+ "url": "https://api.github.com/repos/lcobucci/jwt/zipball/ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
+ "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
"shasum": ""
},
"require": {
- "php": "~8.1.0 || ~8.2.0",
+ "ext-openssl": "*",
+ "ext-sodium": "*",
+ "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"psr/clock": "^1.0"
},
- "provide": {
- "psr/clock-implementation": "1.0"
- },
"require-dev": {
- "infection/infection": "^0.26",
- "lcobucci/coding-standard": "^9.0",
+ "infection/infection": "^0.29",
+ "lcobucci/clock": "^3.2",
+ "lcobucci/coding-standard": "^11.0",
+ "phpbench/phpbench": "^1.2",
"phpstan/extension-installer": "^1.2",
- "phpstan/phpstan": "^1.9.4",
- "phpstan/phpstan-deprecation-rules": "^1.1.1",
- "phpstan/phpstan-phpunit": "^1.3.2",
- "phpstan/phpstan-strict-rules": "^1.4.4",
- "phpunit/phpunit": "^9.5.27"
+ "phpstan/phpstan": "^1.10.7",
+ "phpstan/phpstan-deprecation-rules": "^1.1.3",
+ "phpstan/phpstan-phpunit": "^1.3.10",
+ "phpstan/phpstan-strict-rules": "^1.5.0",
+ "phpunit/phpunit": "^11.1"
+ },
+ "suggest": {
+ "lcobucci/clock": ">= 3.2"
},
"type": "library",
"autoload": {
"psr-4": {
- "Lcobucci\\Clock\\": "src"
+ "Lcobucci\\JWT\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
"name": "Luís Cobucci",
- "email": "lcobucci@gmail.com"
+ "email": "lcobucci@gmail.com",
+ "role": "Developer"
}
],
- "description": "Yet another clock abstraction",
+ "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+ "keywords": [
+ "JWS",
+ "jwt"
+ ],
"support": {
- "issues": "https://github.com/lcobucci/clock/issues",
- "source": "https://github.com/lcobucci/clock/tree/3.0.0"
+ "issues": "https://github.com/lcobucci/jwt/issues",
+ "source": "https://github.com/lcobucci/jwt/tree/5.4.2"
},
"funding": [
{
@@ -2167,108 +1986,34 @@
"type": "patreon"
}
],
- "time": "2022-12-19T15:00:24+00:00"
+ "time": "2024-11-07T12:54:35+00:00"
},
{
- "name": "lcobucci/jwt",
- "version": "4.3.0",
+ "name": "league/commonmark",
+ "version": "2.5.3",
"source": {
"type": "git",
- "url": "https://github.com/lcobucci/jwt.git",
- "reference": "4d7de2fe0d51a96418c0d04004986e410e87f6b4"
+ "url": "https://github.com/thephpleague/commonmark.git",
+ "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lcobucci/jwt/zipball/4d7de2fe0d51a96418c0d04004986e410e87f6b4",
- "reference": "4d7de2fe0d51a96418c0d04004986e410e87f6b4",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+ "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
"shasum": ""
},
"require": {
- "ext-hash": "*",
- "ext-json": "*",
"ext-mbstring": "*",
- "ext-openssl": "*",
- "ext-sodium": "*",
- "lcobucci/clock": "^2.0 || ^3.0",
- "php": "^7.4 || ^8.0"
- },
- "require-dev": {
- "infection/infection": "^0.21",
- "lcobucci/coding-standard": "^6.0",
- "mikey179/vfsstream": "^1.6.7",
- "phpbench/phpbench": "^1.2",
- "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^1.4",
- "phpstan/phpstan-deprecation-rules": "^1.0",
- "phpstan/phpstan-phpunit": "^1.0",
- "phpstan/phpstan-strict-rules": "^1.0",
- "phpunit/php-invoker": "^3.1",
- "phpunit/phpunit": "^9.5"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Lcobucci\\JWT\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Luís Cobucci",
- "email": "lcobucci@gmail.com",
- "role": "Developer"
- }
- ],
- "description": "A simple library to work with JSON Web Token and JSON Web Signature",
- "keywords": [
- "JWS",
- "jwt"
- ],
- "support": {
- "issues": "https://github.com/lcobucci/jwt/issues",
- "source": "https://github.com/lcobucci/jwt/tree/4.3.0"
- },
- "funding": [
- {
- "url": "https://github.com/lcobucci",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/lcobucci",
- "type": "patreon"
- }
- ],
- "time": "2023-01-02T13:28:00+00:00"
- },
- {
- "name": "league/commonmark",
- "version": "2.3.9",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark.git",
- "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c1e114f74e518daca2729ea8c4bf1167038fa4b5",
- "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "league/config": "^1.1.1",
- "php": "^7.4 || ^8.0",
- "psr/event-dispatcher": "^1.0",
- "symfony/deprecation-contracts": "^2.1 || ^3.0",
- "symfony/polyfill-php80": "^1.16"
+ "league/config": "^1.1.1",
+ "php": "^7.4 || ^8.0",
+ "psr/event-dispatcher": "^1.0",
+ "symfony/deprecation-contracts": "^2.1 || ^3.0",
+ "symfony/polyfill-php80": "^1.16"
},
"require-dev": {
"cebe/markdown": "^1.0",
- "commonmark/cmark": "0.30.0",
- "commonmark/commonmark.js": "0.30.0",
+ "commonmark/cmark": "0.31.1",
+ "commonmark/commonmark.js": "0.31.1",
"composer/package-versions-deprecated": "^1.8",
"embed/embed": "^4.4",
"erusev/parsedown": "^1.0",
@@ -2277,10 +2022,10 @@
"michelf/php-markdown": "^1.4 || ^2.0",
"nyholm/psr7": "^1.5",
"phpstan/phpstan": "^1.8.2",
- "phpunit/phpunit": "^9.5.21",
+ "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
"scrutinizer/ocular": "^1.8.1",
- "symfony/finder": "^5.3 | ^6.0",
- "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+ "symfony/finder": "^5.3 | ^6.0 || ^7.0",
+ "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
"unleashedtech/php-coding-standard": "^3.1.1",
"vimeo/psalm": "^4.24.0 || ^5.0.0"
},
@@ -2290,7 +2035,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.4-dev"
+ "dev-main": "2.6-dev"
}
},
"autoload": {
@@ -2347,7 +2092,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-15T14:07:24+00:00"
+ "time": "2024-08-16T11:46:16+00:00"
},
{
"name": "league/config",
@@ -2433,23 +2178,26 @@
},
{
"name": "league/flysystem",
- "version": "3.12.3",
+ "version": "3.29.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "81e87e74dd5213795c7846d65089712d2dda90ce"
+ "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/81e87e74dd5213795c7846d65089712d2dda90ce",
- "reference": "81e87e74dd5213795c7846d65089712d2dda90ce",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+ "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
"shasum": ""
},
"require": {
+ "league/flysystem-local": "^3.0.0",
"league/mime-type-detection": "^1.0.0",
"php": "^8.0.2"
},
"conflict": {
+ "async-aws/core": "<1.19.0",
+ "async-aws/s3": "<1.14.0",
"aws/aws-sdk-php": "3.209.31 || 3.210.0",
"guzzlehttp/guzzle": "<7.0",
"guzzlehttp/ringphp": "<1.1.1",
@@ -2457,20 +2205,23 @@
"symfony/http-client": "<5.2"
},
"require-dev": {
- "async-aws/s3": "^1.5",
- "async-aws/simple-s3": "^1.1",
- "aws/aws-sdk-php": "^3.220.0",
+ "async-aws/s3": "^1.5 || ^2.0",
+ "async-aws/simple-s3": "^1.1 || ^2.0",
+ "aws/aws-sdk-php": "^3.295.10",
"composer/semver": "^3.0",
"ext-fileinfo": "*",
"ext-ftp": "*",
+ "ext-mongodb": "^1.3",
"ext-zip": "*",
"friendsofphp/php-cs-fixer": "^3.5",
"google/cloud-storage": "^1.23",
+ "guzzlehttp/psr7": "^2.6",
"microsoft/azure-storage-blob": "^1.1",
- "phpseclib/phpseclib": "^3.0.14",
- "phpstan/phpstan": "^0.12.26",
- "phpunit/phpunit": "^9.5.11",
- "sabre/dav": "^4.3.1"
+ "mongodb/mongodb": "^1.2",
+ "phpseclib/phpseclib": "^3.0.36",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^9.5.11|^10.0",
+ "sabre/dav": "^4.6.0"
},
"type": "library",
"autoload": {
@@ -2504,40 +2255,26 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/3.12.3"
+ "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
},
- "funding": [
- {
- "url": "https://ecologi.com/frankdejonge",
- "type": "custom"
- },
- {
- "url": "https://github.com/frankdejonge",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
- "type": "tidelift"
- }
- ],
- "time": "2023-02-18T15:32:41+00:00"
+ "time": "2024-10-08T08:58:34+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
- "version": "3.12.2",
+ "version": "3.29.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
- "reference": "645e14e4a80bd2da8b01e57388e7296a695a80c2"
+ "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/645e14e4a80bd2da8b01e57388e7296a695a80c2",
- "reference": "645e14e4a80bd2da8b01e57388e7296a695a80c2",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c6ff6d4606e48249b63f269eba7fabdb584e76a9",
+ "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9",
"shasum": ""
},
"require": {
- "aws/aws-sdk-php": "^3.220.0",
+ "aws/aws-sdk-php": "^3.295.10",
"league/flysystem": "^3.10.0",
"league/mime-type-detection": "^1.0.0",
"php": "^8.0.2"
@@ -2573,42 +2310,76 @@
"storage"
],
"support": {
- "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
- "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.12.2"
+ "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.29.0"
},
- "funding": [
- {
- "url": "https://ecologi.com/frankdejonge",
- "type": "custom"
- },
- {
- "url": "https://github.com/frankdejonge",
- "type": "github"
- },
+ "time": "2024-08-17T13:10:48+00:00"
+ },
+ {
+ "name": "league/flysystem-local",
+ "version": "3.29.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/flysystem-local.git",
+ "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+ "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+ "shasum": ""
+ },
+ "require": {
+ "ext-fileinfo": "*",
+ "league/flysystem": "^3.0.0",
+ "league/mime-type-detection": "^1.0.0",
+ "php": "^8.0.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\Flysystem\\Local\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
{
- "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
- "type": "tidelift"
+ "name": "Frank de Jonge",
+ "email": "info@frankdejonge.nl"
}
],
- "time": "2023-01-17T14:15:08+00:00"
+ "description": "Local filesystem adapter for Flysystem.",
+ "keywords": [
+ "Flysystem",
+ "file",
+ "files",
+ "filesystem",
+ "local"
+ ],
+ "support": {
+ "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
+ },
+ "time": "2024-08-09T21:24:39+00:00"
},
{
"name": "league/flysystem-memory",
- "version": "3.10.3",
+ "version": "3.29.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-memory.git",
- "reference": "5405162ac81f4de5aa5fa01aae7d07382b7c797b"
+ "reference": "219c79ad8b1d614a58ac17b775bfb3a6b7228126"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-memory/zipball/5405162ac81f4de5aa5fa01aae7d07382b7c797b",
- "reference": "5405162ac81f4de5aa5fa01aae7d07382b7c797b",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-memory/zipball/219c79ad8b1d614a58ac17b775bfb3a6b7228126",
+ "reference": "219c79ad8b1d614a58ac17b775bfb3a6b7228126",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
- "league/flysystem": "^2.0.0 || ^3.0.0",
+ "league/flysystem": "^3.0.0",
"php": "^8.0.2"
},
"type": "library",
@@ -2636,24 +2407,9 @@
"memory"
],
"support": {
- "issues": "https://github.com/thephpleague/flysystem-memory/issues",
- "source": "https://github.com/thephpleague/flysystem-memory/tree/3.10.3"
+ "source": "https://github.com/thephpleague/flysystem-memory/tree/3.29.0"
},
- "funding": [
- {
- "url": "https://ecologi.com/frankdejonge",
- "type": "custom"
- },
- {
- "url": "https://github.com/frankdejonge",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
- "type": "tidelift"
- }
- ],
- "time": "2022-10-26T18:30:26+00:00"
+ "time": "2024-08-09T21:24:39+00:00"
},
{
"name": "league/fractal",
@@ -2727,26 +2483,26 @@
},
{
"name": "league/mime-type-detection",
- "version": "1.11.0",
+ "version": "1.16.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git",
- "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
+ "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
- "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
+ "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+ "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
- "php": "^7.2 || ^8.0"
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.2",
"phpstan/phpstan": "^0.12.68",
- "phpunit/phpunit": "^8.5.8 || ^9.3"
+ "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
},
"type": "library",
"autoload": {
@@ -2767,7 +2523,7 @@
"description": "Mime-type detection for Flysystem",
"support": {
"issues": "https://github.com/thephpleague/mime-type-detection/issues",
- "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
+ "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
},
"funding": [
{
@@ -2779,24 +2535,27 @@
"type": "tidelift"
}
],
- "time": "2022-04-17T13:12:02+00:00"
+ "time": "2024-09-21T08:32:55+00:00"
},
{
"name": "matriphe/iso-639",
- "version": "1.2",
+ "version": "2.0",
"source": {
"type": "git",
"url": "https://github.com/matriphe/php-iso-639.git",
- "reference": "0245d844daeefdd22a54b47103ffdb0e03c323e1"
+ "reference": "3b7855e794ba31cdde1b464f66de3d39779b7a9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/matriphe/php-iso-639/zipball/0245d844daeefdd22a54b47103ffdb0e03c323e1",
- "reference": "0245d844daeefdd22a54b47103ffdb0e03c323e1",
+ "url": "https://api.github.com/repos/matriphe/php-iso-639/zipball/3b7855e794ba31cdde1b464f66de3d39779b7a9e",
+ "reference": "3b7855e794ba31cdde1b464f66de3d39779b7a9e",
"shasum": ""
},
+ "require": {
+ "php": "8.*"
+ },
"require-dev": {
- "phpunit/phpunit": "^4.7"
+ "phpunit/phpunit": ">=10"
},
"type": "library",
"autoload": {
@@ -2825,22 +2584,22 @@
],
"support": {
"issues": "https://github.com/matriphe/php-iso-639/issues",
- "source": "https://github.com/matriphe/php-iso-639/tree/master"
+ "source": "https://github.com/matriphe/php-iso-639/tree/2.0"
},
- "time": "2017-07-19T15:11:19+00:00"
+ "time": "2024-03-17T22:44:23+00:00"
},
{
"name": "monolog/monolog",
- "version": "3.3.1",
+ "version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "9b5daeaffce5b926cac47923798bba91059e60e2"
+ "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/9b5daeaffce5b926cac47923798bba91059e60e2",
- "reference": "9b5daeaffce5b926cac47923798bba91059e60e2",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67",
+ "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67",
"shasum": ""
},
"require": {
@@ -2855,17 +2614,19 @@
"doctrine/couchdb": "~1.0@dev",
"elasticsearch/elasticsearch": "^7 || ^8",
"ext-json": "*",
- "graylog2/gelf-php": "^1.4.2 || ^2@dev",
+ "graylog2/gelf-php": "^1.4.2 || ^2.0",
"guzzlehttp/guzzle": "^7.4.5",
"guzzlehttp/psr7": "^2.2",
"mongodb/mongodb": "^1.8",
"php-amqplib/php-amqplib": "~2.4 || ^3",
- "phpstan/phpstan": "^1.9",
- "phpstan/phpstan-deprecation-rules": "^1.0",
- "phpstan/phpstan-strict-rules": "^1.4",
- "phpunit/phpunit": "^9.5.26",
+ "php-console/php-console": "^3.1.8",
+ "phpstan/phpstan": "^2",
+ "phpstan/phpstan-deprecation-rules": "^2",
+ "phpstan/phpstan-strict-rules": "^2",
+ "phpunit/phpunit": "^10.5.17 || ^11.0.7",
"predis/predis": "^1.1 || ^2",
- "ruflin/elastica": "^7",
+ "rollbar/rollbar": "^4.0",
+ "ruflin/elastica": "^7 || ^8",
"symfony/mailer": "^5.4 || ^6",
"symfony/mime": "^5.4 || ^6"
},
@@ -2916,7 +2677,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/3.3.1"
+ "source": "https://github.com/Seldaek/monolog/tree/3.8.0"
},
"funding": [
{
@@ -2928,29 +2689,29 @@
"type": "tidelift"
}
],
- "time": "2023-02-06T13:46:10+00:00"
+ "time": "2024-11-12T13:57:08+00:00"
},
{
"name": "mtdowling/jmespath.php",
- "version": "2.6.1",
+ "version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/jmespath/jmespath.php.git",
- "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
+ "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
- "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
+ "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+ "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
"shasum": ""
},
"require": {
- "php": "^5.4 || ^7.0 || ^8.0",
+ "php": "^7.2.5 || ^8.0",
"symfony/polyfill-mbstring": "^1.17"
},
"require-dev": {
- "composer/xdebug-handler": "^1.4 || ^2.0",
- "phpunit/phpunit": "^4.8.36 || ^7.5.15"
+ "composer/xdebug-handler": "^3.0.3",
+ "phpunit/phpunit": "^8.5.33"
},
"bin": [
"bin/jp.php"
@@ -2958,7 +2719,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
@@ -2974,6 +2735,11 @@
"MIT"
],
"authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
@@ -2987,43 +2753,47 @@
],
"support": {
"issues": "https://github.com/jmespath/jmespath.php/issues",
- "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
+ "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
},
- "time": "2021-06-14T00:11:39+00:00"
+ "time": "2024-09-04T18:46:31+00:00"
},
{
"name": "nesbot/carbon",
- "version": "2.66.0",
+ "version": "3.8.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "496712849902241f04902033b0441b269effe001"
+ "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001",
- "reference": "496712849902241f04902033b0441b269effe001",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
+ "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"shasum": ""
},
"require": {
+ "carbonphp/carbon-doctrine-types": "<100.0",
"ext-json": "*",
- "php": "^7.1.8 || ^8.0",
+ "php": "^8.1",
+ "psr/clock": "^1.0",
+ "symfony/clock": "^6.3 || ^7.0",
"symfony/polyfill-mbstring": "^1.0",
- "symfony/polyfill-php80": "^1.16",
- "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+ "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
+ },
+ "provide": {
+ "psr/clock-implementation": "1.0"
},
"require-dev": {
- "doctrine/dbal": "^2.0 || ^3.1.4",
- "doctrine/orm": "^2.7",
- "friendsofphp/php-cs-fixer": "^3.0",
- "kylekatarnls/multi-tester": "^2.0",
- "ondrejmirtes/better-reflection": "*",
- "phpmd/phpmd": "^2.9",
- "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^0.12.99 || ^1.7.14",
- "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
- "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
- "squizlabs/php_codesniffer": "^3.4"
+ "doctrine/dbal": "^3.6.3 || ^4.0",
+ "doctrine/orm": "^2.15.2 || ^3.0",
+ "friendsofphp/php-cs-fixer": "^3.57.2",
+ "kylekatarnls/multi-tester": "^2.5.3",
+ "ondrejmirtes/better-reflection": "^6.25.0.4",
+ "phpmd/phpmd": "^2.15.0",
+ "phpstan/extension-installer": "^1.3.1",
+ "phpstan/phpstan": "^1.11.2",
+ "phpunit/phpunit": "^10.5.20",
+ "squizlabs/php_codesniffer": "^3.9.0"
},
"bin": [
"bin/carbon"
@@ -3031,8 +2801,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-3.x": "3.x-dev",
- "dev-master": "2.x-dev"
+ "dev-master": "3.x-dev",
+ "dev-2.x": "2.x-dev"
},
"laravel": {
"providers": [
@@ -3091,35 +2861,35 @@
"type": "tidelift"
}
],
- "time": "2023-01-29T18:53:47+00:00"
+ "time": "2024-11-07T17:46:48+00:00"
},
{
"name": "nette/schema",
- "version": "v1.2.3",
+ "version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
- "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
+ "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
- "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+ "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+ "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
"shasum": ""
},
"require": {
- "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0",
- "php": ">=7.1 <8.3"
+ "nette/utils": "^4.0",
+ "php": "8.1 - 8.4"
},
"require-dev": {
- "nette/tester": "^2.3 || ^2.4",
+ "nette/tester": "^2.5.2",
"phpstan/phpstan-nette": "^1.0",
- "tracy/tracy": "^2.7"
+ "tracy/tracy": "^2.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -3151,26 +2921,26 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
- "source": "https://github.com/nette/schema/tree/v1.2.3"
+ "source": "https://github.com/nette/schema/tree/v1.3.2"
},
- "time": "2022-10-13T01:24:26+00:00"
+ "time": "2024-10-06T23:10:23+00:00"
},
{
"name": "nette/utils",
- "version": "v4.0.0",
+ "version": "v4.0.5",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
- "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+ "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
- "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+ "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+ "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
"shasum": ""
},
"require": {
- "php": ">=8.0 <8.3"
+ "php": "8.0 - 8.4"
},
"conflict": {
"nette/finder": "<3",
@@ -3178,7 +2948,7 @@
},
"require-dev": {
"jetbrains/phpstorm-attributes": "dev-master",
- "nette/tester": "^2.4",
+ "nette/tester": "^2.5",
"phpstan/phpstan": "^1.0",
"tracy/tracy": "^2.9"
},
@@ -3188,8 +2958,7 @@
"ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
"ext-json": "to use Nette\\Utils\\Json",
"ext-mbstring": "to use Strings::lower() etc...",
- "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
- "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+ "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
},
"type": "library",
"extra": {
@@ -3238,31 +3007,33 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
- "source": "https://github.com/nette/utils/tree/v4.0.0"
+ "source": "https://github.com/nette/utils/tree/v4.0.5"
},
- "time": "2023-02-02T10:41:53+00:00"
+ "time": "2024-08-07T15:39:19+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.15.3",
+ "version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
- "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
+ "ext-ctype": "*",
+ "ext-json": "*",
"ext-tokenizer": "*",
- "php": ">=7.0"
+ "php": ">=7.4"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^9.0"
},
"bin": [
"bin/php-parse"
@@ -3270,7 +3041,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.9-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3294,39 +3065,37 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
},
- "time": "2023-01-16T22:05:37+00:00"
+ "time": "2024-10-08T18:51:32+00:00"
},
{
"name": "nunomaduro/termwind",
- "version": "v1.15.1",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/termwind.git",
- "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+ "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
- "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+ "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/42c84e4e8090766bbd6445d06cd6e57650626ea3",
+ "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "php": "^8.0",
- "symfony/console": "^5.3.0|^6.0.0"
- },
- "require-dev": {
- "ergebnis/phpstan-rules": "^1.0.",
- "illuminate/console": "^8.0|^9.0",
- "illuminate/support": "^8.0|^9.0",
- "laravel/pint": "^1.0.0",
- "pestphp/pest": "^1.21.0",
- "pestphp/pest-plugin-mock": "^1.0",
- "phpstan/phpstan": "^1.4.6",
- "phpstan/phpstan-strict-rules": "^1.1.0",
- "symfony/var-dumper": "^5.2.7|^6.0.0",
+ "php": "^8.2",
+ "symfony/console": "^7.1.5"
+ },
+ "require-dev": {
+ "illuminate/console": "^11.28.0",
+ "laravel/pint": "^1.18.1",
+ "mockery/mockery": "^1.6.12",
+ "pestphp/pest": "^2.36.0",
+ "phpstan/phpstan": "^1.12.6",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
+ "symfony/var-dumper": "^7.1.5",
"thecodingmachine/phpstan-strict-rules": "^1.0.0"
},
"type": "library",
@@ -3335,6 +3104,9 @@
"providers": [
"Termwind\\Laravel\\TermwindServiceProvider"
]
+ },
+ "branch-alias": {
+ "dev-2.x": "2.x-dev"
}
},
"autoload": {
@@ -3366,7 +3138,7 @@
],
"support": {
"issues": "https://github.com/nunomaduro/termwind/issues",
- "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+ "source": "https://github.com/nunomaduro/termwind/tree/v2.2.0"
},
"funding": [
{
@@ -3382,28 +3154,28 @@
"type": "github"
}
],
- "time": "2023-02-08T01:06:31+00:00"
+ "time": "2024-10-15T16:15:16+00:00"
},
{
"name": "paragonie/constant_time_encoding",
- "version": "v2.6.3",
+ "version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
- "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+ "reference": "df1e7fde177501eee2037dd159cf04f5f301a512"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
- "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+ "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512",
+ "reference": "df1e7fde177501eee2037dd159cf04f5f301a512",
"shasum": ""
},
"require": {
- "php": "^7|^8"
+ "php": "^8"
},
"require-dev": {
- "phpunit/phpunit": "^6|^7|^8|^9",
- "vimeo/psalm": "^1|^2|^3|^4"
+ "phpunit/phpunit": "^9",
+ "vimeo/psalm": "^4|^5"
},
"type": "library",
"autoload": {
@@ -3449,7 +3221,7 @@
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding"
},
- "time": "2022-06-14T06:56:20+00:00"
+ "time": "2024-05-08T12:36:18+00:00"
},
{
"name": "paragonie/random_compat",
@@ -3503,30 +3275,30 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.9.0",
+ "version": "1.9.3",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"
+ "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
- "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+ "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8",
- "phpunit/phpunit": "^8.5.28 || ^9.5.21"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
- "forward-command": true
+ "forward-command": false
},
"branch-alias": {
"dev-master": "1.9-dev"
@@ -3562,7 +3334,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
- "source": "https://github.com/schmittjoh/php-option/tree/1.9.0"
+ "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
},
"funding": [
{
@@ -3574,24 +3346,24 @@
"type": "tidelift"
}
],
- "time": "2022-07-30T15:51:26+00:00"
+ "time": "2024-07-20T21:41:07+00:00"
},
{
"name": "phpseclib/phpseclib",
- "version": "3.0.18",
+ "version": "3.0.42",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "f28693d38ba21bb0d9f0c411ee5dae2b178201da"
+ "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da",
- "reference": "f28693d38ba21bb0d9f0c411ee5dae2b178201da",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+ "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
"shasum": ""
},
"require": {
- "paragonie/constant_time_encoding": "^1|^2",
+ "paragonie/constant_time_encoding": "^1|^2|^3",
"paragonie/random_compat": "^1.4|^2.0|^9.99.99",
"php": ">=5.6.1"
},
@@ -3668,7 +3440,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
- "source": "https://github.com/phpseclib/phpseclib/tree/3.0.18"
+ "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
},
"funding": [
{
@@ -3684,28 +3456,28 @@
"type": "tidelift"
}
],
- "time": "2022-12-17T18:26:50+00:00"
+ "time": "2024-09-16T03:06:04+00:00"
},
{
"name": "pragmarx/google2fa",
- "version": "v8.0.1",
+ "version": "v8.0.3",
"source": {
"type": "git",
"url": "https://github.com/antonioribeiro/google2fa.git",
- "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3"
+ "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3",
- "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3",
+ "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
+ "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
"shasum": ""
},
"require": {
- "paragonie/constant_time_encoding": "^1.0|^2.0",
+ "paragonie/constant_time_encoding": "^1.0|^2.0|^3.0",
"php": "^7.1|^8.0"
},
"require-dev": {
- "phpstan/phpstan": "^0.12.18",
+ "phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^7.5.15|^8.5|^9.0"
},
"type": "library",
@@ -3734,39 +3506,36 @@
],
"support": {
"issues": "https://github.com/antonioribeiro/google2fa/issues",
- "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.1"
+ "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.3"
},
- "time": "2022-06-13T21:57:56+00:00"
+ "time": "2024-09-05T11:56:40+00:00"
},
{
"name": "predis/predis",
- "version": "v2.1.1",
+ "version": "v2.2.2",
"source": {
"type": "git",
"url": "https://github.com/predis/predis.git",
- "reference": "c5b60884e89630f9518a7919f0566db438f0fc9a"
+ "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/predis/predis/zipball/c5b60884e89630f9518a7919f0566db438f0fc9a",
- "reference": "c5b60884e89630f9518a7919f0566db438f0fc9a",
+ "url": "https://api.github.com/repos/predis/predis/zipball/b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
+ "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
+ "friendsofphp/php-cs-fixer": "^3.3",
+ "phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^8.0 || ~9.4.4"
},
"suggest": {
- "ext-curl": "Allows access to Webdis when paired with phpiredis"
+ "ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.0-dev"
- }
- },
"autoload": {
"psr-4": {
"Predis\\": "src/"
@@ -3781,12 +3550,6 @@
"name": "Till Krüss",
"homepage": "https://till.im",
"role": "Maintainer"
- },
- {
- "name": "Daniele Alessandri",
- "email": "suppakilla@gmail.com",
- "homepage": "http://clorophilla.net",
- "role": "Creator"
}
],
"description": "A flexible and feature-complete Redis client for PHP.",
@@ -3798,7 +3561,7 @@
],
"support": {
"issues": "https://github.com/predis/predis/issues",
- "source": "https://github.com/predis/predis/tree/v2.1.1"
+ "source": "https://github.com/predis/predis/tree/v2.2.2"
},
"funding": [
{
@@ -3806,30 +3569,30 @@
"type": "github"
}
],
- "time": "2023-01-17T20:57:35+00:00"
+ "time": "2023-09-13T16:42:03+00:00"
},
{
"name": "prologue/alerts",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/prologuephp/alerts.git",
- "reference": "33e86d1f64dae7a8d6e29e7d6c282abc77a89b97"
+ "reference": "00c4662ce50a633c39d3424698baa5cbfb880da3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/prologuephp/alerts/zipball/33e86d1f64dae7a8d6e29e7d6c282abc77a89b97",
- "reference": "33e86d1f64dae7a8d6e29e7d6c282abc77a89b97",
+ "url": "https://api.github.com/repos/prologuephp/alerts/zipball/00c4662ce50a633c39d3424698baa5cbfb880da3",
+ "reference": "00c4662ce50a633c39d3424698baa5cbfb880da3",
"shasum": ""
},
"require": {
- "illuminate/config": "~9|^10",
- "illuminate/session": "~9|^10",
- "illuminate/support": "~9|^10"
+ "illuminate/config": "~9|^10|^11.0",
+ "illuminate/session": "~9|^10|^11.0",
+ "illuminate/support": "~9|^10|^11.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
- "phpunit/phpunit": "^9"
+ "phpunit/phpunit": "^9|^10.5"
},
"type": "library",
"extra": {
@@ -3873,9 +3636,9 @@
],
"support": {
"issues": "https://github.com/prologuephp/alerts/issues",
- "source": "https://github.com/prologuephp/alerts/tree/1.1.0"
+ "source": "https://github.com/prologuephp/alerts/tree/1.2.0"
},
- "time": "2023-02-01T06:54:14+00:00"
+ "time": "2024-03-12T11:23:19+00:00"
},
{
"name": "psr/cache",
@@ -4079,21 +3842,21 @@
},
{
"name": "psr/http-client",
- "version": "1.0.1",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
- "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
"php": "^7.0 || ^8.0",
- "psr/http-message": "^1.0"
+ "psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
@@ -4113,7 +3876,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP clients",
@@ -4125,27 +3888,27 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/master"
+ "source": "https://github.com/php-fig/http-client"
},
- "time": "2020-06-29T06:28:15+00:00"
+ "time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
- "version": "1.0.1",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
- "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
- "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+ "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
"shasum": ""
},
"require": {
- "php": ">=7.0.0",
- "psr/http-message": "^1.0"
+ "php": ">=7.1",
+ "psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
@@ -4165,10 +3928,10 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
- "description": "Common interfaces for PSR-7 HTTP message factories",
+ "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
"keywords": [
"factory",
"http",
@@ -4180,31 +3943,31 @@
"response"
],
"support": {
- "source": "https://github.com/php-fig/http-factory/tree/master"
+ "source": "https://github.com/php-fig/http-factory"
},
- "time": "2019-04-30T12:38:16+00:00"
+ "time": "2024-04-15T12:06:14+00:00"
},
{
"name": "psr/http-message",
- "version": "1.0.1",
+ "version": "2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -4219,7 +3982,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
@@ -4233,22 +3996,22 @@
"response"
],
"support": {
- "source": "https://github.com/php-fig/http-message/tree/master"
+ "source": "https://github.com/php-fig/http-message/tree/2.0"
},
- "time": "2016-08-06T14:39:51+00:00"
+ "time": "2023-04-04T09:54:51+00:00"
},
{
"name": "psr/log",
- "version": "3.0.0",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
"shasum": ""
},
"require": {
@@ -4283,9 +4046,9 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/3.0.0"
+ "source": "https://github.com/php-fig/log/tree/3.0.2"
},
- "time": "2021-07-14T16:46:02+00:00"
+ "time": "2024-09-11T13:17:53+00:00"
},
{
"name": "psr/simple-cache",
@@ -4340,25 +4103,25 @@
},
{
"name": "psy/psysh",
- "version": "v0.11.12",
+ "version": "v0.12.4",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7"
+ "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/52cb7c47d403c31c0adc9bf7710fc355f93c20f7",
- "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
+ "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-tokenizer": "*",
- "nikic/php-parser": "^4.0 || ^3.1",
- "php": "^8.0 || ^7.0.8",
- "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4",
- "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4"
+ "nikic/php-parser": "^5.0 || ^4.0",
+ "php": "^8.0 || ^7.4",
+ "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4",
+ "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4"
},
"conflict": {
"symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
@@ -4369,8 +4132,7 @@
"suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
"ext-pdo-sqlite": "The doc command requires SQLite to work.",
- "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
- "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+ "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well."
},
"bin": [
"bin/psysh"
@@ -4378,7 +4140,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "0.11.x-dev"
+ "dev-main": "0.12.x-dev"
+ },
+ "bamarni-bin": {
+ "bin-links": false,
+ "forward-command": false
}
},
"autoload": {
@@ -4410,9 +4176,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.11.12"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
},
- "time": "2023-01-29T21:24:40+00:00"
+ "time": "2024-06-10T01:18:23+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -4549,20 +4315,20 @@
},
{
"name": "ramsey/uuid",
- "version": "4.7.3",
+ "version": "4.7.6",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "433b2014e3979047db08a17a205f410ba3869cf2"
+ "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2",
- "reference": "433b2014e3979047db08a17a205f410ba3869cf2",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+ "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
"shasum": ""
},
"require": {
- "brick/math": "^0.8.8 || ^0.9 || ^0.10",
+ "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
"ext-json": "*",
"php": "^8.0",
"ramsey/collection": "^1.2 || ^2.0"
@@ -4625,7 +4391,7 @@
],
"support": {
"issues": "https://github.com/ramsey/uuid/issues",
- "source": "https://github.com/ramsey/uuid/tree/4.7.3"
+ "source": "https://github.com/ramsey/uuid/tree/4.7.6"
},
"funding": [
{
@@ -4637,7 +4403,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-12T18:13:24+00:00"
+ "time": "2024-04-27T21:32:50+00:00"
},
{
"name": "s1lentium/iptools",
@@ -4757,31 +4523,31 @@
},
{
"name": "spatie/laravel-fractal",
- "version": "6.0.3",
+ "version": "6.2.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-fractal.git",
- "reference": "28ea9803d2cba7a7144336a2ba62275316c122c8"
+ "reference": "0a30630d2ab49590af118172c03c99c0d838dab1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/28ea9803d2cba7a7144336a2ba62275316c122c8",
- "reference": "28ea9803d2cba7a7144336a2ba62275316c122c8",
+ "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/0a30630d2ab49590af118172c03c99c0d838dab1",
+ "reference": "0a30630d2ab49590af118172c03c99c0d838dab1",
"shasum": ""
},
"require": {
- "illuminate/contracts": "^8.0|^9.0|^10.0",
- "illuminate/support": "^8.0|^9.0|^10.0",
+ "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
+ "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
"league/fractal": "^0.20.1|^0.20",
- "nesbot/carbon": "^2.63",
+ "nesbot/carbon": "^2.63|^3.0",
"php": "^8.0",
"spatie/fractalistic": "^2.9.5|^2.9",
"spatie/laravel-package-tools": "^1.11"
},
"require-dev": {
"ext-json": "*",
- "orchestra/testbench": "^7.0|^8.0",
- "pestphp/pest": "^1.22"
+ "orchestra/testbench": "^7.0|^8.0|^9.0",
+ "pestphp/pest": "^1.22|^2.34"
},
"type": "library",
"extra": {
@@ -4826,7 +4592,7 @@
"transform"
],
"support": {
- "source": "https://github.com/spatie/laravel-fractal/tree/6.0.3"
+ "source": "https://github.com/spatie/laravel-fractal/tree/6.2.1"
},
"funding": [
{
@@ -4834,24 +4600,24 @@
"type": "custom"
}
],
- "time": "2023-01-30T22:11:18+00:00"
+ "time": "2024-06-04T09:33:08+00:00"
},
{
"name": "spatie/laravel-package-tools",
- "version": "1.14.1",
+ "version": "1.16.5",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-package-tools.git",
- "reference": "b477dd2f89d0751f0e51ffb3a70181f0bc7ab8df"
+ "reference": "c7413972cf22ffdff97b68499c22baa04eddb6a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/b477dd2f89d0751f0e51ffb3a70181f0bc7ab8df",
- "reference": "b477dd2f89d0751f0e51ffb3a70181f0bc7ab8df",
+ "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/c7413972cf22ffdff97b68499c22baa04eddb6a2",
+ "reference": "c7413972cf22ffdff97b68499c22baa04eddb6a2",
"shasum": ""
},
"require": {
- "illuminate/contracts": "^9.28|^10.0",
+ "illuminate/contracts": "^9.28|^10.0|^11.0",
"php": "^8.0"
},
"require-dev": {
@@ -4886,7 +4652,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-package-tools/issues",
- "source": "https://github.com/spatie/laravel-package-tools/tree/1.14.1"
+ "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.5"
},
"funding": [
{
@@ -4894,35 +4660,37 @@
"type": "github"
}
],
- "time": "2023-01-27T15:33:45+00:00"
+ "time": "2024-08-27T18:56:10+00:00"
},
{
"name": "spatie/laravel-query-builder",
- "version": "5.1.2",
+ "version": "6.2.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-query-builder.git",
- "reference": "5908f58fdff70fb600982b58c187e84855e2b5bc"
+ "reference": "64f0453f4dea6a6fabf1ce4ddbb553e14da67bb6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/5908f58fdff70fb600982b58c187e84855e2b5bc",
- "reference": "5908f58fdff70fb600982b58c187e84855e2b5bc",
+ "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/64f0453f4dea6a6fabf1ce4ddbb553e14da67bb6",
+ "reference": "64f0453f4dea6a6fabf1ce4ddbb553e14da67bb6",
"shasum": ""
},
"require": {
- "illuminate/database": "^9.0|^10.0",
- "illuminate/http": "^9.0|^10.0",
- "illuminate/support": "^9.0|^10.0",
- "php": "^8.0",
+ "illuminate/database": "^10.0|^11.0",
+ "illuminate/http": "^10.0|^11.0",
+ "illuminate/support": "^10.0|^11.0",
+ "php": "^8.2",
"spatie/laravel-package-tools": "^1.11"
},
"require-dev": {
"ext-json": "*",
"mockery/mockery": "^1.4",
+ "nunomaduro/larastan": "^2.0",
"orchestra/testbench": "^7.0|^8.0",
- "pestphp/pest": "^1.20",
- "spatie/laravel-ray": "^1.28"
+ "pestphp/pest": "^2.0",
+ "phpunit/phpunit": "^10.0",
+ "spatie/invade": "^2.0"
},
"type": "library",
"extra": {
@@ -4966,33 +4734,44 @@
"type": "custom"
}
],
- "time": "2023-01-24T23:33:10+00:00"
+ "time": "2024-10-03T11:10:10+00:00"
},
{
"name": "staudenmeir/belongs-to-through",
- "version": "v2.13",
+ "version": "v2.16.2",
"source": {
"type": "git",
"url": "https://github.com/staudenmeir/belongs-to-through.git",
- "reference": "e777027d648971c9686f9d7c284f324db7cce3c0"
+ "reference": "a5e352df3d26abe34d715c6e192e537927cfb88d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/staudenmeir/belongs-to-through/zipball/e777027d648971c9686f9d7c284f324db7cce3c0",
- "reference": "e777027d648971c9686f9d7c284f324db7cce3c0",
+ "url": "https://api.github.com/repos/staudenmeir/belongs-to-through/zipball/a5e352df3d26abe34d715c6e192e537927cfb88d",
+ "reference": "a5e352df3d26abe34d715c6e192e537927cfb88d",
"shasum": ""
},
"require": {
- "illuminate/database": "^10.0",
- "php": "^8.1"
+ "illuminate/database": "^11.0",
+ "php": "^8.2"
},
"require-dev": {
- "phpunit/phpunit": "^9.5.27"
+ "barryvdh/laravel-ide-helper": "^3.0",
+ "larastan/larastan": "^2.9",
+ "orchestra/testbench": "^9.0",
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Staudenmeir\\BelongsToThrough\\IdeHelperServiceProvider"
+ ]
+ }
+ },
"autoload": {
"psr-4": {
- "Znck\\Eloquent\\": "src/"
+ "Znck\\Eloquent\\": "src/",
+ "Staudenmeir\\BelongsToThrough\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -5012,7 +4791,7 @@
"description": "Laravel Eloquent BelongsToThrough relationships",
"support": {
"issues": "https://github.com/staudenmeir/belongs-to-through/issues",
- "source": "https://github.com/staudenmeir/belongs-to-through/tree/v2.13"
+ "source": "https://github.com/staudenmeir/belongs-to-through/tree/v2.16.2"
},
"funding": [
{
@@ -5020,58 +4799,37 @@
"type": "custom"
}
],
- "time": "2023-01-18T12:40:35+00:00"
+ "time": "2024-11-06T19:48:19+00:00"
},
{
- "name": "symfony/console",
- "version": "v6.2.5",
+ "name": "symfony/clock",
+ "version": "v7.1.6",
"source": {
"type": "git",
- "url": "https://github.com/symfony/console.git",
- "reference": "3e294254f2191762c1d137aed4b94e966965e985"
+ "url": "https://github.com/symfony/clock.git",
+ "reference": "97bebc53548684c17ed696bc8af016880f0f098d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/3e294254f2191762c1d137aed4b94e966965e985",
- "reference": "3e294254f2191762c1d137aed4b94e966965e985",
+ "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d",
+ "reference": "97bebc53548684c17ed696bc8af016880f0f098d",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/service-contracts": "^1.1|^2|^3",
- "symfony/string": "^5.4|^6.0"
- },
- "conflict": {
- "symfony/dependency-injection": "<5.4",
- "symfony/dotenv": "<5.4",
- "symfony/event-dispatcher": "<5.4",
- "symfony/lock": "<5.4",
- "symfony/process": "<5.4"
+ "php": ">=8.2",
+ "psr/clock": "^1.0",
+ "symfony/polyfill-php83": "^1.28"
},
"provide": {
- "psr/log-implementation": "1.0|2.0|3.0"
- },
- "require-dev": {
- "psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/lock": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/var-dumper": "^5.4|^6.0"
- },
- "suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/lock": "",
- "symfony/process": ""
+ "psr/clock-implementation": "1.0"
},
"type": "library",
"autoload": {
+ "files": [
+ "Resources/now.php"
+ ],
"psr-4": {
- "Symfony\\Component\\Console\\": ""
+ "Symfony\\Component\\Clock\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -5083,24 +4841,23 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Eases the creation of beautiful and testable command line interfaces",
+ "description": "Decouples applications from the system clock",
"homepage": "https://symfony.com",
"keywords": [
- "cli",
- "command line",
- "console",
- "terminal"
+ "clock",
+ "psr20",
+ "time"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.2.5"
+ "source": "https://github.com/symfony/clock/tree/v7.1.6"
},
"funding": [
{
@@ -5116,29 +4873,55 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
- "name": "symfony/css-selector",
- "version": "v6.2.5",
+ "name": "symfony/console",
+ "version": "v7.1.8",
"source": {
"type": "git",
- "url": "https://github.com/symfony/css-selector.git",
- "reference": "bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1"
+ "url": "https://github.com/symfony/console.git",
+ "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1",
- "reference": "bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1",
+ "url": "https://api.github.com/repos/symfony/console/zipball/ff04e5b5ba043d2badfb308197b9e6b42883fcd5",
+ "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2",
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/service-contracts": "^2.5|^3",
+ "symfony/string": "^6.4|^7.0"
+ },
+ "conflict": {
+ "symfony/dependency-injection": "<6.4",
+ "symfony/dotenv": "<6.4",
+ "symfony/event-dispatcher": "<6.4",
+ "symfony/lock": "<6.4",
+ "symfony/process": "<6.4"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0|2.0|3.0"
+ },
+ "require-dev": {
+ "psr/log": "^1|^2|^3",
+ "symfony/config": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/event-dispatcher": "^6.4|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/lock": "^6.4|^7.0",
+ "symfony/messenger": "^6.4|^7.0",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/stopwatch": "^6.4|^7.0",
+ "symfony/var-dumper": "^6.4|^7.0"
},
"type": "library",
"autoload": {
"psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
+ "Symfony\\Component\\Console\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -5153,19 +4936,21 @@
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
- {
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Converts CSS selectors to XPath expressions",
+ "description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
+ "keywords": [
+ "cli",
+ "command-line",
+ "console",
+ "terminal"
+ ],
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v6.2.5"
+ "source": "https://github.com/symfony/console/tree/v7.1.8"
},
"funding": [
{
@@ -5181,20 +4966,85 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-11-06T14:23:19+00:00"
},
{
- "name": "symfony/deprecation-contracts",
- "version": "v3.2.0",
+ "name": "symfony/css-selector",
+ "version": "v7.1.6",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/4aa4f6b3d6749c14d3aa815eef8226632e7bbc66",
+ "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\CssSelector\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Converts CSS selectors to XPath expressions",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/css-selector/tree/v7.1.6"
+ },
+ "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": "2024-09-25T14:20:29+00:00"
+ },
+ {
+ "name": "symfony/deprecation-contracts",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
+ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
- "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"shasum": ""
},
"require": {
@@ -5203,7 +5053,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5232,7 +5082,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -5248,31 +5098,35 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/error-handler",
- "version": "v6.2.5",
+ "version": "v7.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "0092696af0be8e6124b042fbe2890ca1788d7b28"
+ "reference": "010e44661f4c6babaf8c4862fe68c24a53903342"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/0092696af0be8e6124b042fbe2890ca1788d7b28",
- "reference": "0092696af0be8e6124b042fbe2890ca1788d7b28",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/010e44661f4c6babaf8c4862fe68c24a53903342",
+ "reference": "010e44661f4c6babaf8c4862fe68c24a53903342",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"psr/log": "^1|^2|^3",
- "symfony/var-dumper": "^5.4|^6.0"
+ "symfony/var-dumper": "^6.4|^7.0"
+ },
+ "conflict": {
+ "symfony/deprecation-contracts": "<2.5",
+ "symfony/http-kernel": "<6.4"
},
"require-dev": {
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/serializer": "^5.4|^6.0"
+ "symfony/deprecation-contracts": "^2.5|^3",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/serializer": "^6.4|^7.0"
},
"bin": [
"Resources/bin/patch-type-declarations"
@@ -5303,7 +5157,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v6.2.5"
+ "source": "https://github.com/symfony/error-handler/tree/v7.1.7"
},
"funding": [
{
@@ -5319,28 +5173,29 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-11-05T15:34:55+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68"
+ "reference": "87254c78dd50721cfd015b62277a8281c5589702"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
- "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702",
+ "reference": "87254c78dd50721cfd015b62277a8281c5589702",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/event-dispatcher-contracts": "^2|^3"
+ "php": ">=8.2",
+ "symfony/event-dispatcher-contracts": "^2.5|^3"
},
"conflict": {
- "symfony/dependency-injection": "<5.4"
+ "symfony/dependency-injection": "<6.4",
+ "symfony/service-contracts": "<2.5"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
@@ -5348,17 +5203,13 @@
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
- "symfony/service-contracts": "^1.1|^2|^3",
- "symfony/stopwatch": "^5.4|^6.0"
- },
- "suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "symfony/config": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/error-handler": "^6.4|^7.0",
+ "symfony/expression-language": "^6.4|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
+ "symfony/service-contracts": "^2.5|^3",
+ "symfony/stopwatch": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5386,7 +5237,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.5"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6"
},
"funding": [
{
@@ -5402,33 +5253,30 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v3.2.0",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "0782b0b52a737a05b4383d0df35a474303cabdae"
+ "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae",
- "reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
+ "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
"shasum": ""
},
"require": {
"php": ">=8.1",
"psr/event-dispatcher": "^1"
},
- "suggest": {
- "symfony/event-dispatcher-implementation": ""
- },
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5465,7 +5313,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -5481,27 +5329,27 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/finder",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c"
+ "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/c90dc446976a612e3312a97a6ec0069ab0c2099c",
- "reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8",
+ "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "symfony/filesystem": "^6.0"
+ "symfony/filesystem": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5529,7 +5377,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.2.5"
+ "source": "https://github.com/symfony/finder/tree/v7.1.6"
},
"funding": [
{
@@ -5545,28 +5393,32 @@
"type": "tidelift"
}
],
- "time": "2023-01-20T17:45:48+00:00"
+ "time": "2024-10-01T08:31:23+00:00"
},
{
"name": "symfony/http-client",
- "version": "v6.2.6",
+ "version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
- "reference": "6efa9a7521ab7d031a82cf0a759484d1b02a6ad9"
+ "reference": "c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client/zipball/6efa9a7521ab7d031a82cf0a759484d1b02a6ad9",
- "reference": "6efa9a7521ab7d031a82cf0a759484d1b02a6ad9",
+ "url": "https://api.github.com/repos/symfony/http-client/zipball/c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a",
+ "reference": "c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"psr/log": "^1|^2|^3",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/http-client-contracts": "^3",
- "symfony/service-contracts": "^1.0|^2|^3"
+ "symfony/deprecation-contracts": "^2.5|^3",
+ "symfony/http-client-contracts": "^3.4.1",
+ "symfony/service-contracts": "^2.5|^3"
+ },
+ "conflict": {
+ "php-http/discovery": "<1.15",
+ "symfony/http-foundation": "<6.4"
},
"provide": {
"php-http/async-client-implementation": "*",
@@ -5579,14 +5431,16 @@
"amphp/http-client": "^4.2.1",
"amphp/http-tunnel": "^1.0",
"amphp/socket": "^1.1",
- "guzzlehttp/promises": "^1.4",
+ "guzzlehttp/promises": "^1.4|^2.0",
"nyholm/psr7": "^1.0",
"php-http/httplug": "^1.0|^2.0",
"psr/http-client": "^1.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/stopwatch": "^5.4|^6.0"
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/messenger": "^6.4|^7.0",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/rate-limiter": "^6.4|^7.0",
+ "symfony/stopwatch": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5613,8 +5467,11 @@
],
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
+ "keywords": [
+ "http"
+ ],
"support": {
- "source": "https://github.com/symfony/http-client/tree/v6.2.6"
+ "source": "https://github.com/symfony/http-client/tree/v7.1.8"
},
"funding": [
{
@@ -5630,32 +5487,29 @@
"type": "tidelift"
}
],
- "time": "2023-01-30T15:46:28+00:00"
+ "time": "2024-11-13T13:40:27+00:00"
},
{
"name": "symfony/http-client-contracts",
- "version": "v3.2.0",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
- "reference": "c5f587eb445224ddfeb05b5ee703476742d730bf"
+ "reference": "20414d96f391677bf80078aa55baece78b82647d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/c5f587eb445224ddfeb05b5ee703476742d730bf",
- "reference": "c5f587eb445224ddfeb05b5ee703476742d730bf",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d",
+ "reference": "20414d96f391677bf80078aa55baece78b82647d",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
- "suggest": {
- "symfony/http-client-implementation": ""
- },
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5695,7 +5549,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/http-client-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -5711,41 +5565,40 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v6.2.6",
+ "version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "e8dd1f502bc2b3371d05092aa233b064b03ce7ed"
+ "reference": "f4419ec69ccfc3f725a4de7c20e4e57626d10112"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8dd1f502bc2b3371d05092aa233b064b03ce7ed",
- "reference": "e8dd1f502bc2b3371d05092aa233b064b03ce7ed",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4419ec69ccfc3f725a4de7c20e4e57626d10112",
+ "reference": "f4419ec69ccfc3f725a4de7c20e4e57626d10112",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-mbstring": "~1.1"
+ "php": ">=8.2",
+ "symfony/polyfill-mbstring": "~1.1",
+ "symfony/polyfill-php83": "^1.27"
},
"conflict": {
- "symfony/cache": "<6.2"
+ "doctrine/dbal": "<3.6",
+ "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
},
"require-dev": {
- "predis/predis": "~1.0",
- "symfony/cache": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
- "symfony/mime": "^5.4|^6.0",
- "symfony/rate-limiter": "^5.2|^6.0"
- },
- "suggest": {
- "symfony/mime": "To use the file extension guesser"
+ "doctrine/dbal": "^3.6|^4",
+ "predis/predis": "^1.1|^2.0",
+ "symfony/cache": "^6.4.12|^7.1.5",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/expression-language": "^6.4|^7.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/mime": "^6.4|^7.0",
+ "symfony/rate-limiter": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5773,7 +5626,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v6.2.6"
+ "source": "https://github.com/symfony/http-foundation/tree/v7.1.8"
},
"funding": [
{
@@ -5789,74 +5642,77 @@
"type": "tidelift"
}
],
- "time": "2023-01-30T15:46:28+00:00"
+ "time": "2024-11-09T09:16:45+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.2.6",
+ "version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "7122db07b0d8dbf0de682267c84217573aee3ea7"
+ "reference": "33fef24e3dc79d6d30bf4936531f2f4bd2ca189e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7122db07b0d8dbf0de682267c84217573aee3ea7",
- "reference": "7122db07b0d8dbf0de682267c84217573aee3ea7",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33fef24e3dc79d6d30bf4936531f2f4bd2ca189e",
+ "reference": "33fef24e3dc79d6d30bf4936531f2f4bd2ca189e",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"psr/log": "^1|^2|^3",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/error-handler": "^6.1",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
+ "symfony/deprecation-contracts": "^2.5|^3",
+ "symfony/error-handler": "^6.4|^7.0",
+ "symfony/event-dispatcher": "^6.4|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
- "symfony/browser-kit": "<5.4",
- "symfony/cache": "<5.4",
- "symfony/config": "<6.1",
- "symfony/console": "<5.4",
- "symfony/dependency-injection": "<6.2",
- "symfony/doctrine-bridge": "<5.4",
- "symfony/form": "<5.4",
- "symfony/http-client": "<5.4",
- "symfony/mailer": "<5.4",
- "symfony/messenger": "<5.4",
- "symfony/translation": "<5.4",
- "symfony/twig-bridge": "<5.4",
- "symfony/validator": "<5.4",
- "twig/twig": "<2.13"
+ "symfony/browser-kit": "<6.4",
+ "symfony/cache": "<6.4",
+ "symfony/config": "<6.4",
+ "symfony/console": "<6.4",
+ "symfony/dependency-injection": "<6.4",
+ "symfony/doctrine-bridge": "<6.4",
+ "symfony/form": "<6.4",
+ "symfony/http-client": "<6.4",
+ "symfony/http-client-contracts": "<2.5",
+ "symfony/mailer": "<6.4",
+ "symfony/messenger": "<6.4",
+ "symfony/translation": "<6.4",
+ "symfony/translation-contracts": "<2.5",
+ "symfony/twig-bridge": "<6.4",
+ "symfony/validator": "<6.4",
+ "symfony/var-dumper": "<6.4",
+ "twig/twig": "<3.0.4"
},
"provide": {
"psr/log-implementation": "1.0|2.0|3.0"
},
"require-dev": {
"psr/cache": "^1.0|^2.0|^3.0",
- "symfony/browser-kit": "^5.4|^6.0",
- "symfony/config": "^6.1",
- "symfony/console": "^5.4|^6.0",
- "symfony/css-selector": "^5.4|^6.0",
- "symfony/dependency-injection": "^6.2",
- "symfony/dom-crawler": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/finder": "^5.4|^6.0",
- "symfony/http-client-contracts": "^1.1|^2|^3",
- "symfony/process": "^5.4|^6.0",
- "symfony/routing": "^5.4|^6.0",
- "symfony/stopwatch": "^5.4|^6.0",
- "symfony/translation": "^5.4|^6.0",
- "symfony/translation-contracts": "^1.1|^2|^3",
- "symfony/uid": "^5.4|^6.0",
- "twig/twig": "^2.13|^3.0.4"
- },
- "suggest": {
- "symfony/browser-kit": "",
- "symfony/config": "",
- "symfony/console": "",
- "symfony/dependency-injection": ""
+ "symfony/browser-kit": "^6.4|^7.0",
+ "symfony/clock": "^6.4|^7.0",
+ "symfony/config": "^6.4|^7.0",
+ "symfony/console": "^6.4|^7.0",
+ "symfony/css-selector": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/dom-crawler": "^6.4|^7.0",
+ "symfony/expression-language": "^6.4|^7.0",
+ "symfony/finder": "^6.4|^7.0",
+ "symfony/http-client-contracts": "^2.5|^3",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/property-access": "^7.1",
+ "symfony/routing": "^6.4|^7.0",
+ "symfony/serializer": "^7.1",
+ "symfony/stopwatch": "^6.4|^7.0",
+ "symfony/translation": "^6.4|^7.0",
+ "symfony/translation-contracts": "^2.5|^3",
+ "symfony/uid": "^6.4|^7.0",
+ "symfony/validator": "^6.4|^7.0",
+ "symfony/var-dumper": "^6.4|^7.0",
+ "symfony/var-exporter": "^6.4|^7.0",
+ "twig/twig": "^3.0.4"
},
"type": "library",
"autoload": {
@@ -5884,7 +5740,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v6.2.6"
+ "source": "https://github.com/symfony/http-kernel/tree/v7.1.8"
},
"funding": [
{
@@ -5900,42 +5756,43 @@
"type": "tidelift"
}
],
- "time": "2023-02-01T08:32:25+00:00"
+ "time": "2024-11-13T14:25:32+00:00"
},
{
"name": "symfony/mailer",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
- "reference": "29729ac0b4e5113f24c39c46746bd6afb79e0aaa"
+ "reference": "69c9948451fb3a6a4d47dc8261d1794734e76cdd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mailer/zipball/29729ac0b4e5113f24c39c46746bd6afb79e0aaa",
- "reference": "29729ac0b4e5113f24c39c46746bd6afb79e0aaa",
+ "url": "https://api.github.com/repos/symfony/mailer/zipball/69c9948451fb3a6a4d47dc8261d1794734e76cdd",
+ "reference": "69c9948451fb3a6a4d47dc8261d1794734e76cdd",
"shasum": ""
},
"require": {
"egulias/email-validator": "^2.1.10|^3|^4",
- "php": ">=8.1",
+ "php": ">=8.2",
"psr/event-dispatcher": "^1",
"psr/log": "^1|^2|^3",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/mime": "^6.2",
- "symfony/service-contracts": "^1.1|^2|^3"
+ "symfony/event-dispatcher": "^6.4|^7.0",
+ "symfony/mime": "^6.4|^7.0",
+ "symfony/service-contracts": "^2.5|^3"
},
"conflict": {
- "symfony/http-kernel": "<5.4",
- "symfony/messenger": "<6.2",
- "symfony/mime": "<6.2",
- "symfony/twig-bridge": "<6.2.1"
+ "symfony/http-client-contracts": "<2.5",
+ "symfony/http-kernel": "<6.4",
+ "symfony/messenger": "<6.4",
+ "symfony/mime": "<6.4",
+ "symfony/twig-bridge": "<6.4"
},
"require-dev": {
- "symfony/console": "^5.4|^6.0",
- "symfony/http-client-contracts": "^1.1|^2|^3",
- "symfony/messenger": "^6.2",
- "symfony/twig-bridge": "^6.2"
+ "symfony/console": "^6.4|^7.0",
+ "symfony/http-client": "^6.4|^7.0",
+ "symfony/messenger": "^6.4|^7.0",
+ "symfony/twig-bridge": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5963,7 +5820,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/mailer/tree/v6.2.5"
+ "source": "https://github.com/symfony/mailer/tree/v7.1.6"
},
"funding": [
{
@@ -5979,28 +5836,32 @@
"type": "tidelift"
}
],
- "time": "2023-01-10T18:53:53+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/mailgun-mailer",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailgun-mailer.git",
- "reference": "d1eb7283e30752f2802ced37bffdee2c67cad42a"
+ "reference": "b0117bf42b6dd8dfcfcab2a7e18508b594520b5a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/d1eb7283e30752f2802ced37bffdee2c67cad42a",
- "reference": "d1eb7283e30752f2802ced37bffdee2c67cad42a",
+ "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/b0117bf42b6dd8dfcfcab2a7e18508b594520b5a",
+ "reference": "b0117bf42b6dd8dfcfcab2a7e18508b594520b5a",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/mailer": "^5.4|^6.0"
+ "php": ">=8.2",
+ "symfony/mailer": "^6.4|^7.0"
+ },
+ "conflict": {
+ "symfony/http-foundation": "<6.4"
},
"require-dev": {
- "symfony/http-client": "^5.4|^6.0"
+ "symfony/http-client": "^6.4|^7.0",
+ "symfony/webhook": "^6.4|^7.0"
},
"type": "symfony-mailer-bridge",
"autoload": {
@@ -6028,7 +5889,7 @@
"description": "Symfony Mailgun Mailer Bridge",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/mailgun-mailer/tree/v6.2.5"
+ "source": "https://github.com/symfony/mailgun-mailer/tree/v7.1.6"
},
"funding": [
{
@@ -6044,24 +5905,24 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/mime",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "4b7b349f67d15cd0639955c8179a76c89f6fd610"
+ "reference": "caa1e521edb2650b8470918dfe51708c237f0598"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/4b7b349f67d15cd0639955c8179a76c89f6fd610",
- "reference": "4b7b349f67d15cd0639955c8179a76c89f6fd610",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/caa1e521edb2650b8470918dfe51708c237f0598",
+ "reference": "caa1e521edb2650b8470918dfe51708c237f0598",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0"
},
@@ -6069,17 +5930,18 @@
"egulias/email-validator": "~3.0.0",
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
- "symfony/mailer": "<5.4",
- "symfony/serializer": "<6.2"
+ "symfony/mailer": "<6.4",
+ "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
},
"require-dev": {
"egulias/email-validator": "^2.1.10|^3.1|^4",
"league/html-to-markdown": "^5.0",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/property-access": "^5.4|^6.0",
- "symfony/property-info": "^5.4|^6.0",
- "symfony/serializer": "^6.2"
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/property-access": "^6.4|^7.0",
+ "symfony/property-info": "^6.4|^7.0",
+ "symfony/serializer": "^6.4.3|^7.0.3"
},
"type": "library",
"autoload": {
@@ -6111,7 +5973,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v6.2.5"
+ "source": "https://github.com/symfony/mime/tree/v7.1.6"
},
"funding": [
{
@@ -6127,24 +5989,24 @@
"type": "tidelift"
}
],
- "time": "2023-01-10T18:53:53+00:00"
+ "time": "2024-10-25T15:11:02+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
- "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -6154,9 +6016,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6193,7 +6052,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
},
"funding": [
{
@@ -6209,33 +6068,30 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
- "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6274,7 +6130,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
},
"funding": [
{
@@ -6290,35 +6146,31 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
+ "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
- "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+ "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
"shasum": ""
},
"require": {
- "php": ">=7.1",
- "symfony/polyfill-intl-normalizer": "^1.10",
- "symfony/polyfill-php72": "^1.10"
+ "php": ">=7.2",
+ "symfony/polyfill-intl-normalizer": "^1.10"
},
"suggest": {
"ext-intl": "For best performance"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6361,7 +6213,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
},
"funding": [
{
@@ -6377,33 +6229,30 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
- "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6445,7 +6294,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
},
"funding": [
{
@@ -6461,24 +6310,24 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
- "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -6488,9 +6337,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6528,7 +6374,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -6544,30 +6390,27 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
- "name": "symfony/polyfill-php72",
- "version": "v1.27.0",
+ "name": "symfony/polyfill-php80",
+ "version": "v1.31.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
+ "url": "https://github.com/symfony/polyfill-php80.git",
+ "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
- "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+ "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6578,14 +6421,21 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- }
+ "Symfony\\Polyfill\\Php80\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Ion Bazan",
+ "email": "ion.bazan@gmail.com"
+ },
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
@@ -6595,7 +6445,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+ "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
@@ -6604,7 +6454,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
},
"funding": [
{
@@ -6620,30 +6470,27 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
- "name": "symfony/polyfill-php80",
- "version": "v1.27.0",
+ "name": "symfony/polyfill-php83",
+ "version": "v1.31.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+ "url": "https://github.com/symfony/polyfill-php83.git",
+ "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
- "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+ "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+ "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6654,7 +6501,7 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Php80\\": ""
+ "Symfony\\Polyfill\\Php83\\": ""
},
"classmap": [
"Resources/stubs"
@@ -6665,10 +6512,6 @@
"MIT"
],
"authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
@@ -6678,7 +6521,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+ "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
@@ -6687,7 +6530,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
},
"funding": [
{
@@ -6703,24 +6546,24 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-uuid",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-uuid.git",
- "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166"
+ "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166",
- "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166",
+ "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+ "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-uuid": "*"
@@ -6730,9 +6573,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6769,7 +6609,7 @@
"uuid"
],
"support": {
- "source": "https://github.com/symfony/polyfill-uuid/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
},
"funding": [
{
@@ -6785,28 +6625,33 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/postmark-mailer",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/postmark-mailer.git",
- "reference": "b6630e287f94fbc1f0f0a20a3a147a69ac8f862b"
+ "reference": "91c86a65dec04bc8313094087671486eac6ed3c1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/postmark-mailer/zipball/b6630e287f94fbc1f0f0a20a3a147a69ac8f862b",
- "reference": "b6630e287f94fbc1f0f0a20a3a147a69ac8f862b",
+ "url": "https://api.github.com/repos/symfony/postmark-mailer/zipball/91c86a65dec04bc8313094087671486eac6ed3c1",
+ "reference": "91c86a65dec04bc8313094087671486eac6ed3c1",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/mailer": "^5.4|^6.0"
+ "php": ">=8.2",
+ "psr/event-dispatcher": "^1",
+ "symfony/mailer": "^6.4|^7.0"
+ },
+ "conflict": {
+ "symfony/http-foundation": "<6.4"
},
"require-dev": {
- "symfony/http-client": "^5.4|^6.0"
+ "symfony/http-client": "^6.4|^7.0",
+ "symfony/webhook": "^6.4|^7.0"
},
"type": "symfony-mailer-bridge",
"autoload": {
@@ -6834,7 +6679,7 @@
"description": "Symfony Postmark Mailer Bridge",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/postmark-mailer/tree/v6.2.5"
+ "source": "https://github.com/symfony/postmark-mailer/tree/v7.1.6"
},
"funding": [
{
@@ -6850,24 +6695,24 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:36:55+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/process",
- "version": "v6.2.5",
+ "version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7"
+ "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
- "reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
+ "url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892",
+ "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"type": "library",
"autoload": {
@@ -6895,7 +6740,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v6.2.5"
+ "source": "https://github.com/symfony/process/tree/v7.1.8"
},
"funding": [
{
@@ -6911,45 +6756,38 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-11-06T14:23:19+00:00"
},
{
"name": "symfony/routing",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "589bd742d5d03c192c8521911680fe88f61712fe"
+ "reference": "66a2c469f6c22d08603235c46a20007c0701ea0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/589bd742d5d03c192c8521911680fe88f61712fe",
- "reference": "589bd742d5d03c192c8521911680fe88f61712fe",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/66a2c469f6c22d08603235c46a20007c0701ea0a",
+ "reference": "66a2c469f6c22d08603235c46a20007c0701ea0a",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2",
+ "symfony/deprecation-contracts": "^2.5|^3"
},
"conflict": {
- "doctrine/annotations": "<1.12",
- "symfony/config": "<6.2",
- "symfony/dependency-injection": "<5.4",
- "symfony/yaml": "<5.4"
+ "symfony/config": "<6.4",
+ "symfony/dependency-injection": "<6.4",
+ "symfony/yaml": "<6.4"
},
"require-dev": {
- "doctrine/annotations": "^1.12|^2",
"psr/log": "^1|^2|^3",
- "symfony/config": "^6.2",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
- },
- "suggest": {
- "symfony/config": "For using the all-in-one router or any loader",
- "symfony/expression-language": "For using expression matching",
- "symfony/http-foundation": "For using a Symfony Request object",
- "symfony/yaml": "For using the YAML loader"
+ "symfony/config": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/expression-language": "^6.4|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
+ "symfony/yaml": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -6983,7 +6821,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v6.2.5"
+ "source": "https://github.com/symfony/routing/tree/v7.1.6"
},
"funding": [
{
@@ -6999,36 +6837,34 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-10-01T08:31:23+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v3.2.0",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75"
+ "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75",
- "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+ "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
"shasum": ""
},
"require": {
"php": ">=8.1",
- "psr/container": "^2.0"
+ "psr/container": "^1.1|^2.0",
+ "symfony/deprecation-contracts": "^2.5|^3"
},
"conflict": {
"ext-psr": "<1.1|>=2"
},
- "suggest": {
- "symfony/service-implementation": ""
- },
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7068,7 +6904,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -7084,38 +6920,39 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/string",
- "version": "v6.2.5",
+ "version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0"
+ "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
- "reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
+ "url": "https://api.github.com/repos/symfony/string/zipball/591ebd41565f356fcd8b090fe64dbb5878f50281",
+ "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-grapheme": "~1.0",
"symfony/polyfill-intl-normalizer": "~1.0",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "symfony/translation-contracts": "<2.0"
+ "symfony/translation-contracts": "<2.5"
},
"require-dev": {
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/http-client": "^5.4|^6.0",
- "symfony/intl": "^6.2",
- "symfony/translation-contracts": "^2.0|^3.0",
- "symfony/var-exporter": "^5.4|^6.0"
+ "symfony/emoji": "^7.1",
+ "symfony/error-handler": "^6.4|^7.0",
+ "symfony/http-client": "^6.4|^7.0",
+ "symfony/intl": "^6.4|^7.0",
+ "symfony/translation-contracts": "^2.5|^3.0",
+ "symfony/var-exporter": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -7154,7 +6991,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.2.5"
+ "source": "https://github.com/symfony/string/tree/v7.1.8"
},
"funding": [
{
@@ -7170,58 +7007,54 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-11-13T13:31:21+00:00"
},
{
"name": "symfony/translation",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "60556925a703cfbc1581cde3b3f35b0bb0ea904c"
+ "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/60556925a703cfbc1581cde3b3f35b0bb0ea904c",
- "reference": "60556925a703cfbc1581cde3b3f35b0bb0ea904c",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f",
+ "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-mbstring": "~1.0",
- "symfony/translation-contracts": "^2.3|^3.0"
+ "symfony/translation-contracts": "^2.5|^3.0"
},
"conflict": {
- "symfony/config": "<5.4",
- "symfony/console": "<5.4",
- "symfony/dependency-injection": "<5.4",
- "symfony/http-kernel": "<5.4",
- "symfony/twig-bundle": "<5.4",
- "symfony/yaml": "<5.4"
+ "symfony/config": "<6.4",
+ "symfony/console": "<6.4",
+ "symfony/dependency-injection": "<6.4",
+ "symfony/http-client-contracts": "<2.5",
+ "symfony/http-kernel": "<6.4",
+ "symfony/service-contracts": "<2.5",
+ "symfony/twig-bundle": "<6.4",
+ "symfony/yaml": "<6.4"
},
"provide": {
"symfony/translation-implementation": "2.3|3.0"
},
"require-dev": {
- "nikic/php-parser": "^4.13",
+ "nikic/php-parser": "^4.18|^5.0",
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/console": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/finder": "^5.4|^6.0",
- "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/intl": "^5.4|^6.0",
+ "symfony/config": "^6.4|^7.0",
+ "symfony/console": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/finder": "^6.4|^7.0",
+ "symfony/http-client-contracts": "^2.5|^3.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/intl": "^6.4|^7.0",
"symfony/polyfill-intl-icu": "^1.21",
- "symfony/routing": "^5.4|^6.0",
- "symfony/service-contracts": "^1.1.2|^2|^3",
- "symfony/yaml": "^5.4|^6.0"
- },
- "suggest": {
- "nikic/php-parser": "To use PhpAstExtractor",
- "psr/log-implementation": "To use logging capability in translator",
- "symfony/config": "",
- "symfony/yaml": ""
+ "symfony/routing": "^6.4|^7.0",
+ "symfony/service-contracts": "^2.5|^3",
+ "symfony/yaml": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -7252,7 +7085,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v6.2.5"
+ "source": "https://github.com/symfony/translation/tree/v7.1.6"
},
"funding": [
{
@@ -7268,32 +7101,29 @@
"type": "tidelift"
}
],
- "time": "2023-01-05T07:00:27+00:00"
+ "time": "2024-09-28T12:35:13+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v3.2.0",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "68cce71402305a015f8c1589bfada1280dc64fe7"
+ "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/68cce71402305a015f8c1589bfada1280dc64fe7",
- "reference": "68cce71402305a015f8c1589bfada1280dc64fe7",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+ "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
- "suggest": {
- "symfony/translation-implementation": ""
- },
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7333,7 +7163,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -7349,28 +7179,28 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/uid",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/uid.git",
- "reference": "8ace895bded57d6496638c9b2d3b788e05b7395b"
+ "reference": "65befb3bb2d503bbffbd08c815aa38b472999917"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/uid/zipball/8ace895bded57d6496638c9b2d3b788e05b7395b",
- "reference": "8ace895bded57d6496638c9b2d3b788e05b7395b",
+ "url": "https://api.github.com/repos/symfony/uid/zipball/65befb3bb2d503bbffbd08c815aa38b472999917",
+ "reference": "65befb3bb2d503bbffbd08c815aa38b472999917",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-uuid": "^1.15"
},
"require-dev": {
- "symfony/console": "^5.4|^6.0"
+ "symfony/console": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -7407,7 +7237,7 @@
"uuid"
],
"support": {
- "source": "https://github.com/symfony/uid/tree/v6.2.5"
+ "source": "https://github.com/symfony/uid/tree/v7.1.6"
},
"funding": [
{
@@ -7423,41 +7253,36 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.2.5",
+ "version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "44b7b81749fd20c1bdf4946c041050e22bc8da27"
+ "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/44b7b81749fd20c1bdf4946c041050e22bc8da27",
- "reference": "44b7b81749fd20c1bdf4946c041050e22bc8da27",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8",
+ "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
- "symfony/console": "<5.4"
+ "symfony/console": "<6.4"
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/uid": "^5.4|^6.0",
- "twig/twig": "^2.13|^3.0.4"
- },
- "suggest": {
- "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
- "ext-intl": "To show region name in time zone dump",
- "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
+ "symfony/console": "^6.4|^7.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/uid": "^6.4|^7.0",
+ "twig/twig": "^3.0.4"
},
"bin": [
"Resources/bin/var-dump-server"
@@ -7495,7 +7320,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.2.5"
+ "source": "https://github.com/symfony/var-dumper/tree/v7.1.8"
},
"funding": [
{
@@ -7511,34 +7336,31 @@
"type": "tidelift"
}
],
- "time": "2023-01-20T17:45:48+00:00"
+ "time": "2024-11-08T15:46:42+00:00"
},
{
"name": "symfony/yaml",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "2bbfbdacc8a15574f8440c4838ce0d7bb6c86b19"
+ "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/2bbfbdacc8a15574f8440c4838ce0d7bb6c86b19",
- "reference": "2bbfbdacc8a15574f8440c4838ce0d7bb6c86b19",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/3ced3f29e4f0d6bce2170ff26719f1fe9aacc671",
+ "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
- "symfony/console": "<5.4"
+ "symfony/console": "<6.4"
},
"require-dev": {
- "symfony/console": "^5.4|^6.0"
- },
- "suggest": {
- "symfony/console": "For validating YAML files using the lint command"
+ "symfony/console": "^6.4|^7.0"
},
"bin": [
"Resources/bin/yaml-lint"
@@ -7569,7 +7391,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.2.5"
+ "source": "https://github.com/symfony/yaml/tree/v7.1.6"
},
"funding": [
{
@@ -7585,27 +7407,27 @@
"type": "tidelift"
}
],
- "time": "2023-01-10T18:53:53+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
- "version": "2.2.6",
+ "version": "v2.2.7",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
- "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c"
+ "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c",
- "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c",
+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
+ "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^5.5 || ^7.0 || ^8.0",
- "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
+ "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
@@ -7636,37 +7458,37 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"support": {
"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
- "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6"
+ "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
},
- "time": "2023-01-03T09:29:04+00:00"
+ "time": "2023-12-08T13:03:43+00:00"
},
{
"name": "vlucas/phpdotenv",
- "version": "v5.5.0",
+ "version": "v5.6.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"
+ "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7",
- "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+ "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
"shasum": ""
},
"require": {
"ext-pcre": "*",
- "graham-campbell/result-type": "^1.0.2",
- "php": "^7.1.3 || ^8.0",
- "phpoption/phpoption": "^1.8",
- "symfony/polyfill-ctype": "^1.23",
- "symfony/polyfill-mbstring": "^1.23.1",
- "symfony/polyfill-php80": "^1.23.1"
+ "graham-campbell/result-type": "^1.1.3",
+ "php": "^7.2.5 || ^8.0",
+ "phpoption/phpoption": "^1.9.3",
+ "symfony/polyfill-ctype": "^1.24",
+ "symfony/polyfill-mbstring": "^1.24",
+ "symfony/polyfill-php80": "^1.24"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4.1",
+ "bamarni/composer-bin-plugin": "^1.8.2",
"ext-filter": "*",
- "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25"
+ "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
},
"suggest": {
"ext-filter": "Required to use the boolean validator."
@@ -7675,10 +7497,10 @@
"extra": {
"bamarni-bin": {
"bin-links": true,
- "forward-command": true
+ "forward-command": false
},
"branch-alias": {
- "dev-master": "5.5-dev"
+ "dev-master": "5.6-dev"
}
},
"autoload": {
@@ -7710,7 +7532,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
- "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0"
+ "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
},
"funding": [
{
@@ -7722,7 +7544,7 @@
"type": "tidelift"
}
],
- "time": "2022-10-16T01:01:54+00:00"
+ "time": "2024-07-20T21:52:34+00:00"
},
{
"name": "voku/portable-ascii",
@@ -7860,48 +7682,48 @@
"packages-dev": [
{
"name": "barryvdh/laravel-ide-helper",
- "version": "v2.13.0",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
- "reference": "81d5b223ff067a1f38e14c100997e153b837fe4a"
+ "reference": "07e3bd8796f3d1414801a03d3783f9d3ec9efc08"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/81d5b223ff067a1f38e14c100997e153b837fe4a",
- "reference": "81d5b223ff067a1f38e14c100997e153b837fe4a",
+ "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/07e3bd8796f3d1414801a03d3783f9d3ec9efc08",
+ "reference": "07e3bd8796f3d1414801a03d3783f9d3ec9efc08",
"shasum": ""
},
"require": {
- "barryvdh/reflection-docblock": "^2.0.6",
+ "barryvdh/reflection-docblock": "^2.1.2",
"composer/class-map-generator": "^1.0",
- "doctrine/dbal": "^2.6 || ^3",
"ext-json": "*",
- "illuminate/console": "^8 || ^9 || ^10",
- "illuminate/filesystem": "^8 || ^9 || ^10",
- "illuminate/support": "^8 || ^9 || ^10",
- "nikic/php-parser": "^4.7",
- "php": "^7.3 || ^8.0",
+ "illuminate/console": "^11.15",
+ "illuminate/database": "^11.15",
+ "illuminate/filesystem": "^11.15",
+ "illuminate/support": "^11.15",
+ "nikic/php-parser": "^4.18 || ^5",
+ "php": "^8.2",
"phpdocumentor/type-resolver": "^1.1.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
- "friendsofphp/php-cs-fixer": "^2",
- "illuminate/config": "^8 || ^9 || ^10",
- "illuminate/view": "^8 || ^9 || ^10",
+ "friendsofphp/php-cs-fixer": "^3",
+ "illuminate/config": "^11.15",
+ "illuminate/view": "^11.15",
"mockery/mockery": "^1.4",
- "orchestra/testbench": "^6 || ^7 || ^8",
- "phpunit/phpunit": "^8.5 || ^9",
- "spatie/phpunit-snapshot-assertions": "^3 || ^4",
- "vimeo/psalm": "^3.12"
+ "orchestra/testbench": "^9.2",
+ "phpunit/phpunit": "^10.5",
+ "spatie/phpunit-snapshot-assertions": "^4 || ^5",
+ "vimeo/psalm": "^5.4"
},
"suggest": {
- "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10)."
+ "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.12-dev"
+ "dev-master": "3.2-dev"
},
"laravel": {
"providers": [
@@ -7938,7 +7760,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
- "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.13.0"
+ "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.2.2"
},
"funding": [
{
@@ -7950,20 +7772,20 @@
"type": "github"
}
],
- "time": "2023-02-04T13:56:40+00:00"
+ "time": "2024-10-29T14:00:16+00:00"
},
{
"name": "barryvdh/reflection-docblock",
- "version": "v2.1.0",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/ReflectionDocBlock.git",
- "reference": "bf44b757feb8ba1734659029357646466ded673e"
+ "reference": "c6fad15f7c878be21650c51e1f841bca7e49752e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e",
- "reference": "bf44b757feb8ba1734659029357646466ded673e",
+ "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/c6fad15f7c878be21650c51e1f841bca7e49752e",
+ "reference": "c6fad15f7c878be21650c51e1f841bca7e49752e",
"shasum": ""
},
"require": {
@@ -8000,36 +7822,100 @@
}
],
"support": {
- "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0"
+ "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.3"
+ },
+ "time": "2024-10-23T11:41:03+00:00"
+ },
+ {
+ "name": "clue/ndjson-react",
+ "version": "v1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/clue/reactphp-ndjson.git",
+ "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+ "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3",
+ "react/stream": "^1.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+ "react/event-loop": "^1.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Clue\\React\\NDJson\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering"
+ }
+ ],
+ "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+ "homepage": "https://github.com/clue/reactphp-ndjson",
+ "keywords": [
+ "NDJSON",
+ "json",
+ "jsonlines",
+ "newline",
+ "reactphp",
+ "streaming"
+ ],
+ "support": {
+ "issues": "https://github.com/clue/reactphp-ndjson/issues",
+ "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
},
- "time": "2022-10-31T15:35:43+00:00"
+ "funding": [
+ {
+ "url": "https://clue.engineering/support",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/clue",
+ "type": "github"
+ }
+ ],
+ "time": "2022-12-23T10:58:28+00:00"
},
{
"name": "composer/class-map-generator",
- "version": "1.0.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/class-map-generator.git",
- "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513"
+ "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/class-map-generator/zipball/1e1cb2b791facb2dfe32932a7718cf2571187513",
- "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513",
+ "url": "https://api.github.com/repos/composer/class-map-generator/zipball/98bbf6780e56e0fd2404fe4b82eb665a0f93b783",
+ "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783",
"shasum": ""
},
"require": {
- "composer/pcre": "^2 || ^3",
+ "composer/pcre": "^2.1 || ^3.1",
"php": "^7.2 || ^8.0",
- "symfony/finder": "^4.4 || ^5.3 || ^6"
+ "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7"
},
"require-dev": {
"phpstan/phpstan": "^1.6",
"phpstan/phpstan-deprecation-rules": "^1",
"phpstan/phpstan-phpunit": "^1",
"phpstan/phpstan-strict-rules": "^1.1",
- "symfony/filesystem": "^5.4 || ^6",
- "symfony/phpunit-bridge": "^5"
+ "phpunit/phpunit": "^8",
+ "symfony/filesystem": "^5.4 || ^6"
},
"type": "library",
"extra": {
@@ -8059,7 +7945,7 @@
],
"support": {
"issues": "https://github.com/composer/class-map-generator/issues",
- "source": "https://github.com/composer/class-map-generator/tree/1.0.0"
+ "source": "https://github.com/composer/class-map-generator/tree/1.4.0"
},
"funding": [
{
@@ -8075,34 +7961,42 @@
"type": "tidelift"
}
],
- "time": "2022-06-19T11:31:27+00:00"
+ "time": "2024-10-03T18:14:00+00:00"
},
{
"name": "composer/pcre",
- "version": "3.1.0",
+ "version": "3.3.2",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+ "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+ "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
"shasum": ""
},
"require": {
"php": "^7.4 || ^8.0"
},
+ "conflict": {
+ "phpstan/phpstan": "<1.11.10"
+ },
"require-dev": {
- "phpstan/phpstan": "^1.3",
- "phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^5"
+ "phpstan/phpstan": "^1.12 || ^2",
+ "phpstan/phpstan-strict-rules": "^1 || ^2",
+ "phpunit/phpunit": "^8 || ^9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "3.x-dev"
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
}
},
"autoload": {
@@ -8130,7 +8024,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.0"
+ "source": "https://github.com/composer/pcre/tree/3.3.2"
},
"funding": [
{
@@ -8146,28 +8040,28 @@
"type": "tidelift"
}
],
- "time": "2022-11-17T09:50:14+00:00"
+ "time": "2024-11-12T16:29:46+00:00"
},
{
"name": "composer/semver",
- "version": "3.3.2",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+ "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
- "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+ "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+ "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpstan/phpstan": "^1.4",
- "symfony/phpunit-bridge": "^4.2 || ^5"
+ "phpstan/phpstan": "^1.11",
+ "symfony/phpunit-bridge": "^3 || ^7"
},
"type": "library",
"extra": {
@@ -8209,9 +8103,9 @@
"versioning"
],
"support": {
- "irc": "irc://irc.freenode.org/composer",
+ "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.3.2"
+ "source": "https://github.com/composer/semver/tree/3.4.3"
},
"funding": [
{
@@ -8227,20 +8121,20 @@
"type": "tidelift"
}
],
- "time": "2022-04-01T19:23:25+00:00"
+ "time": "2024-09-19T14:15:21+00:00"
},
{
"name": "composer/xdebug-handler",
- "version": "3.0.3",
+ "version": "3.0.5",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+ "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+ "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
"shasum": ""
},
"require": {
@@ -8251,7 +8145,7 @@
"require-dev": {
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^6.0"
+ "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
},
"type": "library",
"autoload": {
@@ -8275,9 +8169,9 @@
"performance"
],
"support": {
- "irc": "irc://irc.freenode.org/composer",
+ "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
- "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+ "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
},
"funding": [
{
@@ -8293,102 +8187,120 @@
"type": "tidelift"
}
],
- "time": "2022-02-25T21:32:43+00:00"
+ "time": "2024-05-06T16:37:16+00:00"
},
{
- "name": "doctrine/annotations",
- "version": "2.0.1",
+ "name": "doctrine/deprecations",
+ "version": "1.1.3",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/annotations.git",
- "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
+ "url": "https://github.com/doctrine/deprecations.git",
+ "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
- "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+ "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
"shasum": ""
},
"require": {
- "doctrine/lexer": "^2 || ^3",
- "ext-tokenizer": "*",
- "php": "^7.2 || ^8.0",
- "psr/cache": "^1 || ^2 || ^3"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/cache": "^2.0",
- "doctrine/coding-standard": "^10",
- "phpstan/phpstan": "^1.8.0",
+ "doctrine/coding-standard": "^9",
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "symfony/cache": "^5.4 || ^6",
- "vimeo/psalm": "^4.10"
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
- "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
+ "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
},
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+ "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Docblock Annotations Parser",
- "homepage": "https://www.doctrine-project.org/projects/annotations.html",
- "keywords": [
- "annotations",
- "docblock",
- "parser"
- ],
+ "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+ "homepage": "https://www.doctrine-project.org/",
"support": {
- "issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/2.0.1"
+ "issues": "https://github.com/doctrine/deprecations/issues",
+ "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
},
- "time": "2023-02-02T22:02:53+00:00"
+ "time": "2024-01-30T19:34:25+00:00"
},
{
- "name": "fakerphp/faker",
- "version": "v1.21.0",
+ "name": "evenement/evenement",
+ "version": "v3.0.2",
"source": {
"type": "git",
- "url": "https://github.com/FakerPHP/Faker.git",
- "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d"
+ "url": "https://github.com/igorw/evenement.git",
+ "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d",
- "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d",
+ "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+ "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
"shasum": ""
},
"require": {
- "php": "^7.4 || ^8.0",
- "psr/container": "^1.0 || ^2.0",
- "symfony/deprecation-contracts": "^2.2 || ^3.0"
+ "php": ">=7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9 || ^6"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Evenement\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch"
+ }
+ ],
+ "description": "Événement is a very simple event dispatching library for PHP",
+ "keywords": [
+ "event-dispatcher",
+ "event-emitter"
+ ],
+ "support": {
+ "issues": "https://github.com/igorw/evenement/issues",
+ "source": "https://github.com/igorw/evenement/tree/v3.0.2"
+ },
+ "time": "2023-08-08T05:53:35+00:00"
+ },
+ {
+ "name": "fakerphp/faker",
+ "version": "v1.23.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/FakerPHP/Faker.git",
+ "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b",
+ "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4 || ^8.0",
+ "psr/container": "^1.0 || ^2.0",
+ "symfony/deprecation-contracts": "^2.2 || ^3.0"
},
"conflict": {
"fzaninotto/faker": "*"
@@ -8408,11 +8320,6 @@
"ext-mbstring": "Required for multibyte Unicode string functionality."
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "v1.21-dev"
- }
- },
"autoload": {
"psr-4": {
"Faker\\": "src/Faker/"
@@ -8435,32 +8342,93 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
- "source": "https://github.com/FakerPHP/Faker/tree/v1.21.0"
+ "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1"
+ },
+ "time": "2024-01-02T13:46:09+00:00"
+ },
+ {
+ "name": "fidry/cpu-core-counter",
+ "version": "1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/theofidry/cpu-core-counter.git",
+ "reference": "8520451a140d3f46ac33042715115e290cf5785f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+ "reference": "8520451a140d3f46ac33042715115e290cf5785f",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "require-dev": {
+ "fidry/makefile": "^0.2.0",
+ "fidry/php-cs-fixer-config": "^1.1.2",
+ "phpstan/extension-installer": "^1.2.0",
+ "phpstan/phpstan": "^1.9.2",
+ "phpstan/phpstan-deprecation-rules": "^1.0.0",
+ "phpstan/phpstan-phpunit": "^1.2.2",
+ "phpstan/phpstan-strict-rules": "^1.4.4",
+ "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+ "webmozarts/strict-phpunit": "^7.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Fidry\\CpuCoreCounter\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Théo FIDRY",
+ "email": "theo.fidry@gmail.com"
+ }
+ ],
+ "description": "Tiny utility to get the number of CPU cores.",
+ "keywords": [
+ "CPU",
+ "core"
+ ],
+ "support": {
+ "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+ "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
},
- "time": "2022-12-13T13:54:32+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/theofidry",
+ "type": "github"
+ }
+ ],
+ "time": "2024-08-06T10:04:20+00:00"
},
{
"name": "filp/whoops",
- "version": "2.14.6",
+ "version": "2.16.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "f7948baaa0330277c729714910336383286305da"
+ "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da",
- "reference": "f7948baaa0330277c729714910336383286305da",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+ "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
"shasum": ""
},
"require": {
- "php": "^5.5.9 || ^7.0 || ^8.0",
+ "php": "^7.1 || ^8.0",
"psr/log": "^1.0.1 || ^2.0 || ^3.0"
},
"require-dev": {
- "mockery/mockery": "^0.9 || ^1.0",
- "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
- "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+ "symfony/var-dumper": "^4.0 || ^5.0"
},
"suggest": {
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -8500,7 +8468,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.14.6"
+ "source": "https://github.com/filp/whoops/tree/2.16.0"
},
"funding": [
{
@@ -8508,57 +8476,61 @@
"type": "github"
}
],
- "time": "2022-11-02T16:23:29+00:00"
+ "time": "2024-09-25T12:00:00+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.14.4",
+ "version": "v3.64.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b"
+ "reference": "58dd9c931c785a79739310aef5178928305ffa67"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1b3d9dba63d93b8a202c31e824748218781eae6b",
- "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67",
+ "reference": "58dd9c931c785a79739310aef5178928305ffa67",
"shasum": ""
},
"require": {
- "composer/semver": "^3.3",
+ "clue/ndjson-react": "^1.0",
+ "composer/semver": "^3.4",
"composer/xdebug-handler": "^3.0.3",
- "doctrine/annotations": "^2",
- "doctrine/lexer": "^2 || ^3",
+ "ext-filter": "*",
"ext-json": "*",
"ext-tokenizer": "*",
+ "fidry/cpu-core-counter": "^1.0",
"php": "^7.4 || ^8.0",
- "sebastian/diff": "^4.0 || ^5.0",
- "symfony/console": "^5.4 || ^6.0",
- "symfony/event-dispatcher": "^5.4 || ^6.0",
- "symfony/filesystem": "^5.4 || ^6.0",
- "symfony/finder": "^5.4 || ^6.0",
- "symfony/options-resolver": "^5.4 || ^6.0",
- "symfony/polyfill-mbstring": "^1.27",
- "symfony/polyfill-php80": "^1.27",
- "symfony/polyfill-php81": "^1.27",
- "symfony/process": "^5.4 || ^6.0",
- "symfony/stopwatch": "^5.4 || ^6.0"
+ "react/child-process": "^0.6.5",
+ "react/event-loop": "^1.0",
+ "react/promise": "^2.0 || ^3.0",
+ "react/socket": "^1.0",
+ "react/stream": "^1.0",
+ "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
+ "symfony/console": "^5.4 || ^6.0 || ^7.0",
+ "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+ "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+ "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+ "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+ "symfony/polyfill-mbstring": "^1.28",
+ "symfony/polyfill-php80": "^1.28",
+ "symfony/polyfill-php81": "^1.28",
+ "symfony/process": "^5.4 || ^6.0 || ^7.0",
+ "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
+ "facile-it/paraunit": "^1.3 || ^2.3",
+ "infection/infection": "^0.29.5",
"justinrainbow/json-schema": "^5.2",
- "keradus/cli-executor": "^2.0",
+ "keradus/cli-executor": "^2.1",
"mikey179/vfsstream": "^1.6.11",
- "php-coveralls/php-coveralls": "^2.5.3",
+ "php-coveralls/php-coveralls": "^2.7",
"php-cs-fixer/accessible-object": "^1.1",
- "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
- "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
- "phpspec/prophecy": "^1.16",
- "phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.5",
- "phpunitgoodpractices/polyfill": "^1.6",
- "phpunitgoodpractices/traits": "^1.9.2",
- "symfony/phpunit-bridge": "^6.2.3",
- "symfony/yaml": "^5.4 || ^6.0"
+ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
+ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
+ "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
+ "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
+ "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -8571,7 +8543,10 @@
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
- }
+ },
+ "exclude-from-classmap": [
+ "src/Fixer/Internal/*"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -8588,9 +8563,15 @@
}
],
"description": "A tool to automatically fix PHP code style",
+ "keywords": [
+ "Static code analysis",
+ "fixer",
+ "standards",
+ "static analysis"
+ ],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.4"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0"
},
"funding": [
{
@@ -8598,7 +8579,7 @@
"type": "github"
}
],
- "time": "2023-02-09T21:49:13+00:00"
+ "time": "2024-08-30T23:09:38+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -8653,22 +8634,29 @@
},
{
"name": "itsgoingd/clockwork",
- "version": "v5.1.12",
+ "version": "v5.2.2",
"source": {
"type": "git",
"url": "https://github.com/itsgoingd/clockwork.git",
- "reference": "c9dbdbb1f0efd19bb80f1080ef63f1b9b1bc3b1b"
+ "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/c9dbdbb1f0efd19bb80f1080ef63f1b9b1bc3b1b",
- "reference": "c9dbdbb1f0efd19bb80f1080ef63f1b9b1bc3b1b",
+ "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/29bc4cedfbe742b419544c30b7b6e15cd9da08ef",
+ "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": ">=5.6"
},
+ "suggest": {
+ "ext-pdo": "Needed in order to use a SQL database for metadata storage",
+ "ext-pdo_mysql": "Needed in order to use MySQL for metadata storage",
+ "ext-pdo_postgres": "Needed in order to use Postgres for metadata storage",
+ "ext-pdo_sqlite": "Needed in order to use a SQLite for metadata storage",
+ "ext-redis": "Needed in order to use Redis for metadata storage"
+ },
"type": "library",
"extra": {
"laravel": {
@@ -8682,139 +8670,995 @@
},
"autoload": {
"psr-4": {
- "Clockwork\\": "Clockwork/"
+ "Clockwork\\": "Clockwork/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "itsgoingd",
+ "email": "itsgoingd@luzer.sk",
+ "homepage": "https://twitter.com/itsgoingd"
+ }
+ ],
+ "description": "php dev tools in your browser",
+ "homepage": "https://underground.works/clockwork",
+ "keywords": [
+ "Devtools",
+ "debugging",
+ "laravel",
+ "logging",
+ "lumen",
+ "profiling",
+ "slim"
+ ],
+ "support": {
+ "issues": "https://github.com/itsgoingd/clockwork/issues",
+ "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/itsgoingd",
+ "type": "github"
+ }
+ ],
+ "time": "2024-04-14T10:49:22+00:00"
+ },
+ {
+ "name": "larastan/larastan",
+ "version": "v2.9.11",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/larastan/larastan.git",
+ "reference": "54eccd35d1732b9ee4392c25aec606a6a9c521e7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/larastan/larastan/zipball/54eccd35d1732b9ee4392c25aec606a6a9c521e7",
+ "reference": "54eccd35d1732b9ee4392c25aec606a6a9c521e7",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
+ "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
+ "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
+ "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
+ "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
+ "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
+ "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
+ "php": "^8.0.2",
+ "phpmyadmin/sql-parser": "^5.9.0",
+ "phpstan/phpstan": "^1.12.5"
+ },
+ "require-dev": {
+ "doctrine/coding-standard": "^12.0",
+ "laravel/framework": "^9.52.16 || ^10.28.0 || ^11.16",
+ "mockery/mockery": "^1.5.1",
+ "nikic/php-parser": "^4.19.1",
+ "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
+ "orchestra/testbench-core": "^7.33.0 || ^8.13.0 || ^9.0.9",
+ "phpstan/phpstan-deprecation-rules": "^1.2",
+ "phpunit/phpunit": "^9.6.13 || ^10.5.16"
+ },
+ "suggest": {
+ "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
+ },
+ "type": "phpstan-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0-dev"
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Larastan\\Larastan\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Can Vural",
+ "email": "can9119@gmail.com"
+ },
+ {
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }
+ ],
+ "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+ "keywords": [
+ "PHPStan",
+ "code analyse",
+ "code analysis",
+ "larastan",
+ "laravel",
+ "package",
+ "php",
+ "static analysis"
+ ],
+ "support": {
+ "issues": "https://github.com/larastan/larastan/issues",
+ "source": "https://github.com/larastan/larastan/tree/v2.9.11"
+ },
+ "funding": [
+ {
+ "url": "https://www.paypal.com/paypalme/enunomaduro",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/canvural",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/nunomaduro",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/nunomaduro",
+ "type": "patreon"
+ }
+ ],
+ "time": "2024-11-11T23:11:00+00:00"
+ },
+ {
+ "name": "laravel/pail",
+ "version": "v1.1.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/pail.git",
+ "reference": "b33ad8321416fe86efed7bf398f3306c47b4871b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/pail/zipball/b33ad8321416fe86efed7bf398f3306c47b4871b",
+ "reference": "b33ad8321416fe86efed7bf398f3306c47b4871b",
+ "shasum": ""
+ },
+ "require": {
+ "ext-mbstring": "*",
+ "illuminate/console": "^10.24|^11.0",
+ "illuminate/contracts": "^10.24|^11.0",
+ "illuminate/log": "^10.24|^11.0",
+ "illuminate/process": "^10.24|^11.0",
+ "illuminate/support": "^10.24|^11.0",
+ "nunomaduro/termwind": "^1.15|^2.0",
+ "php": "^8.2",
+ "symfony/console": "^6.0|^7.0"
+ },
+ "require-dev": {
+ "laravel/pint": "^1.13",
+ "orchestra/testbench": "^8.12|^9.0",
+ "pestphp/pest": "^2.20",
+ "pestphp/pest-plugin-type-coverage": "^2.3",
+ "phpstan/phpstan": "^1.10",
+ "symfony/var-dumper": "^6.3|^7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.x-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Laravel\\Pail\\PailServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Pail\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ },
+ {
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }
+ ],
+ "description": "Easily delve into your Laravel application's log files directly from the command line.",
+ "homepage": "https://github.com/laravel/pail",
+ "keywords": [
+ "laravel",
+ "logs",
+ "php",
+ "tail"
+ ],
+ "support": {
+ "issues": "https://github.com/laravel/pail/issues",
+ "source": "https://github.com/laravel/pail"
+ },
+ "time": "2024-10-15T20:06:24+00:00"
+ },
+ {
+ "name": "laravel/sail",
+ "version": "v1.36.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/sail.git",
+ "reference": "f184d3d687155d06bc8cb9ff6dc48596a138460c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/sail/zipball/f184d3d687155d06bc8cb9ff6dc48596a138460c",
+ "reference": "f184d3d687155d06bc8cb9ff6dc48596a138460c",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/console": "^9.52.16|^10.0|^11.0",
+ "illuminate/contracts": "^9.52.16|^10.0|^11.0",
+ "illuminate/support": "^9.52.16|^10.0|^11.0",
+ "php": "^8.0",
+ "symfony/console": "^6.0|^7.0",
+ "symfony/yaml": "^6.0|^7.0"
+ },
+ "require-dev": {
+ "orchestra/testbench": "^7.0|^8.0|^9.0",
+ "phpstan/phpstan": "^1.10"
+ },
+ "bin": [
+ "bin/sail"
+ ],
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Laravel\\Sail\\SailServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Sail\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "Docker files for running a basic Laravel application.",
+ "keywords": [
+ "docker",
+ "laravel"
+ ],
+ "support": {
+ "issues": "https://github.com/laravel/sail/issues",
+ "source": "https://github.com/laravel/sail"
+ },
+ "time": "2024-10-10T13:26:02+00:00"
+ },
+ {
+ "name": "mockery/mockery",
+ "version": "1.6.12",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/mockery/mockery.git",
+ "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+ "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+ "shasum": ""
+ },
+ "require": {
+ "hamcrest/hamcrest-php": "^2.0.1",
+ "lib-pcre": ">=7.0",
+ "php": ">=7.3"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.5 || ^9.6.17",
+ "symplify/easy-coding-standard": "^12.1.14"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "library/helpers.php",
+ "library/Mockery.php"
+ ],
+ "psr-4": {
+ "Mockery\\": "library/Mockery"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Pádraic Brady",
+ "email": "padraic.brady@gmail.com",
+ "homepage": "https://github.com/padraic",
+ "role": "Author"
+ },
+ {
+ "name": "Dave Marshall",
+ "email": "dave.marshall@atstsolutions.co.uk",
+ "homepage": "https://davedevelopment.co.uk",
+ "role": "Developer"
+ },
+ {
+ "name": "Nathanael Esayeas",
+ "email": "nathanael.esayeas@protonmail.com",
+ "homepage": "https://github.com/ghostwriter",
+ "role": "Lead Developer"
+ }
+ ],
+ "description": "Mockery is a simple yet flexible PHP mock object framework",
+ "homepage": "https://github.com/mockery/mockery",
+ "keywords": [
+ "BDD",
+ "TDD",
+ "library",
+ "mock",
+ "mock objects",
+ "mockery",
+ "stub",
+ "test",
+ "test double",
+ "testing"
+ ],
+ "support": {
+ "docs": "https://docs.mockery.io/",
+ "issues": "https://github.com/mockery/mockery/issues",
+ "rss": "https://github.com/mockery/mockery/releases.atom",
+ "security": "https://github.com/mockery/mockery/security/advisories",
+ "source": "https://github.com/mockery/mockery"
+ },
+ "time": "2024-05-16T03:13:13+00:00"
+ },
+ {
+ "name": "myclabs/deep-copy",
+ "version": "1.12.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/myclabs/DeepCopy.git",
+ "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+ "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1 || ^8.0"
+ },
+ "conflict": {
+ "doctrine/collections": "<1.6.8",
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
+ },
+ "require-dev": {
+ "doctrine/collections": "^1.6.8",
+ "doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/DeepCopy/deep_copy.php"
+ ],
+ "psr-4": {
+ "DeepCopy\\": "src/DeepCopy/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Create deep copies (clones) of your objects",
+ "keywords": [
+ "clone",
+ "copy",
+ "duplicate",
+ "object",
+ "object graph"
+ ],
+ "support": {
+ "issues": "https://github.com/myclabs/DeepCopy/issues",
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
+ },
+ "funding": [
+ {
+ "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-11-08T17:47:46+00:00"
+ },
+ {
+ "name": "nunomaduro/collision",
+ "version": "v8.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nunomaduro/collision.git",
+ "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
+ "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
+ "shasum": ""
+ },
+ "require": {
+ "filp/whoops": "^2.16.0",
+ "nunomaduro/termwind": "^2.1.0",
+ "php": "^8.2.0",
+ "symfony/console": "^7.1.5"
+ },
+ "conflict": {
+ "laravel/framework": "<11.0.0 || >=12.0.0",
+ "phpunit/phpunit": "<10.5.1 || >=12.0.0"
+ },
+ "require-dev": {
+ "larastan/larastan": "^2.9.8",
+ "laravel/framework": "^11.28.0",
+ "laravel/pint": "^1.18.1",
+ "laravel/sail": "^1.36.0",
+ "laravel/sanctum": "^4.0.3",
+ "laravel/tinker": "^2.10.0",
+ "orchestra/testbench-core": "^9.5.3",
+ "pestphp/pest": "^2.36.0 || ^3.4.0",
+ "sebastian/environment": "^6.1.0 || ^7.2.0"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
+ ]
+ },
+ "branch-alias": {
+ "dev-8.x": "8.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "./src/Adapters/Phpunit/Autoload.php"
+ ],
+ "psr-4": {
+ "NunoMaduro\\Collision\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }
+ ],
+ "description": "Cli error handling for console/command-line PHP applications.",
+ "keywords": [
+ "artisan",
+ "cli",
+ "command-line",
+ "console",
+ "error",
+ "handling",
+ "laravel",
+ "laravel-zero",
+ "php",
+ "symfony"
+ ],
+ "support": {
+ "issues": "https://github.com/nunomaduro/collision/issues",
+ "source": "https://github.com/nunomaduro/collision"
+ },
+ "funding": [
+ {
+ "url": "https://www.paypal.com/paypalme/enunomaduro",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/nunomaduro",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/nunomaduro",
+ "type": "patreon"
+ }
+ ],
+ "time": "2024-10-15T16:06:32+00:00"
+ },
+ {
+ "name": "phar-io/manifest",
+ "version": "2.0.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phar-io/manifest.git",
+ "reference": "54750ef60c58e43759730615a392c31c80e23176"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+ "reference": "54750ef60c58e43759730615a392c31c80e23176",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "ext-phar": "*",
+ "ext-xmlwriter": "*",
+ "phar-io/version": "^3.0.1",
+ "php": "^7.2 || ^8.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Arne Blankerts",
+ "email": "arne@blankerts.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Sebastian Heuer",
+ "email": "sebastian@phpeople.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "Developer"
+ }
+ ],
+ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+ "support": {
+ "issues": "https://github.com/phar-io/manifest/issues",
+ "source": "https://github.com/phar-io/manifest/tree/2.0.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2024-03-03T12:33:53+00:00"
+ },
+ {
+ "name": "phar-io/version",
+ "version": "3.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phar-io/version.git",
+ "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+ "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Arne Blankerts",
+ "email": "arne@blankerts.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Sebastian Heuer",
+ "email": "sebastian@phpeople.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "Developer"
+ }
+ ],
+ "description": "Library for handling version information and constraints",
+ "support": {
+ "issues": "https://github.com/phar-io/version/issues",
+ "source": "https://github.com/phar-io/version/tree/3.2.1"
+ },
+ "time": "2022-02-21T01:04:05+00:00"
+ },
+ {
+ "name": "phpdocumentor/reflection-common",
+ "version": "2.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-2.x": "2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jaap van Otterdijk",
+ "email": "opensource@ijaap.nl"
+ }
+ ],
+ "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+ "homepage": "http://www.phpdoc.org",
+ "keywords": [
+ "FQSEN",
+ "phpDocumentor",
+ "phpdoc",
+ "reflection",
+ "static analysis"
+ ],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+ "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+ },
+ "time": "2020-06-27T09:03:43+00:00"
+ },
+ {
+ "name": "phpdocumentor/type-resolver",
+ "version": "1.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpDocumentor/TypeResolver.git",
+ "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a",
+ "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/deprecations": "^1.0",
+ "php": "^7.3 || ^8.0",
+ "phpdocumentor/reflection-common": "^2.0",
+ "phpstan/phpdoc-parser": "^1.18|^2.0"
+ },
+ "require-dev": {
+ "ext-tokenizer": "*",
+ "phpbench/phpbench": "^1.2",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan-phpunit": "^1.1",
+ "phpunit/phpunit": "^9.5",
+ "rector/rector": "^0.13.9",
+ "vimeo/psalm": "^4.25"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-1.x": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "phpDocumentor\\Reflection\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Mike van Riel",
+ "email": "me@mikevanriel.com"
+ }
+ ],
+ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+ "support": {
+ "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0"
+ },
+ "time": "2024-11-09T15:12:26+00:00"
+ },
+ {
+ "name": "phpmyadmin/sql-parser",
+ "version": "5.10.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpmyadmin/sql-parser.git",
+ "reference": "b14fd66496a22d8dd7f7e2791edd9e8674422f17"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/b14fd66496a22d8dd7f7e2791edd9e8674422f17",
+ "reference": "b14fd66496a22d8dd7f7e2791edd9e8674422f17",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0",
+ "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-php80": "^1.16"
+ },
+ "conflict": {
+ "phpmyadmin/motranslator": "<3.0"
+ },
+ "require-dev": {
+ "phpbench/phpbench": "^1.1",
+ "phpmyadmin/coding-standard": "^3.0",
+ "phpmyadmin/motranslator": "^4.0 || ^5.0",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan": "^1.9.12",
+ "phpstan/phpstan-phpunit": "^1.3.3",
+ "phpunit/phpunit": "^8.5 || ^9.6",
+ "psalm/plugin-phpunit": "^0.16.1",
+ "vimeo/psalm": "^4.11",
+ "zumba/json-serializer": "~3.0.2"
+ },
+ "suggest": {
+ "ext-mbstring": "For best performance",
+ "phpmyadmin/motranslator": "Translate messages to your favorite locale"
+ },
+ "bin": [
+ "bin/highlight-query",
+ "bin/lint-query",
+ "bin/sql-parser",
+ "bin/tokenize-query"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "PhpMyAdmin\\SqlParser\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "The phpMyAdmin Team",
+ "email": "developers@phpmyadmin.net",
+ "homepage": "https://www.phpmyadmin.net/team/"
+ }
+ ],
+ "description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
+ "homepage": "https://github.com/phpmyadmin/sql-parser",
+ "keywords": [
+ "analysis",
+ "lexer",
+ "parser",
+ "query linter",
+ "sql",
+ "sql lexer",
+ "sql linter",
+ "sql parser",
+ "sql syntax highlighter",
+ "sql tokenizer"
+ ],
+ "support": {
+ "issues": "https://github.com/phpmyadmin/sql-parser/issues",
+ "source": "https://github.com/phpmyadmin/sql-parser"
+ },
+ "funding": [
+ {
+ "url": "https://www.phpmyadmin.net/donate/",
+ "type": "other"
+ }
+ ],
+ "time": "2024-11-10T04:10:31+00:00"
+ },
+ {
+ "name": "phpstan/phpdoc-parser",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpstan/phpdoc-parser.git",
+ "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299",
+ "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "doctrine/annotations": "^2.0",
+ "nikic/php-parser": "^5.3.0",
+ "php-parallel-lint/php-parallel-lint": "^1.2",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^2.0",
+ "phpstan/phpstan-phpunit": "^2.0",
+ "phpstan/phpstan-strict-rules": "^2.0",
+ "phpunit/phpunit": "^9.6",
+ "symfony/process": "^5.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "PHPStan\\PhpDocParser\\": [
+ "src/"
+ ]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "authors": [
- {
- "name": "itsgoingd",
- "email": "itsgoingd@luzer.sk",
- "homepage": "https://twitter.com/itsgoingd"
- }
- ],
- "description": "php dev tools in your browser",
- "homepage": "https://underground.works/clockwork",
- "keywords": [
- "Devtools",
- "debugging",
- "laravel",
- "logging",
- "lumen",
- "profiling",
- "slim"
- ],
+ "description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
- "issues": "https://github.com/itsgoingd/clockwork/issues",
- "source": "https://github.com/itsgoingd/clockwork/tree/v5.1.12"
+ "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0"
},
- "funding": [
- {
- "url": "https://github.com/itsgoingd",
- "type": "github"
- }
- ],
- "time": "2022-12-13T00:04:12+00:00"
+ "time": "2024-10-13T11:29:49+00:00"
},
{
- "name": "laravel/sail",
- "version": "v1.21.0",
+ "name": "phpstan/phpstan",
+ "version": "1.12.10",
"source": {
"type": "git",
- "url": "https://github.com/laravel/sail.git",
- "reference": "758a914fc4da41f3f6ca5522c85902181b228bd1"
+ "url": "https://github.com/phpstan/phpstan.git",
+ "reference": "fc463b5d0fe906dcf19689be692c65c50406a071"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/sail/zipball/758a914fc4da41f3f6ca5522c85902181b228bd1",
- "reference": "758a914fc4da41f3f6ca5522c85902181b228bd1",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071",
+ "reference": "fc463b5d0fe906dcf19689be692c65c50406a071",
"shasum": ""
},
"require": {
- "illuminate/console": "^8.0|^9.0|^10.0",
- "illuminate/contracts": "^8.0|^9.0|^10.0",
- "illuminate/support": "^8.0|^9.0|^10.0",
- "php": "^7.3|^8.0",
- "symfony/yaml": "^6.0"
+ "php": "^7.2|^8.0"
+ },
+ "conflict": {
+ "phpstan/phpstan-shim": "*"
},
"bin": [
- "bin/sail"
+ "phpstan",
+ "phpstan.phar"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- },
- "laravel": {
- "providers": [
- "Laravel\\Sail\\SailServiceProvider"
- ]
- }
- },
"autoload": {
- "psr-4": {
- "Laravel\\Sail\\": "src/"
- }
+ "files": [
+ "bootstrap.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylor@laravel.com"
- }
- ],
- "description": "Docker files for running a basic Laravel application.",
+ "description": "PHPStan - PHP Static Analysis Tool",
"keywords": [
- "docker",
- "laravel"
+ "dev",
+ "static analysis"
],
"support": {
- "issues": "https://github.com/laravel/sail/issues",
- "source": "https://github.com/laravel/sail"
+ "docs": "https://phpstan.org/user-guide/getting-started",
+ "forum": "https://github.com/phpstan/phpstan/discussions",
+ "issues": "https://github.com/phpstan/phpstan/issues",
+ "security": "https://github.com/phpstan/phpstan/security/policy",
+ "source": "https://github.com/phpstan/phpstan-src"
},
- "time": "2023-02-16T19:16:27+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/ondrejmirtes",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/phpstan",
+ "type": "github"
+ }
+ ],
+ "time": "2024-11-11T15:37:09+00:00"
},
{
- "name": "mockery/mockery",
- "version": "1.5.1",
+ "name": "phpunit/php-code-coverage",
+ "version": "10.1.16",
"source": {
"type": "git",
- "url": "https://github.com/mockery/mockery.git",
- "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e"
+ "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+ "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e",
- "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+ "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
"shasum": ""
},
"require": {
- "hamcrest/hamcrest-php": "^2.0.1",
- "lib-pcre": ">=7.0",
- "php": "^7.3 || ^8.0"
- },
- "conflict": {
- "phpunit/phpunit": "<8.0"
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "ext-xmlwriter": "*",
+ "nikic/php-parser": "^4.19.1 || ^5.1.0",
+ "php": ">=8.1",
+ "phpunit/php-file-iterator": "^4.1.0",
+ "phpunit/php-text-template": "^3.0.1",
+ "sebastian/code-unit-reverse-lookup": "^3.0.0",
+ "sebastian/complexity": "^3.2.0",
+ "sebastian/environment": "^6.1.0",
+ "sebastian/lines-of-code": "^2.0.2",
+ "sebastian/version": "^4.0.1",
+ "theseer/tokenizer": "^1.2.3"
},
"require-dev": {
- "phpunit/phpunit": "^8.5 || ^9.3"
+ "phpunit/phpunit": "^10.1"
+ },
+ "suggest": {
+ "ext-pcov": "PHP extension that provides line coverage",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4.x-dev"
+ "dev-main": "10.1.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Mockery": "library/"
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -8822,212 +9666,179 @@
],
"authors": [
{
- "name": "Pádraic Brady",
- "email": "padraic.brady@gmail.com",
- "homepage": "http://blog.astrumfutura.com"
- },
- {
- "name": "Dave Marshall",
- "email": "dave.marshall@atstsolutions.co.uk",
- "homepage": "http://davedevelopment.co.uk"
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
- "description": "Mockery is a simple yet flexible PHP mock object framework",
- "homepage": "https://github.com/mockery/mockery",
+ "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+ "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
"keywords": [
- "BDD",
- "TDD",
- "library",
- "mock",
- "mock objects",
- "mockery",
- "stub",
- "test",
- "test double",
- "testing"
+ "coverage",
+ "testing",
+ "xunit"
],
"support": {
- "issues": "https://github.com/mockery/mockery/issues",
- "source": "https://github.com/mockery/mockery/tree/1.5.1"
+ "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+ "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
},
- "time": "2022-09-07T15:32:08+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2024-08-22T04:31:57+00:00"
},
{
- "name": "myclabs/deep-copy",
- "version": "1.11.0",
+ "name": "phpunit/php-file-iterator",
+ "version": "4.1.0",
"source": {
"type": "git",
- "url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+ "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+ "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
- "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+ "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
- },
- "conflict": {
- "doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "php": ">=8.1"
},
"require-dev": {
- "doctrine/collections": "^1.6.8",
- "doctrine/common": "^2.13.3 || ^3.2.2",
- "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+ "phpunit/phpunit": "^10.0"
},
"type": "library",
- "autoload": {
- "files": [
- "src/DeepCopy/deep_copy.php"
- ],
- "psr-4": {
- "DeepCopy\\": "src/DeepCopy/"
+ "extra": {
+ "branch-alias": {
+ "dev-main": "4.0-dev"
}
},
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "description": "Create deep copies (clones) of your objects",
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }
+ ],
+ "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+ "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
"keywords": [
- "clone",
- "copy",
- "duplicate",
- "object",
- "object graph"
+ "filesystem",
+ "iterator"
],
"support": {
- "issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+ "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+ "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
},
"funding": [
{
- "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
- "type": "tidelift"
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
}
],
- "time": "2022-03-03T13:19:32+00:00"
+ "time": "2023-08-31T06:24:48+00:00"
},
{
- "name": "nunomaduro/collision",
- "version": "v7.0.5",
+ "name": "phpunit/php-invoker",
+ "version": "4.0.0",
"source": {
"type": "git",
- "url": "https://github.com/nunomaduro/collision.git",
- "reference": "5c654ee5fa187cf2f4cb226d773582ec6d402a55"
+ "url": "https://github.com/sebastianbergmann/php-invoker.git",
+ "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/5c654ee5fa187cf2f4cb226d773582ec6d402a55",
- "reference": "5c654ee5fa187cf2f4cb226d773582ec6d402a55",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+ "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
"shasum": ""
},
"require": {
- "filp/whoops": "^2.14.6",
- "nunomaduro/termwind": "^1.15.1",
- "php": "^8.1.0",
- "symfony/console": "^6.2.5"
+ "php": ">=8.1"
},
"require-dev": {
- "laravel/framework": "^10.0.3",
- "laravel/pint": "^1.5.0",
- "laravel/sail": "^1.20.2",
- "laravel/sanctum": "^3.2.1",
- "laravel/tinker": "^2.8.0",
- "nunomaduro/larastan": "^2.4.1",
- "orchestra/testbench-core": "^8.0.1",
- "pestphp/pest": "^2.0.0",
- "phpunit/phpunit": "^10.0.9",
- "sebastian/environment": "^6.0.0",
- "spatie/laravel-ignition": "^2.0.0"
+ "ext-pcntl": "*",
+ "phpunit/phpunit": "^10.0"
+ },
+ "suggest": {
+ "ext-pcntl": "*"
},
"type": "library",
"extra": {
- "laravel": {
- "providers": [
- "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
- ]
+ "branch-alias": {
+ "dev-main": "4.0-dev"
}
},
"autoload": {
- "files": [
- "./src/Adapters/Phpunit/Autoload.php"
- ],
- "psr-4": {
- "NunoMaduro\\Collision\\": "src/"
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Nuno Maduro",
- "email": "enunomaduro@gmail.com"
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
- "description": "Cli error handling for console/command-line PHP applications.",
+ "description": "Invoke callables with a timeout",
+ "homepage": "https://github.com/sebastianbergmann/php-invoker/",
"keywords": [
- "artisan",
- "cli",
- "command-line",
- "console",
- "error",
- "handling",
- "laravel",
- "laravel-zero",
- "php",
- "symfony"
+ "process"
],
"support": {
- "issues": "https://github.com/nunomaduro/collision/issues",
- "source": "https://github.com/nunomaduro/collision"
+ "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+ "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
},
"funding": [
{
- "url": "https://www.paypal.com/paypalme/enunomaduro",
- "type": "custom"
- },
- {
- "url": "https://github.com/nunomaduro",
+ "url": "https://github.com/sebastianbergmann",
"type": "github"
- },
- {
- "url": "https://www.patreon.com/nunomaduro",
- "type": "patreon"
}
],
- "time": "2023-02-19T16:25:13+00:00"
+ "time": "2023-02-03T06:56:09+00:00"
},
{
- "name": "phar-io/manifest",
- "version": "2.0.3",
+ "name": "phpunit/php-text-template",
+ "version": "3.0.1",
"source": {
"type": "git",
- "url": "https://github.com/phar-io/manifest.git",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+ "url": "https://github.com/sebastianbergmann/php-text-template.git",
+ "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+ "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
"shasum": ""
},
- "require": {
- "ext-dom": "*",
- "ext-phar": "*",
- "ext-xmlwriter": "*",
- "phar-io/version": "^3.0.1",
- "php": "^7.2 || ^8.0"
+ "require": {
+ "php": ">=8.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^10.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -9040,47 +9851,56 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
- "role": "Developer"
+ "role": "lead"
}
],
- "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+ "description": "Simple template engine.",
+ "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+ "keywords": [
+ "template"
+ ],
"support": {
- "issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+ "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+ "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
},
- "time": "2021-07-20T11:28:43+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2023-08-31T14:07:24+00:00"
},
{
- "name": "phar-io/version",
- "version": "3.2.1",
+ "name": "phpunit/php-timer",
+ "version": "6.0.0",
"source": {
"type": "git",
- "url": "https://github.com/phar-io/version.git",
- "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+ "url": "https://github.com/sebastianbergmann/php-timer.git",
+ "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
- "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+ "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0"
+ "php": ">=8.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^10.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "6.0-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -9091,118 +9911,155 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
- "role": "Developer"
+ "role": "lead"
}
],
- "description": "Library for handling version information and constraints",
+ "description": "Utility class for timing",
+ "homepage": "https://github.com/sebastianbergmann/php-timer/",
+ "keywords": [
+ "timer"
+ ],
"support": {
- "issues": "https://github.com/phar-io/version/issues",
- "source": "https://github.com/phar-io/version/tree/3.2.1"
+ "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+ "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
},
- "time": "2022-02-21T01:04:05+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2023-02-03T06:57:52+00:00"
},
{
- "name": "phpdocumentor/reflection-common",
- "version": "2.2.0",
+ "name": "phpunit/phpunit",
+ "version": "10.5.38",
"source": {
"type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+ "url": "https://github.com/sebastianbergmann/phpunit.git",
+ "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
- "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+ "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0"
+ "ext-dom": "*",
+ "ext-json": "*",
+ "ext-libxml": "*",
+ "ext-mbstring": "*",
+ "ext-xml": "*",
+ "ext-xmlwriter": "*",
+ "myclabs/deep-copy": "^1.12.0",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
+ "php": ">=8.1",
+ "phpunit/php-code-coverage": "^10.1.16",
+ "phpunit/php-file-iterator": "^4.1.0",
+ "phpunit/php-invoker": "^4.0.0",
+ "phpunit/php-text-template": "^3.0.1",
+ "phpunit/php-timer": "^6.0.0",
+ "sebastian/cli-parser": "^2.0.1",
+ "sebastian/code-unit": "^2.0.0",
+ "sebastian/comparator": "^5.0.3",
+ "sebastian/diff": "^5.1.1",
+ "sebastian/environment": "^6.1.0",
+ "sebastian/exporter": "^5.1.2",
+ "sebastian/global-state": "^6.0.2",
+ "sebastian/object-enumerator": "^5.0.0",
+ "sebastian/recursion-context": "^5.0.0",
+ "sebastian/type": "^4.0.0",
+ "sebastian/version": "^4.0.1"
},
+ "suggest": {
+ "ext-soap": "To be able to generate mocks based on WSDL files"
+ },
+ "bin": [
+ "phpunit"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-2.x": "2.x-dev"
+ "dev-main": "10.5-dev"
}
},
"autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src/"
- }
+ "files": [
+ "src/Framework/Assert/Functions.php"
+ ],
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Jaap van Otterdijk",
- "email": "opensource@ijaap.nl"
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
- "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
- "homepage": "http://www.phpdoc.org",
+ "description": "The PHP Unit Testing framework.",
+ "homepage": "https://phpunit.de/",
"keywords": [
- "FQSEN",
- "phpDocumentor",
- "phpdoc",
- "reflection",
- "static analysis"
+ "phpunit",
+ "testing",
+ "xunit"
],
"support": {
- "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
- "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+ "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+ "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
},
- "time": "2020-06-27T09:03:43+00:00"
+ "funding": [
+ {
+ "url": "https://phpunit.de/sponsors.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-10-28T13:06:21+00:00"
},
{
- "name": "phpdocumentor/type-resolver",
- "version": "1.6.2",
+ "name": "react/cache",
+ "version": "v1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
+ "url": "https://github.com/reactphp/cache.git",
+ "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
- "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+ "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+ "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
"shasum": ""
},
"require": {
- "php": "^7.4 || ^8.0",
- "phpdocumentor/reflection-common": "^2.0"
+ "php": ">=5.3.0",
+ "react/promise": "^3.0 || ^2.0 || ^1.1"
},
"require-dev": {
- "ext-tokenizer": "*",
- "phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.8",
- "phpstan/phpstan-phpunit": "^1.1",
- "phpunit/phpunit": "^9.5",
- "rector/rector": "^0.13.9",
- "vimeo/psalm": "^4.25"
+ "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "phpDocumentor\\Reflection\\": "src"
+ "React\\Cache\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -9211,447 +10068,515 @@
],
"authors": [
{
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+ "description": "Async, Promise-based cache interface for ReactPHP",
+ "keywords": [
+ "cache",
+ "caching",
+ "promise",
+ "reactphp"
+ ],
"support": {
- "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
+ "issues": "https://github.com/reactphp/cache/issues",
+ "source": "https://github.com/reactphp/cache/tree/v1.2.0"
},
- "time": "2022-10-14T12:47:21+00:00"
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2022-11-30T15:59:55+00:00"
},
{
- "name": "phpunit/php-code-coverage",
- "version": "10.0.0",
+ "name": "react/child-process",
+ "version": "v0.6.5",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "bf4fbc9c13af7da12b3ea807574fb460f255daba"
+ "url": "https://github.com/reactphp/child-process.git",
+ "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bf4fbc9c13af7da12b3ea807574fb460f255daba",
- "reference": "bf4fbc9c13af7da12b3ea807574fb460f255daba",
+ "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+ "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
"shasum": ""
},
"require": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "ext-xmlwriter": "*",
- "nikic/php-parser": "^4.14",
- "php": ">=8.1",
- "phpunit/php-file-iterator": "^4.0",
- "phpunit/php-text-template": "^3.0",
- "sebastian/code-unit-reverse-lookup": "^3.0",
- "sebastian/complexity": "^3.0",
- "sebastian/environment": "^6.0",
- "sebastian/lines-of-code": "^2.0",
- "sebastian/version": "^4.0",
- "theseer/tokenizer": "^1.2.0"
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "php": ">=5.3.0",
+ "react/event-loop": "^1.2",
+ "react/stream": "^1.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
- },
- "suggest": {
- "ext-pcov": "*",
- "ext-xdebug": "*"
+ "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+ "react/socket": "^1.8",
+ "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "10.0-dev"
- }
- },
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "React\\ChildProcess\\": "src"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
- "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+ "description": "Event-driven library for executing child processes with ReactPHP.",
"keywords": [
- "coverage",
- "testing",
- "xunit"
+ "event-driven",
+ "process",
+ "reactphp"
],
"support": {
- "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.0"
+ "issues": "https://github.com/reactphp/child-process/issues",
+ "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
},
"funding": [
{
- "url": "https://github.com/sebastianbergmann",
+ "url": "https://github.com/WyriHaximus",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/clue",
"type": "github"
}
],
- "time": "2023-02-03T07:14:34+00:00"
+ "time": "2022-09-16T13:41:56+00:00"
},
{
- "name": "phpunit/php-file-iterator",
- "version": "4.0.1",
+ "name": "react/dns",
+ "version": "v1.13.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd"
+ "url": "https://github.com/reactphp/dns.git",
+ "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
- "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
+ "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+ "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=5.3.0",
+ "react/cache": "^1.0 || ^0.6 || ^0.5",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3.2 || ^2.7 || ^1.2.1"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+ "react/async": "^4.3 || ^3 || ^2",
+ "react/promise-timer": "^1.11"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "4.0-dev"
- }
- },
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "React\\Dns\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "FilterIterator implementation that filters files based on a list of suffixes.",
- "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+ "description": "Async DNS resolver for ReactPHP",
"keywords": [
- "filesystem",
- "iterator"
+ "async",
+ "dns",
+ "dns-resolver",
+ "reactphp"
],
"support": {
- "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
- "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.1"
+ "issues": "https://github.com/reactphp/dns/issues",
+ "source": "https://github.com/reactphp/dns/tree/v1.13.0"
},
"funding": [
{
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
}
],
- "time": "2023-02-10T16:53:14+00:00"
+ "time": "2024-06-13T14:18:03+00:00"
},
{
- "name": "phpunit/php-invoker",
- "version": "4.0.0",
+ "name": "react/event-loop",
+ "version": "v1.5.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-invoker.git",
- "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
+ "url": "https://github.com/reactphp/event-loop.git",
+ "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
- "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+ "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+ "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=5.3.0"
},
"require-dev": {
- "ext-pcntl": "*",
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
},
"suggest": {
- "ext-pcntl": "*"
+ "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "4.0-dev"
- }
- },
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "React\\EventLoop\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "Invoke callables with a timeout",
- "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+ "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
"keywords": [
- "process"
+ "asynchronous",
+ "event-loop"
],
"support": {
- "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
- "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+ "issues": "https://github.com/reactphp/event-loop/issues",
+ "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
},
"funding": [
{
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
}
],
- "time": "2023-02-03T06:56:09+00:00"
+ "time": "2023-11-13T13:48:05+00:00"
},
{
- "name": "phpunit/php-text-template",
- "version": "3.0.0",
+ "name": "react/promise",
+ "version": "v3.2.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d"
+ "url": "https://github.com/reactphp/promise.git",
+ "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
- "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
+ "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
+ "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=7.1.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpstan/phpstan": "1.10.39 || 1.4.10",
+ "phpunit/phpunit": "^9.6 || ^7.5"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "3.0-dev"
- }
- },
"autoload": {
- "classmap": [
- "src/"
- ]
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "React\\Promise\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "Simple template engine.",
- "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+ "description": "A lightweight implementation of CommonJS Promises/A for PHP",
"keywords": [
- "template"
+ "promise",
+ "promises"
],
"support": {
- "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
- "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.0"
+ "issues": "https://github.com/reactphp/promise/issues",
+ "source": "https://github.com/reactphp/promise/tree/v3.2.0"
},
"funding": [
{
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
}
],
- "time": "2023-02-03T06:56:46+00:00"
+ "time": "2024-05-24T10:39:05+00:00"
},
{
- "name": "phpunit/php-timer",
- "version": "6.0.0",
+ "name": "react/socket",
+ "version": "v1.16.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+ "url": "https://github.com/reactphp/socket.git",
+ "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
- "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+ "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+ "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "php": ">=5.3.0",
+ "react/dns": "^1.13",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+ "react/stream": "^1.4"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+ "react/async": "^4.3 || ^3.3 || ^2",
+ "react/promise-stream": "^1.4",
+ "react/promise-timer": "^1.11"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "6.0-dev"
- }
- },
"autoload": {
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "React\\Socket\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "Utility class for timing",
- "homepage": "https://github.com/sebastianbergmann/php-timer/",
+ "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
"keywords": [
- "timer"
+ "Connection",
+ "Socket",
+ "async",
+ "reactphp",
+ "stream"
],
"support": {
- "issues": "https://github.com/sebastianbergmann/php-timer/issues",
- "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+ "issues": "https://github.com/reactphp/socket/issues",
+ "source": "https://github.com/reactphp/socket/tree/v1.16.0"
},
"funding": [
{
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
}
],
- "time": "2023-02-03T06:57:52+00:00"
+ "time": "2024-07-26T10:38:09+00:00"
},
{
- "name": "phpunit/phpunit",
- "version": "10.0.11",
+ "name": "react/stream",
+ "version": "v1.4.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "d18a18b07e7a9ad52d994b1785f9e301fc84b616"
+ "url": "https://github.com/reactphp/stream.git",
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d18a18b07e7a9ad52d994b1785f9e301fc84b616",
- "reference": "d18a18b07e7a9ad52d994b1785f9e301fc84b616",
+ "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
"shasum": ""
},
"require": {
- "ext-dom": "*",
- "ext-json": "*",
- "ext-libxml": "*",
- "ext-mbstring": "*",
- "ext-xml": "*",
- "ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
- "php": ">=8.1",
- "phpunit/php-code-coverage": "^10.0",
- "phpunit/php-file-iterator": "^4.0",
- "phpunit/php-invoker": "^4.0",
- "phpunit/php-text-template": "^3.0",
- "phpunit/php-timer": "^6.0",
- "sebastian/cli-parser": "^2.0",
- "sebastian/code-unit": "^2.0",
- "sebastian/comparator": "^5.0",
- "sebastian/diff": "^5.0",
- "sebastian/environment": "^6.0",
- "sebastian/exporter": "^5.0",
- "sebastian/global-state": "^6.0",
- "sebastian/object-enumerator": "^5.0",
- "sebastian/recursion-context": "^5.0",
- "sebastian/type": "^4.0",
- "sebastian/version": "^4.0"
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "php": ">=5.3.8",
+ "react/event-loop": "^1.2"
},
- "suggest": {
- "ext-soap": "*"
+ "require-dev": {
+ "clue/stream-filter": "~1.2",
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
},
- "bin": [
- "phpunit"
- ],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "10.0-dev"
- }
- },
"autoload": {
- "files": [
- "src/Framework/Assert/Functions.php"
- ],
- "classmap": [
- "src/"
- ]
+ "psr-4": {
+ "React\\Stream\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
- "description": "The PHP Unit Testing framework.",
- "homepage": "https://phpunit.de/",
+ "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
"keywords": [
- "phpunit",
- "testing",
- "xunit"
+ "event-driven",
+ "io",
+ "non-blocking",
+ "pipe",
+ "reactphp",
+ "readable",
+ "stream",
+ "writable"
],
"support": {
- "issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.11"
+ "issues": "https://github.com/reactphp/stream/issues",
+ "source": "https://github.com/reactphp/stream/tree/v1.4.0"
},
"funding": [
{
- "url": "https://phpunit.de/sponsors.html",
- "type": "custom"
- },
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
- "type": "tidelift"
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
}
],
- "time": "2023-02-20T16:39:36+00:00"
+ "time": "2024-06-11T12:45:25+00:00"
},
{
"name": "sebastian/cli-parser",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae"
+ "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae",
- "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae",
+ "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+ "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
"shasum": ""
},
"require": {
@@ -9686,7 +10611,8 @@
"homepage": "https://github.com/sebastianbergmann/cli-parser",
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0"
+ "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
},
"funding": [
{
@@ -9694,7 +10620,7 @@
"type": "github"
}
],
- "time": "2023-02-03T06:58:15+00:00"
+ "time": "2024-03-02T07:12:49+00:00"
},
{
"name": "sebastian/code-unit",
@@ -9809,16 +10735,16 @@
},
{
"name": "sebastian/comparator",
- "version": "5.0.0",
+ "version": "5.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c"
+ "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/72f01e6586e0caf6af81297897bd112eb7e9627c",
- "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+ "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
"shasum": ""
},
"require": {
@@ -9829,7 +10755,7 @@
"sebastian/exporter": "^5.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^10.5"
},
"type": "library",
"extra": {
@@ -9873,7 +10799,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
- "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.0"
+ "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+ "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
},
"funding": [
{
@@ -9881,24 +10808,24 @@
"type": "github"
}
],
- "time": "2023-02-03T07:07:16+00:00"
+ "time": "2024-10-18T14:56:07+00:00"
},
{
"name": "sebastian/complexity",
- "version": "3.0.0",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6"
+ "reference": "68ff824baeae169ec9f2137158ee529584553799"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
- "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+ "reference": "68ff824baeae169ec9f2137158ee529584553799",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.10",
+ "nikic/php-parser": "^4.18 || ^5.0",
"php": ">=8.1"
},
"require-dev": {
@@ -9907,7 +10834,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "3.2-dev"
}
},
"autoload": {
@@ -9930,7 +10857,8 @@
"homepage": "https://github.com/sebastianbergmann/complexity",
"support": {
"issues": "https://github.com/sebastianbergmann/complexity/issues",
- "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.0"
+ "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+ "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
},
"funding": [
{
@@ -9938,20 +10866,20 @@
"type": "github"
}
],
- "time": "2023-02-03T06:59:47+00:00"
+ "time": "2023-12-21T08:37:17+00:00"
},
{
"name": "sebastian/diff",
- "version": "5.0.0",
+ "version": "5.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
+ "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
- "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+ "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
"shasum": ""
},
"require": {
@@ -9959,12 +10887,12 @@
},
"require-dev": {
"phpunit/phpunit": "^10.0",
- "symfony/process": "^4.2 || ^5"
+ "symfony/process": "^6.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.0-dev"
+ "dev-main": "5.1-dev"
}
},
"autoload": {
@@ -9996,7 +10924,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
+ "security": "https://github.com/sebastianbergmann/diff/security/policy",
+ "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
},
"funding": [
{
@@ -10004,20 +10933,20 @@
"type": "github"
}
],
- "time": "2023-02-03T07:00:31+00:00"
+ "time": "2024-03-02T07:15:17+00:00"
},
{
"name": "sebastian/environment",
- "version": "6.0.0",
+ "version": "6.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc"
+ "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b6f3694c6386c7959915a0037652e0c40f6f69cc",
- "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+ "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
"shasum": ""
},
"require": {
@@ -10032,7 +10961,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "6.0-dev"
+ "dev-main": "6.1-dev"
}
},
"autoload": {
@@ -10059,7 +10988,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
- "source": "https://github.com/sebastianbergmann/environment/tree/6.0.0"
+ "security": "https://github.com/sebastianbergmann/environment/security/policy",
+ "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
},
"funding": [
{
@@ -10067,20 +10997,20 @@
"type": "github"
}
],
- "time": "2023-02-03T07:03:04+00:00"
+ "time": "2024-03-23T08:47:14+00:00"
},
{
"name": "sebastian/exporter",
- "version": "5.0.0",
+ "version": "5.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0"
+ "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
- "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+ "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
"shasum": ""
},
"require": {
@@ -10094,7 +11024,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.0-dev"
+ "dev-main": "5.1-dev"
}
},
"autoload": {
@@ -10136,7 +11066,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.0"
+ "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+ "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
},
"funding": [
{
@@ -10144,20 +11075,20 @@
"type": "github"
}
],
- "time": "2023-02-03T07:06:49+00:00"
+ "time": "2024-03-02T07:17:12+00:00"
},
{
"name": "sebastian/global-state",
- "version": "6.0.0",
+ "version": "6.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "aab257c712de87b90194febd52e4d184551c2d44"
+ "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44",
- "reference": "aab257c712de87b90194febd52e4d184551c2d44",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+ "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
"shasum": ""
},
"require": {
@@ -10191,13 +11122,14 @@
}
],
"description": "Snapshotting of global state",
- "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "homepage": "https://www.github.com/sebastianbergmann/global-state",
"keywords": [
"global state"
],
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.0"
+ "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+ "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
},
"funding": [
{
@@ -10205,24 +11137,24 @@
"type": "github"
}
],
- "time": "2023-02-03T07:07:38+00:00"
+ "time": "2024-03-02T07:19:19+00:00"
},
{
"name": "sebastian/lines-of-code",
- "version": "2.0.0",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130"
+ "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/17c4d940ecafb3d15d2cf916f4108f664e28b130",
- "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+ "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.10",
+ "nikic/php-parser": "^4.18 || ^5.0",
"php": ">=8.1"
},
"require-dev": {
@@ -10254,7 +11186,8 @@
"homepage": "https://github.com/sebastianbergmann/lines-of-code",
"support": {
"issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.0"
+ "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
},
"funding": [
{
@@ -10262,7 +11195,7 @@
"type": "github"
}
],
- "time": "2023-02-03T07:08:02+00:00"
+ "time": "2023-12-21T08:38:20+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -10550,16 +11483,16 @@
},
{
"name": "spatie/backtrace",
- "version": "1.2.2",
+ "version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/spatie/backtrace.git",
- "reference": "7b34fee6c1ad45f8ee0498d17cd8ea9a076402c1"
+ "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/backtrace/zipball/7b34fee6c1ad45f8ee0498d17cd8ea9a076402c1",
- "reference": "7b34fee6c1ad45f8ee0498d17cd8ea9a076402c1",
+ "url": "https://api.github.com/repos/spatie/backtrace/zipball/1a9a145b044677ae3424693f7b06479fc8c137a9",
+ "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9",
"shasum": ""
},
"require": {
@@ -10567,7 +11500,9 @@
},
"require-dev": {
"ext-json": "*",
+ "laravel/serializable-closure": "^1.3",
"phpunit/phpunit": "^9.3",
+ "spatie/phpunit-snapshot-assertions": "^4.2",
"symfony/var-dumper": "^5.1"
},
"type": "library",
@@ -10595,7 +11530,7 @@
"spatie"
],
"support": {
- "source": "https://github.com/spatie/backtrace/tree/1.2.2"
+ "source": "https://github.com/spatie/backtrace/tree/1.6.2"
},
"funding": [
{
@@ -10607,43 +11542,117 @@
"type": "other"
}
],
- "time": "2023-02-21T08:29:12+00:00"
+ "time": "2024-07-22T08:21:24+00:00"
+ },
+ {
+ "name": "spatie/error-solutions",
+ "version": "1.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/error-solutions.git",
+ "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/error-solutions/zipball/ae7393122eda72eed7cc4f176d1e96ea444f2d67",
+ "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^8.0"
+ },
+ "require-dev": {
+ "illuminate/broadcasting": "^10.0|^11.0",
+ "illuminate/cache": "^10.0|^11.0",
+ "illuminate/support": "^10.0|^11.0",
+ "livewire/livewire": "^2.11|^3.3.5",
+ "openai-php/client": "^0.10.1",
+ "orchestra/testbench": "^7.0|8.22.3|^9.0",
+ "pestphp/pest": "^2.20",
+ "phpstan/phpstan": "^1.11",
+ "psr/simple-cache": "^3.0",
+ "psr/simple-cache-implementation": "^3.0",
+ "spatie/ray": "^1.28",
+ "symfony/cache": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "vlucas/phpdotenv": "^5.5"
+ },
+ "suggest": {
+ "openai-php/client": "Require get solutions from OpenAI",
+ "simple-cache-implementation": "To cache solutions from OpenAI"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Spatie\\Ignition\\": "legacy/ignition",
+ "Spatie\\ErrorSolutions\\": "src",
+ "Spatie\\LaravelIgnition\\": "legacy/laravel-ignition"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ruben Van Assche",
+ "email": "ruben@spatie.be",
+ "role": "Developer"
+ }
+ ],
+ "description": "This is my package error-solutions",
+ "homepage": "https://github.com/spatie/error-solutions",
+ "keywords": [
+ "error-solutions",
+ "spatie"
+ ],
+ "support": {
+ "issues": "https://github.com/spatie/error-solutions/issues",
+ "source": "https://github.com/spatie/error-solutions/tree/1.1.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/Spatie",
+ "type": "github"
+ }
+ ],
+ "time": "2024-07-25T11:06:04+00:00"
},
{
"name": "spatie/flare-client-php",
- "version": "1.3.5",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/flare-client-php.git",
- "reference": "3e5dd5ac4928f3d2d036bd02de5eb83fd0ef1f42"
+ "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/3e5dd5ac4928f3d2d036bd02de5eb83fd0ef1f42",
- "reference": "3e5dd5ac4928f3d2d036bd02de5eb83fd0ef1f42",
+ "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
+ "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
"shasum": ""
},
"require": {
- "illuminate/pipeline": "^8.0|^9.0|^10.0",
+ "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0",
"php": "^8.0",
- "spatie/backtrace": "^1.2",
- "symfony/http-foundation": "^5.0|^6.0",
- "symfony/mime": "^5.2|^6.0",
- "symfony/process": "^5.2|^6.0",
- "symfony/var-dumper": "^5.2|^6.0"
+ "spatie/backtrace": "^1.6.1",
+ "symfony/http-foundation": "^5.2|^6.0|^7.0",
+ "symfony/mime": "^5.2|^6.0|^7.0",
+ "symfony/process": "^5.2|^6.0|^7.0",
+ "symfony/var-dumper": "^5.2|^6.0|^7.0"
},
"require-dev": {
- "dms/phpunit-arraysubset-asserts": "^0.3.0",
- "pestphp/pest": "^1.20",
+ "dms/phpunit-arraysubset-asserts": "^0.5.0",
+ "pestphp/pest": "^1.20|^2.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
- "spatie/phpunit-snapshot-assertions": "^4.0"
+ "spatie/pest-plugin-snapshots": "^1.0|^2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.1.x-dev"
+ "dev-main": "1.3.x-dev"
}
},
"autoload": {
@@ -10668,7 +11677,7 @@
],
"support": {
"issues": "https://github.com/spatie/flare-client-php/issues",
- "source": "https://github.com/spatie/flare-client-php/tree/1.3.5"
+ "source": "https://github.com/spatie/flare-client-php/tree/1.8.0"
},
"funding": [
{
@@ -10676,42 +11685,51 @@
"type": "github"
}
],
- "time": "2023-01-23T15:58:46+00:00"
+ "time": "2024-08-01T08:27:26+00:00"
},
{
"name": "spatie/ignition",
- "version": "1.4.3",
+ "version": "1.15.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/ignition.git",
- "reference": "2cf3833220cfe8fcf639544f8d7067b6469a00b0"
+ "reference": "e3a68e137371e1eb9edc7f78ffa733f3b98991d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/ignition/zipball/2cf3833220cfe8fcf639544f8d7067b6469a00b0",
- "reference": "2cf3833220cfe8fcf639544f8d7067b6469a00b0",
+ "url": "https://api.github.com/repos/spatie/ignition/zipball/e3a68e137371e1eb9edc7f78ffa733f3b98991d2",
+ "reference": "e3a68e137371e1eb9edc7f78ffa733f3b98991d2",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-mbstring": "*",
"php": "^8.0",
- "spatie/flare-client-php": "^1.1",
- "symfony/console": "^5.4|^6.0",
- "symfony/var-dumper": "^5.4|^6.0"
+ "spatie/error-solutions": "^1.0",
+ "spatie/flare-client-php": "^1.7",
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/var-dumper": "^5.4|^6.0|^7.0"
},
"require-dev": {
+ "illuminate/cache": "^9.52|^10.0|^11.0",
"mockery/mockery": "^1.4",
- "pestphp/pest": "^1.20",
+ "pestphp/pest": "^1.20|^2.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
- "symfony/process": "^5.4|^6.0"
+ "psr/simple-cache-implementation": "*",
+ "symfony/cache": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "vlucas/phpdotenv": "^5.5"
+ },
+ "suggest": {
+ "openai-php/client": "Require get solutions from OpenAI",
+ "simple-cache-implementation": "To cache solutions from OpenAI"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.2.x-dev"
+ "dev-main": "1.5.x-dev"
}
},
"autoload": {
@@ -10750,41 +11768,46 @@
"type": "github"
}
],
- "time": "2023-01-23T15:28:32+00:00"
+ "time": "2024-06-12T14:55:22+00:00"
},
{
"name": "spatie/laravel-ignition",
- "version": "2.0.0",
+ "version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
- "reference": "70c0e2a22c5c4b691a34db8c98bd6d695660a97a"
+ "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/70c0e2a22c5c4b691a34db8c98bd6d695660a97a",
- "reference": "70c0e2a22c5c4b691a34db8c98bd6d695660a97a",
+ "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/3c067b75bfb50574db8f7e2c3978c65eed71126c",
+ "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c",
"shasum": ""
},
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
- "illuminate/support": "^10.0",
+ "illuminate/support": "^10.0|^11.0",
"php": "^8.1",
- "spatie/flare-client-php": "^1.3.5",
- "spatie/ignition": "^1.4.3",
- "symfony/console": "^6.2.3",
- "symfony/var-dumper": "^6.2.3"
+ "spatie/ignition": "^1.15",
+ "symfony/console": "^6.2.3|^7.0",
+ "symfony/var-dumper": "^6.2.3|^7.0"
},
"require-dev": {
- "livewire/livewire": "^2.11",
+ "livewire/livewire": "^2.11|^3.3.5",
"mockery/mockery": "^1.5.1",
- "orchestra/testbench": "^8.0",
- "pestphp/pest": "^1.22.3",
- "phpstan/extension-installer": "^1.2",
+ "openai-php/client": "^0.8.1",
+ "orchestra/testbench": "8.22.3|^9.0",
+ "pestphp/pest": "^2.34",
+ "phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan-deprecation-rules": "^1.1.1",
- "phpstan/phpstan-phpunit": "^1.3.3"
+ "phpstan/phpstan-phpunit": "^1.3.16",
+ "vlucas/phpdotenv": "^5.5"
+ },
+ "suggest": {
+ "openai-php/client": "Require get solutions from OpenAI",
+ "psr/simple-cache-implementation": "Needed to cache solutions from OpenAI"
},
"type": "library",
"extra": {
@@ -10795,9 +11818,6 @@
"aliases": {
"Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
}
- },
- "branch-alias": {
- "dev-main": "2.0-dev"
}
},
"autoload": {
@@ -10839,27 +11859,30 @@
"type": "github"
}
],
- "time": "2023-01-24T07:20:39+00:00"
+ "time": "2024-06-12T15:01:18+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593"
+ "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/e59e8a4006afd7f5654786a83b4fcb8da98f4593",
- "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c835867b3c62bb05c7fe3d637c871c7ae52024d4",
+ "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.8"
},
+ "require-dev": {
+ "symfony/process": "^6.4|^7.0"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -10886,7 +11909,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v6.2.5"
+ "source": "https://github.com/symfony/filesystem/tree/v7.1.6"
},
"funding": [
{
@@ -10902,25 +11925,25 @@
"type": "tidelift"
}
],
- "time": "2023-01-20T17:45:48+00:00"
+ "time": "2024-10-25T15:11:02+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "e8324d44f5af99ec2ccec849934a242f64458f86"
+ "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/e8324d44f5af99ec2ccec849934a242f64458f86",
- "reference": "e8324d44f5af99ec2ccec849934a242f64458f86",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
+ "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.1|^3"
+ "php": ">=8.2",
+ "symfony/deprecation-contracts": "^2.5|^3"
},
"type": "library",
"autoload": {
@@ -10953,7 +11976,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/v6.2.5"
+ "source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
},
"funding": [
{
@@ -10969,30 +11992,27 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
+ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
- "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -11032,7 +12052,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
},
"funding": [
{
@@ -11048,25 +12068,25 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v6.2.5",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "00b6ac156aacffc53487c930e0ab14587a6607f6"
+ "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/00b6ac156aacffc53487c930e0ab14587a6607f6",
- "reference": "00b6ac156aacffc53487c930e0ab14587a6607f6",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8b4a434e6e7faf6adedffb48783a5c75409a1a05",
+ "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/service-contracts": "^1|^2|^3"
+ "php": ">=8.2",
+ "symfony/service-contracts": "^2.5|^3"
},
"type": "library",
"autoload": {
@@ -11094,7 +12114,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/stopwatch/tree/v6.2.5"
+ "source": "https://github.com/symfony/stopwatch/tree/v7.1.6"
},
"funding": [
{
@@ -11110,20 +12130,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:36:55+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.1",
+ "version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+ "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
- "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+ "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
"shasum": ""
},
"require": {
@@ -11152,7 +12172,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
},
"funding": [
{
@@ -11160,7 +12180,7 @@
"type": "github"
}
],
- "time": "2021-07-28T10:34:58+00:00"
+ "time": "2024-03-03T12:36:25+00:00"
}
],
"aliases": [],
@@ -11169,7 +12189,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
- "php": "^8.1 || ^8.2",
+ "php": "^8.2 || ^8.3",
"ext-json": "*",
"ext-mbstring": "*",
"ext-pdo": "*",
@@ -11179,7 +12199,7 @@
},
"platform-dev": [],
"platform-overrides": {
- "php": "8.1.0"
+ "php": "8.2.0"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/config/app.php b/config/app.php
index 0fe07a6124..5a59347b32 100644
--- a/config/app.php
+++ b/config/app.php
@@ -18,9 +18,10 @@
| Application Name
|--------------------------------------------------------------------------
|
- | This value is the name of your application. This value is used when the
+ | This value is the name of your application, which will be used when the
| framework needs to place the application's name in a notification or
- | any other location as required by the application or its packages.
+ | other UI elements where an application name needs to be displayed.
+ |
*/
'name' => env('APP_NAME', 'Pterodactyl'),
@@ -32,7 +33,7 @@
|
| This value determines the "environment" your application is currently
| running in. This may determine how you prefer to configure various
- | services your application utilizes. Set this in your ".env" file.
+ | services the application utilizes. Set this in your ".env" file.
|
*/
@@ -49,7 +50,7 @@
|
*/
- 'debug' => env('APP_DEBUG', false),
+ 'debug' => (bool) env('APP_DEBUG', false),
/*
|--------------------------------------------------------------------------
@@ -58,7 +59,7 @@
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
- | your application so that it is used when running Artisan tasks.
+ | the application so that it's available within Artisan commands.
|
*/
@@ -70,8 +71,8 @@
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
- | will be used by the PHP date and date-time functions. We have gone
- | ahead and set this to a sensible default for you out of the box.
+ | will be used by the PHP date and date-time functions. The timezone
+ | is set to "UTC" by default as it is suitable for most use cases.
|
*/
@@ -83,40 +84,55 @@
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
- | by the translation service provider. You are free to set this value
- | to any of the locales which will be supported by the application.
+ | by Laravel's translation / localization methods. This option can be
+ | set to any locale for which you plan to have translation strings.
|
*/
'locale' => env('APP_LOCALE', 'zh'),
+ 'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
+
+ 'faker_locale' => env('APP_FAKER_LOCALE', 'zh_CN'),
+
/*
|--------------------------------------------------------------------------
- | Application Fallback Locale
+ | Encryption Key
|--------------------------------------------------------------------------
|
- | The fallback locale determines the locale to use when the current one
- | is not available. You may change the value to correspond to any of
- | the language folders that are provided through your application.
+ | This key is utilized by Laravel's encryption services and should be set
+ | to a random, 32 character string to ensure that all encrypted values
+ | are secure. You should do this prior to deploying the application.
|
*/
- 'fallback_locale' => 'zh',
+ 'cipher' => 'AES-256-CBC',
+
+ 'key' => env('APP_KEY'),
+
+ 'previous_keys' => [
+ ...array_filter(
+ explode(',', env('APP_PREVIOUS_KEYS', ''))
+ ),
+ ],
/*
|--------------------------------------------------------------------------
- | Encryption Key
+ | Maintenance Mode Driver
|--------------------------------------------------------------------------
|
- | This key is used by the Illuminate encrypter service and should be set
- | to a random, 32 character string, otherwise these encrypted strings
- | will not be safe. Please do this before deploying an application!
+ | These configuration options determine the driver used to determine and
+ | manage Laravel's "maintenance mode" status. The "cache" driver will
+ | allow maintenance mode to be controlled across multiple machines.
+ |
+ | Supported drivers: "file", "cache"
|
*/
- 'key' => env('APP_KEY'),
-
- 'cipher' => 'AES-256-CBC',
+ 'maintenance' => [
+ 'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
+ 'store' => env('APP_MAINTENANCE_STORE', 'database'),
+ ],
/*
|--------------------------------------------------------------------------
@@ -134,23 +150,6 @@
'report_all' => env('APP_REPORT_ALL_EXCEPTIONS', false),
],
- /*
- |--------------------------------------------------------------------------
- | Maintenance Mode Driver
- |--------------------------------------------------------------------------
- |
- | These configuration options determine the driver used to determine and
- | manage Laravel's "maintenance mode" status. The "cache" driver will
- | allow maintenance mode to be controlled across multiple machines.
- |
- | Supported drivers: "file", "cache"
- |
- */
-
- 'maintenance' => [
- 'driver' => 'file',
- ],
-
/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
diff --git a/config/auth.php b/config/auth.php
index 21e6be7b22..76db065714 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -11,6 +11,7 @@
| password incorrectly.
|
*/
+
'lockout' => [
'time' => 2,
'attempts' => 3,
@@ -21,8 +22,8 @@
| Authentication Defaults
|--------------------------------------------------------------------------
|
- | This option controls the default authentication "guard" and password
- | reset options for your application. You may change these defaults
+ | This option defines the default authentication "guard" and password
+ | reset "broker" for your application. You may change these values
| as required, but they're a perfect start for most applications.
|
*/
@@ -39,11 +40,11 @@
|
| Next, you may define every authentication guard for your application.
| Of course, a great default configuration has been defined for you
- | here which uses session storage and the Eloquent user provider.
+ | which utilizes session storage plus the Eloquent user provider.
|
- | All authentication drivers have a user provider. This defines how the
+ | All authentication guards have a user provider, which defines how the
| users are actually retrieved out of your database or other storage
- | mechanisms used by this application to persist your user's data.
+ | system used by the application. Typically, Eloquent is utilized.
|
| Supported: "session", "token"
|
@@ -66,12 +67,12 @@
| User Providers
|--------------------------------------------------------------------------
|
- | All authentication drivers have a user provider. This defines how the
+ | All authentication guards have a user provider, which defines how the
| users are actually retrieved out of your database or other storage
- | mechanisms used by this application to persist your user's data.
+ | system used by the application. Typically, Eloquent is utilized.
|
| If you have multiple user tables or models you may configure multiple
- | sources which represent each model / table. These sources may then
+ | providers to represent the model / table. These providers may then
| be assigned to any extra authentication guards you have defined.
|
| Supported: "database", "eloquent"
@@ -90,18 +91,18 @@
| Resetting Passwords
|--------------------------------------------------------------------------
|
- | Here you may set the options for resetting passwords including the view
- | that is your password reset e-mail. You may also set the name of the
- | table that maintains all of the reset tokens for your application.
- |
- | You may specify multiple password reset configurations if you have more
- | than one user table or model in the application and you want to have
- | separate password reset settings based on the specific user types.
+ | These configuration options specify the behavior of Laravel's password
+ | reset functionality, including the table utilized for token storage
+ | and the user provider that is invoked to actually retrieve users.
|
- | The expire time is the number of minutes that the reset token should be
+ | The expiry time is the number of minutes that each reset token will be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
+ | The throttle setting is the number of seconds a user must wait before
+ | generating more password reset tokens. This prevents the user from
+ | quickly generating a very large amount of password reset tokens.
+ |
*/
'passwords' => [
@@ -119,10 +120,10 @@
|--------------------------------------------------------------------------
|
| Here you may define the amount of seconds before a password confirmation
- | times out and the user is prompted to re-enter their password via the
+ | window expires and users are asked to re-enter their password via the
| confirmation screen. By default, the timeout lasts for three hours.
|
*/
- 'password_timeout' => 10800,
+ 'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
];
diff --git a/config/cache.php b/config/cache.php
index 14b00b51ba..ce38d79839 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -8,13 +8,13 @@
| Default Cache Store
|--------------------------------------------------------------------------
|
- | This option controls the default cache connection that gets used while
- | using this caching library. This connection is used when another is
- | not explicitly specified when executing a given caching function.
+ | This option controls the default cache store that will be used by the
+ | framework. This connection is utilized if another isn't explicitly
+ | specified when running a cache operation inside the application.
|
*/
- 'default' => env('CACHE_DRIVER', 'redis'),
+ 'default' => env('CACHE_STORE', env('CACHE_DRIVER', 'redis')),
/*
|--------------------------------------------------------------------------
@@ -25,16 +25,12 @@
| well as their drivers. You may even define multiple stores for the
| same cache driver to group types of items stored in your caches.
|
- | Supported drivers: "apc", "array", "database", "file",
- | "memcached", "redis", "dynamodb", "octane", "null"
+ | Supported drivers: "array", "database", "file", "memcached",
+ | "redis", "octane", "null"
|
*/
'stores' => [
- 'apc' => [
- 'driver' => 'apc',
- ],
-
'array' => [
'driver' => 'array',
'serialize' => false,
@@ -42,14 +38,16 @@
'database' => [
'driver' => 'database',
- 'table' => 'cache',
- 'connection' => null,
- 'lock_connection' => null,
+ 'connection' => env('DB_CACHE_CONNECTION'),
+ 'table' => env('DB_CACHE_TABLE', 'cache'),
+ 'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
+ 'lock_table' => env('DB_CACHE_LOCK_TABLE'),
],
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache/data'),
+ 'lock_path' => storage_path('framework/cache/data'),
],
'memcached' => [
@@ -60,7 +58,7 @@
env('MEMCACHED_PASSWORD'),
],
'options' => [
- // Memcached::OPT_CONNECT_TIMEOUT => 2000,
+ // Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'servers' => [
[
@@ -73,8 +71,8 @@
'redis' => [
'driver' => 'redis',
- 'connection' => 'default',
- 'lock_connection' => 'default',
+ 'connection' => env('REDIS_CACHE_CONNECTION', 'default'),
+ 'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
],
'sessions' => [
diff --git a/config/database.php b/config/database.php
index b3a460ba28..6b1a18f10a 100644
--- a/config/database.php
+++ b/config/database.php
@@ -10,8 +10,9 @@
|--------------------------------------------------------------------------
|
| Here you may specify which of the database connections below you wish
- | to use as your default connection for all database work. Of course
- | you may use many connections at once using the Database library.
+ | to use as your default connection for database operations. This is
+ | the connection which will be utilized unless another connection
+ | is explicitly specified when you execute a query / statement.
|
*/
@@ -36,18 +37,44 @@
'connections' => [
'mysql' => [
'driver' => 'mysql',
- 'url' => env('DATABASE_URL'),
+ 'url' => env('DB_URL', env('DATABASE_URL')),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'panel'),
'username' => env('DB_USERNAME', 'pterodactyl'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
- 'charset' => 'utf8mb4',
- 'collation' => 'utf8mb4_unicode_ci',
+ 'charset' => env('DB_CHARSET', 'utf8mb4'),
+ 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
'prefix' => env('DB_PREFIX', ''),
'prefix_indexes' => true,
- 'strict' => env('DB_STRICT_MODE', false),
+ 'strict' => env('DB_STRICT_MODE', false), // TODO: true by default
+ 'engine' => null,
+ 'timezone' => env('DB_TIMEZONE', Time::getMySQLTimezoneOffset(env('APP_TIMEZONE', 'UTC'))),
+ 'sslmode' => env('DB_SSLMODE', 'prefer'),
+ 'options' => extension_loaded('pdo_mysql') ? array_filter([
+ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+ PDO::MYSQL_ATTR_SSL_CERT => env('MYSQL_ATTR_SSL_CERT'),
+ PDO::MYSQL_ATTR_SSL_KEY => env('MYSQL_ATTR_SSL_KEY'),
+ PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => env('MYSQL_ATTR_SSL_VERIFY_SERVER_CERT', true),
+ ]) : [],
+ ],
+
+ 'mariadb' => [
+ 'driver' => 'mariadb',
+ 'url' => env('DB_URL', env('DATABASE_URL')),
+ 'host' => env('DB_HOST', '127.0.0.1'),
+ 'port' => env('DB_PORT', '3306'),
+ 'database' => env('DB_DATABASE', 'panel'),
+ 'username' => env('DB_USERNAME', 'pterodactyl'),
+ 'password' => env('DB_PASSWORD', ''),
+ 'unix_socket' => env('DB_SOCKET', ''),
+ 'charset' => env('DB_CHARSET', 'utf8mb4'),
+ 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
+ 'prefix' => env('DB_PREFIX', ''),
+ 'prefix_indexes' => true,
+ 'strict' => env('DB_STRICT_MODE', true),
+ 'engine' => null,
'timezone' => env('DB_TIMEZONE', Time::getMySQLTimezoneOffset(env('APP_TIMEZONE', 'UTC'))),
'sslmode' => env('DB_SSLMODE', 'prefer'),
'options' => extension_loaded('pdo_mysql') ? array_filter([
@@ -66,11 +93,14 @@
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
- | the migrations on disk haven't actually been run in the database.
+ | the migrations on disk haven't actually been run on the database.
|
*/
- 'migrations' => 'migrations',
+ 'migrations' => [
+ 'table' => 'migrations',
+ 'update_date_on_publish' => true,
+ ],
/*
|--------------------------------------------------------------------------
@@ -78,8 +108,8 @@
|--------------------------------------------------------------------------
|
| Redis is an open source, fast, and advanced key-value store that also
- | provides a richer set of commands than a typical key-value systems
- | such as APC or Memcached. Laravel makes it easy to dig right in.
+ | provides a richer body of commands than a typical key-value system
+ | such as Memcached. You may define your connection settings here.
|
*/
diff --git a/config/filesystems.php b/config/filesystems.php
index 012bd30b05..917a75681f 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -8,7 +8,7 @@
|
| Here you may specify the default filesystem disk that should be used
| by the framework. The "local" disk, as well as a variety of cloud
- | based disks are available to your application. Just store away!
+ | based disks are available to your application for file storage.
|
*/
@@ -19,18 +19,19 @@
| Filesystem Disks
|--------------------------------------------------------------------------
|
- | Here you may configure as many filesystem "disks" as you wish, and you
- | may even configure multiple disks of the same driver. Defaults have
- | been set up for each driver as an example of the required values.
+ | Below you may configure as many filesystem disks as necessary, and you
+ | may even configure multiple disks for the same driver. Examples for
+ | most supported storage drivers are configured here for reference.
|
- | Supported Drivers: "local", "ftp", "sftp", "s3"
+ | Supported drivers: "local", "ftp", "sftp", "s3"
|
*/
'disks' => [
'local' => [
'driver' => 'local',
- 'root' => storage_path('app'),
+ 'root' => storage_path('app/private'),
+ 'serve' => true,
'throw' => false,
],
diff --git a/config/logging.php b/config/logging.php
index b2cdb82da3..4a7a9e0a54 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -3,6 +3,7 @@
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
return [
/*
@@ -10,9 +11,9 @@
| Default Log Channel
|--------------------------------------------------------------------------
|
- | This option defines the default log channel that gets used when writing
- | messages to the logs. The name specified in this option should match
- | one of the channels defined in the "channels" configuration array.
+ | This option defines the default log channel that is utilized to write
+ | messages to your logs. The value provided here should match one of
+ | the channels present in the list of "channels" configured below.
|
*/
@@ -31,7 +32,7 @@
'deprecations' => [
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
- 'trace' => false,
+ 'trace' => env('LOG_DEPRECATIONS_TRACE', false),
],
/*
@@ -39,20 +40,19 @@
| Log Channels
|--------------------------------------------------------------------------
|
- | Here you may configure the log channels for your application. Out of
- | the box, Laravel uses the Monolog PHP logging library. This gives
- | you a variety of powerful log handlers / formatters to utilize.
+ | Here you may configure the log channels for your application. Laravel
+ | utilizes the Monolog PHP logging library, which includes a variety
+ | of powerful log handlers and formatters that you're free to use.
|
- | Available Drivers: "single", "daily", "slack", "syslog",
- | "errorlog", "monolog",
- | "custom", "stack"
+ | Available drivers: "single", "daily", "slack", "syslog",
+ | "errorlog", "monolog", "custom", "stack"
|
*/
'channels' => [
'stack' => [
'driver' => 'stack',
- 'channels' => ['single'],
+ 'channels' => explode(',', env('LOG_STACK', 'single')),
'ignore_exceptions' => false,
],
@@ -60,21 +60,24 @@
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'),
+ 'replace_placeholders' => true,
],
'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'),
- 'days' => 7,
+ 'days' => env('LOG_DAILY_DAYS', 7),
+ 'replace_placeholders' => true,
],
'slack' => [
'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'),
- 'username' => 'Laravel Log',
- 'emoji' => ':boom:',
+ 'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
+ 'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
'level' => env('LOG_LEVEL', 'critical'),
+ 'replace_placeholders' => true,
],
'papertrail' => [
@@ -86,6 +89,7 @@
'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://' . env('PAPERTRAIL_URL') . ':' . env('PAPERTRAIL_PORT'),
],
+ 'processors' => [PsrLogMessageProcessor::class],
],
'stderr' => [
@@ -96,16 +100,20 @@
'with' => [
'stream' => 'php://stderr',
],
+ 'processors' => [PsrLogMessageProcessor::class],
],
'syslog' => [
'driver' => 'syslog',
'level' => env('LOG_LEVEL', 'debug'),
+ 'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
+ 'replace_placeholders' => true,
],
'errorlog' => [
'driver' => 'errorlog',
'level' => env('LOG_LEVEL', 'debug'),
+ 'replace_placeholders' => true,
],
'null' => [
diff --git a/config/mail.php b/config/mail.php
index 71c693cff3..a62b40bdac 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -35,8 +35,8 @@
'mailers' => [
'smtp' => [
'transport' => 'smtp',
- 'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
- 'port' => env('MAIL_PORT', 587),
+ 'host' => env('MAIL_HOST', '127.0.0.1'),
+ 'port' => env('MAIL_PORT', 2525),
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
@@ -84,9 +84,9 @@
| Global "From" Address
|--------------------------------------------------------------------------
|
- | You may wish for all e-mails sent by your application to be sent from
- | the same address. Here, you may specify a name and address that is
- | used globally for all e-mails that are sent by your application.
+ | You may wish for all emails sent by your application to be sent from
+ | the same address. Here you may specify a name and address that is
+ | used globally for all emails that are sent by your application.
|
*/
diff --git a/config/queue.php b/config/queue.php
index 74da2e825f..797be395c9 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -6,9 +6,9 @@
| Default Queue Connection Name
|--------------------------------------------------------------------------
|
- | Laravel's queue API supports an assortment of back-ends via a single
- | API, giving you convenient access to each back-end using the same
- | syntax for every one. Here you may define a default connection.
+ | Laravel's queue supports a variety of backends via a single, unified
+ | API, giving you convenient access to each backend using identical
+ | syntax for each. The default queue connection is defined below.
|
*/
@@ -19,9 +19,11 @@
| Queue Connections
|--------------------------------------------------------------------------
|
- | Here you may configure the connection information for each server that
- | is used by your application. A default configuration has been added
- | for each back-end shipped with Laravel. You are free to add more.
+ | Here you may configure the connection options for every queue backend
+ | used by your application. An example configuration is provided for
+ | each backend supported by Laravel. You're also free to add more.
+ |
+ | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
*/
@@ -32,9 +34,19 @@
'database' => [
'driver' => 'database',
- 'table' => 'jobs',
- 'queue' => env('QUEUE_STANDARD', 'standard'),
- 'retry_after' => 90,
+ 'connection' => env('DB_QUEUE_CONNECTION'),
+ 'table' => env('DB_QUEUE_TABLE', 'jobs'),
+ 'queue' => env('DB_QUEUE', 'standard'),
+ 'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
+ 'after_commit' => false,
+ ],
+
+ 'beanstalkd' => [
+ 'driver' => 'beanstalkd',
+ 'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
+ 'queue' => env('BEANSTALKD_QUEUE', 'default'),
+ 'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
+ 'block_for' => 0,
'after_commit' => false,
],
@@ -43,7 +55,7 @@
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
- 'queue' => env('SQS_QUEUE', env('QUEUE_STANDARD', 'standard')),
+ 'queue' => env('SQS_QUEUE', 'default'),
'suffix' => env('SQS_SUFFIX'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'after_commit' => false,
@@ -51,9 +63,9 @@
'redis' => [
'driver' => 'redis',
- 'connection' => 'default',
+ 'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
'queue' => env('REDIS_QUEUE', env('QUEUE_STANDARD', 'standard')),
- 'retry_after' => 90,
+ 'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
'block_for' => null,
'after_commit' => false,
],
@@ -65,8 +77,10 @@
|--------------------------------------------------------------------------
|
| These options configure the behavior of failed queue job logging so you
- | can control which database and table are used to store the jobs that
- | have failed. You may change them to any database / table you wish.
+ | can control how and where failed jobs are stored. Laravel ships with
+ | support for storing failed jobs in a simple file or in a database.
+ |
+ | Supported drivers: "database-uuids", "dynamodb", "file", "null"
|
*/
diff --git a/config/sanctum.php b/config/sanctum.php
index 21129a888d..ed34382fef 100644
--- a/config/sanctum.php
+++ b/config/sanctum.php
@@ -57,7 +57,8 @@
*/
'middleware' => [
- 'verify_csrf_token' => Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
+ 'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
'encrypt_cookies' => Pterodactyl\Http\Middleware\EncryptCookies::class,
+ 'verify_csrf_token' => Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
],
];
diff --git a/config/services.php b/config/services.php
index 5cc6e06e25..f8360cd32c 100644
--- a/config/services.php
+++ b/config/services.php
@@ -13,13 +13,6 @@
|
*/
- 'mailgun' => [
- 'domain' => env('MAILGUN_DOMAIN'),
- 'secret' => env('MAILGUN_SECRET'),
- 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
- 'scheme' => 'https',
- ],
-
'postmark' => [
'token' => env('POSTMARK_TOKEN'),
],
@@ -29,4 +22,15 @@
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],
+
+ 'resend' => [
+ 'key' => env('RESEND_KEY'),
+ ],
+
+ 'slack' => [
+ 'notifications' => [
+ 'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),
+ 'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
+ ],
+ ],
];
diff --git a/config/session.php b/config/session.php
index d8fb98a099..6b684ceef3 100644
--- a/config/session.php
+++ b/config/session.php
@@ -8,9 +8,9 @@
| Default Session Driver
|--------------------------------------------------------------------------
|
- | This option controls the default session "driver" that will be used on
- | requests. By default, we will use the lightweight native driver but
- | you may specify any of the other wonderful drivers provided here.
+ | This option determines the default session driver that is utilized for
+ | incoming requests. Laravel supports a variety of storage options to
+ | persist session data. Database storage is a great default choice.
|
| Supported: "file", "cookie", "database", "apc",
| "memcached", "redis", "dynamodb", "array"
@@ -26,13 +26,14 @@
|
| Here you may specify the number of minutes that you wish the session
| to be allowed to remain idle before it expires. If you want them
- | to immediately expire on the browser closing, set that option.
+ | to expire immediately when the browser is closed then you may
+ | indicate that via the expire_on_close configuration option.
|
*/
'lifetime' => env('SESSION_LIFETIME', 720),
- 'expire_on_close' => false,
+ 'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
/*
|--------------------------------------------------------------------------
@@ -40,21 +41,21 @@
|--------------------------------------------------------------------------
|
| This option allows you to easily specify that all of your session data
- | should be encrypted before it is stored. All encryption will be run
- | automatically by Laravel and you can use the Session like normal.
+ | should be encrypted before it's stored. All encryption is performed
+ | automatically by Laravel and you may use the session like normal.
|
*/
- 'encrypt' => true,
+ 'encrypt' => env('SESSION_ENCRYPT', true),
/*
|--------------------------------------------------------------------------
| Session File Location
|--------------------------------------------------------------------------
|
- | When using the native session driver, we need a location where session
- | files may be stored. A default has been set for you but a different
- | location may be specified. This is only needed for file sessions.
+ | When utilizing the "file" session driver, the session files are placed
+ | on disk. The default storage location is defined here; however, you
+ | are free to provide another location where they should be stored.
|
*/
@@ -78,22 +79,22 @@
| Session Database Table
|--------------------------------------------------------------------------
|
- | When using the "database" session driver, you may specify the table we
- | should use to manage the sessions. Of course, a sensible default is
- | provided for you; however, you are free to change this as needed.
+ | When using the "database" session driver, you may specify the table to
+ | be used to store sessions. Of course, a sensible default is defined
+ | for you; however, you're welcome to change this to another table.
|
*/
- 'table' => 'sessions',
+ 'table' => env('SESSION_TABLE', 'sessions'),
/*
|--------------------------------------------------------------------------
| Session Cache Store
|--------------------------------------------------------------------------
|
- | While using one of the framework's cache driven session backends you may
- | list a cache store that should be used for these sessions. This value
- | must match with one of the application's configured cache "stores".
+ | When using one of the framework's cache driven session backends, you may
+ | define the cache store which should be used to store the session data
+ | between requests. This must match one of your defined cache stores.
|
| Affects: "apc", "dynamodb", "memcached", "redis"
|
@@ -119,9 +120,9 @@
| Session Cookie Name
|--------------------------------------------------------------------------
|
- | Here you may change the name of the cookie used to identify a session
- | instance by ID. The name specified here will get used every time a
- | new session cookie is created by the framework for every driver.
+ | Here you may change the name of the session cookie that is created by
+ | the framework. Typically, you should not need to change this value
+ | since doing so does not grant a meaningful security improvement.
|
*/
@@ -137,20 +138,20 @@
|
| The session cookie path determines the path for which the cookie will
| be regarded as available. Typically, this will be the root path of
- | your application but you are free to change this when necessary.
+ | your application, but you're free to change this when necessary.
|
*/
- 'path' => '/',
+ 'path' => env('SESSION_PATH', '/'),
/*
|--------------------------------------------------------------------------
| Session Cookie Domain
|--------------------------------------------------------------------------
|
- | Here you may change the domain of the cookie used to identify a session
- | in your application. This will determine which domains the cookie is
- | available to in your application. A sensible default has been set.
+ | This value determines the domain and subdomains the session cookie is
+ | available to. By default, the cookie will be available to the root
+ | domain and all subdomains. Typically, this shouldn't be changed.
|
*/
@@ -176,11 +177,11 @@
|
| Setting this value to true will prevent JavaScript from accessing the
| value of the cookie and the cookie will only be accessible through
- | the HTTP protocol. You are free to modify this option if needed.
+ | the HTTP protocol. It's unlikely you should disable this option.
|
*/
- 'http_only' => true,
+ 'http_only' => env('SESSION_HTTP_ONLY', true),
/*
|--------------------------------------------------------------------------
@@ -189,11 +190,26 @@
|
| This option determines how your cookies behave when cross-site requests
| take place, and can be used to mitigate CSRF attacks. By default, we
- | will set this value to "lax" since this is a secure default value.
+ | will set this value to "lax" to permit secure cross-site requests.
+ |
+ | See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
|
| Supported: "lax", "strict", "none", null
|
*/
- 'same_site' => env('SESSION_SAMESITE_COOKIE', 'lax'),
+ 'same_site' => env('SESSION_SAME_SITE', 'lax'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Partitioned Cookies
+ |--------------------------------------------------------------------------
+ |
+ | Setting this value to true will tie the cookie to the top-level site for
+ | a cross-site context. Partitioned cookies are accepted by the browser
+ | when flagged "secure" and the Same-Site attribute is set to "none".
+ |
+ */
+
+ 'partitioned' => env('SESSION_PARTITIONED_COOKIE', false),
];
diff --git a/database/Seeders/EggSeeder.php b/database/Seeders/EggSeeder.php
index db2884cd23..0a63904a5c 100644
--- a/database/Seeders/EggSeeder.php
+++ b/database/Seeders/EggSeeder.php
@@ -30,7 +30,7 @@ class EggSeeder extends Seeder
*/
public function __construct(
EggImporterService $importerService,
- EggUpdateImporterService $updateImporterService
+ EggUpdateImporterService $updateImporterService,
) {
$this->importerService = $importerService;
$this->updateImporterService = $updateImporterService;
diff --git a/database/Seeders/NestSeeder.php b/database/Seeders/NestSeeder.php
index 12a7853532..49ae4b2143 100644
--- a/database/Seeders/NestSeeder.php
+++ b/database/Seeders/NestSeeder.php
@@ -9,12 +9,12 @@
class NestSeeder extends Seeder
{
/**
- * @var \Pterodactyl\Services\Nests\NestCreationService
+ * @var NestCreationService
*/
private $creationService;
/**
- * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+ * @var NestRepositoryInterface
*/
private $repository;
@@ -23,7 +23,7 @@ class NestSeeder extends Seeder
*/
public function __construct(
NestCreationService $creationService,
- NestRepositoryInterface $repository
+ NestRepositoryInterface $repository,
) {
$this->creationService = $creationService;
$this->repository = $repository;
@@ -51,7 +51,7 @@ public function run()
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
- private function createMinecraftNest(array $nest = null)
+ private function createMinecraftNest(?array $nest = null)
{
if (is_null($nest)) {
$this->creationService->handle([
@@ -66,7 +66,7 @@ private function createMinecraftNest(array $nest = null)
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
- private function createSourceEngineNest(array $nest = null)
+ private function createSourceEngineNest(?array $nest = null)
{
if (is_null($nest)) {
$this->creationService->handle([
@@ -81,7 +81,7 @@ private function createSourceEngineNest(array $nest = null)
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
- private function createVoiceServersNest(array $nest = null)
+ private function createVoiceServersNest(?array $nest = null)
{
if (is_null($nest)) {
$this->creationService->handle([
@@ -96,7 +96,7 @@ private function createVoiceServersNest(array $nest = null)
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
- private function createRustNest(array $nest = null)
+ private function createRustNest(?array $nest = null)
{
if (is_null($nest)) {
$this->creationService->handle([
diff --git a/database/migrations/2016_01_23_195641_add_allocations_table.php b/database/migrations/2016_01_23_195641_add_allocations_table.php
index cfff2b359e..e6306c3b29 100644
--- a/database/migrations/2016_01_23_195641_add_allocations_table.php
+++ b/database/migrations/2016_01_23_195641_add_allocations_table.php
@@ -1,5 +1,6 @@
increments('id');
@@ -23,7 +24,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('allocations');
}
diff --git a/database/migrations/2016_01_23_195851_add_api_keys.php b/database/migrations/2016_01_23_195851_add_api_keys.php
index af7deb62df..1a7824b1c0 100644
--- a/database/migrations/2016_01_23_195851_add_api_keys.php
+++ b/database/migrations/2016_01_23_195851_add_api_keys.php
@@ -1,5 +1,6 @@
increments('id');
@@ -22,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('api_keys');
}
diff --git a/database/migrations/2016_01_23_200044_add_api_permissions.php b/database/migrations/2016_01_23_200044_add_api_permissions.php
index e6f6bcbf86..e587da0a3b 100644
--- a/database/migrations/2016_01_23_200044_add_api_permissions.php
+++ b/database/migrations/2016_01_23_200044_add_api_permissions.php
@@ -1,5 +1,6 @@
increments('id');
@@ -20,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('api_permissions');
}
diff --git a/database/migrations/2016_01_23_200159_add_downloads.php b/database/migrations/2016_01_23_200159_add_downloads.php
index b1771c5e46..9424578fb9 100644
--- a/database/migrations/2016_01_23_200159_add_downloads.php
+++ b/database/migrations/2016_01_23_200159_add_downloads.php
@@ -1,5 +1,6 @@
increments('id');
@@ -22,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('downloads');
}
diff --git a/database/migrations/2016_01_23_200421_create_failed_jobs_table.php b/database/migrations/2016_01_23_200421_create_failed_jobs_table.php
index 83923e7d03..50d42ccc97 100644
--- a/database/migrations/2016_01_23_200421_create_failed_jobs_table.php
+++ b/database/migrations/2016_01_23_200421_create_failed_jobs_table.php
@@ -1,5 +1,6 @@
increments('id');
@@ -22,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('failed_jobs');
}
diff --git a/database/migrations/2016_01_23_200440_create_jobs_table.php b/database/migrations/2016_01_23_200440_create_jobs_table.php
index 277acae31b..fe7f9686c0 100644
--- a/database/migrations/2016_01_23_200440_create_jobs_table.php
+++ b/database/migrations/2016_01_23_200440_create_jobs_table.php
@@ -1,5 +1,6 @@
bigIncrements('id');
@@ -19,6 +20,7 @@ public function up()
$table->unsignedInteger('reserved_at')->nullable();
$table->unsignedInteger('available_at');
$table->unsignedInteger('created_at');
+
$table->index(['queue', 'reserved', 'reserved_at']);
});
}
@@ -26,7 +28,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('jobs');
}
diff --git a/database/migrations/2016_01_23_200528_add_locations.php b/database/migrations/2016_01_23_200528_add_locations.php
index b34a5fbcce..38d1e1710a 100644
--- a/database/migrations/2016_01_23_200528_add_locations.php
+++ b/database/migrations/2016_01_23_200528_add_locations.php
@@ -1,5 +1,6 @@
increments('id');
@@ -21,7 +22,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('locations');
}
diff --git a/database/migrations/2016_01_23_200648_add_nodes.php b/database/migrations/2016_01_23_200648_add_nodes.php
index 52c0a29e68..371ebf0495 100644
--- a/database/migrations/2016_01_23_200648_add_nodes.php
+++ b/database/migrations/2016_01_23_200648_add_nodes.php
@@ -1,5 +1,6 @@
increments('id');
@@ -23,7 +24,7 @@ public function up()
$table->mediumInteger('disk_overallocate')->unsigned()->nullable();
$table->char('daemonSecret', 36)->unique();
$table->smallInteger('daemonListen')->unsigned()->default(8080);
- $table->smallInteger('daemonSFTP')->unsgined()->default(2022);
+ $table->smallInteger('daemonSFTP')->unsigned()->default(2022);
$table->string('daemonBase')->default('/home/daemon-files');
$table->timestamps();
});
@@ -32,7 +33,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('nodes');
}
diff --git a/database/migrations/2016_01_23_201433_add_password_resets.php b/database/migrations/2016_01_23_201433_add_password_resets.php
index 0584e36178..47c49146d8 100644
--- a/database/migrations/2016_01_23_201433_add_password_resets.php
+++ b/database/migrations/2016_01_23_201433_add_password_resets.php
@@ -1,5 +1,6 @@
string('email')->index();
@@ -20,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('password_resets');
}
diff --git a/database/migrations/2016_01_23_201531_add_permissions.php b/database/migrations/2016_01_23_201531_add_permissions.php
index 12c9bbe0fa..120a0e0340 100644
--- a/database/migrations/2016_01_23_201531_add_permissions.php
+++ b/database/migrations/2016_01_23_201531_add_permissions.php
@@ -1,5 +1,6 @@
increments('id');
@@ -22,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('permissions');
}
diff --git a/database/migrations/2016_01_23_201649_add_server_variables.php b/database/migrations/2016_01_23_201649_add_server_variables.php
index d9a436e6d0..596c619d0c 100644
--- a/database/migrations/2016_01_23_201649_add_server_variables.php
+++ b/database/migrations/2016_01_23_201649_add_server_variables.php
@@ -1,5 +1,6 @@
increments('id');
@@ -22,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('server_variables');
}
diff --git a/database/migrations/2016_01_23_201748_add_servers.php b/database/migrations/2016_01_23_201748_add_servers.php
index 5e10610691..901c1ff5c2 100644
--- a/database/migrations/2016_01_23_201748_add_servers.php
+++ b/database/migrations/2016_01_23_201748_add_servers.php
@@ -1,5 +1,6 @@
increments('id');
@@ -39,7 +40,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('servers');
}
diff --git a/database/migrations/2016_01_23_202544_add_service_options.php b/database/migrations/2016_01_23_202544_add_service_options.php
index 7b0a336091..382f67a1a5 100644
--- a/database/migrations/2016_01_23_202544_add_service_options.php
+++ b/database/migrations/2016_01_23_202544_add_service_options.php
@@ -1,5 +1,6 @@
increments('id');
@@ -24,7 +25,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('service_options');
}
diff --git a/database/migrations/2016_01_23_202731_add_service_varibles.php b/database/migrations/2016_01_23_202731_add_service_varibles.php
index e79fa1fe99..bb96d83b6a 100644
--- a/database/migrations/2016_01_23_202731_add_service_varibles.php
+++ b/database/migrations/2016_01_23_202731_add_service_varibles.php
@@ -1,5 +1,6 @@
increments('id');
@@ -28,7 +29,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('service_variables');
}
diff --git a/database/migrations/2016_01_23_202943_add_services.php b/database/migrations/2016_01_23_202943_add_services.php
index 31f7234450..caddd964be 100644
--- a/database/migrations/2016_01_23_202943_add_services.php
+++ b/database/migrations/2016_01_23_202943_add_services.php
@@ -1,5 +1,6 @@
increments('id');
@@ -24,7 +25,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('services');
}
diff --git a/database/migrations/2016_01_23_203119_create_settings_table.php b/database/migrations/2016_01_23_203119_create_settings_table.php
index 2cd6922c2b..40dec55c60 100644
--- a/database/migrations/2016_01_23_203119_create_settings_table.php
+++ b/database/migrations/2016_01_23_203119_create_settings_table.php
@@ -1,5 +1,6 @@
string('key')->unique();
@@ -19,7 +20,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('settings');
}
diff --git a/database/migrations/2016_01_23_203150_add_subusers.php b/database/migrations/2016_01_23_203150_add_subusers.php
index 2f0e463100..e7561c0fd1 100644
--- a/database/migrations/2016_01_23_203150_add_subusers.php
+++ b/database/migrations/2016_01_23_203150_add_subusers.php
@@ -1,5 +1,6 @@
increments('id');
@@ -22,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('subusers');
}
diff --git a/database/migrations/2016_01_23_203159_add_users.php b/database/migrations/2016_01_23_203159_add_users.php
index a1d94ede0f..3de62a68b4 100644
--- a/database/migrations/2016_01_23_203159_add_users.php
+++ b/database/migrations/2016_01_23_203159_add_users.php
@@ -1,5 +1,6 @@
increments('id');
@@ -27,7 +28,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('users');
}
diff --git a/database/migrations/2016_01_23_203947_create_sessions_table.php b/database/migrations/2016_01_23_203947_create_sessions_table.php
index 533fa8aa26..7f708195ea 100644
--- a/database/migrations/2016_01_23_203947_create_sessions_table.php
+++ b/database/migrations/2016_01_23_203947_create_sessions_table.php
@@ -1,5 +1,6 @@
string('id')->unique();
@@ -23,7 +24,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('sessions');
}
diff --git a/database/migrations/2016_01_25_234418_rename_permissions_column.php b/database/migrations/2016_01_25_234418_rename_permissions_column.php
index ae46dceb25..6b75986f93 100644
--- a/database/migrations/2016_01_25_234418_rename_permissions_column.php
+++ b/database/migrations/2016_01_25_234418_rename_permissions_column.php
@@ -1,5 +1,6 @@
renameColumn('permissions', 'permission');
@@ -18,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('permissions', function (Blueprint $table) {
});
diff --git a/database/migrations/2016_02_07_172148_add_databases_tables.php b/database/migrations/2016_02_07_172148_add_databases_tables.php
index 7b1048b15e..26fdbf3892 100644
--- a/database/migrations/2016_02_07_172148_add_databases_tables.php
+++ b/database/migrations/2016_02_07_172148_add_databases_tables.php
@@ -1,5 +1,6 @@
increments('id');
@@ -25,7 +26,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('databases');
}
diff --git a/database/migrations/2016_02_07_181319_add_database_servers_table.php b/database/migrations/2016_02_07_181319_add_database_servers_table.php
index 5a6740ae6e..16d2d3cf5a 100644
--- a/database/migrations/2016_02_07_181319_add_database_servers_table.php
+++ b/database/migrations/2016_02_07_181319_add_database_servers_table.php
@@ -1,5 +1,6 @@
increments('id');
@@ -26,7 +27,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('database_servers');
}
diff --git a/database/migrations/2016_02_13_154306_add_service_option_default_startup.php b/database/migrations/2016_02_13_154306_add_service_option_default_startup.php
index c8255ff474..a5d14b6d55 100644
--- a/database/migrations/2016_02_13_154306_add_service_option_default_startup.php
+++ b/database/migrations/2016_02_13_154306_add_service_option_default_startup.php
@@ -1,5 +1,6 @@
text('executable')->after('docker_image')->nullable()->default(null);
@@ -19,7 +20,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropColumn('executable');
diff --git a/database/migrations/2016_02_20_155318_add_unique_service_field.php b/database/migrations/2016_02_20_155318_add_unique_service_field.php
index 01ff913598..241e278ffb 100644
--- a/database/migrations/2016_02_20_155318_add_unique_service_field.php
+++ b/database/migrations/2016_02_20_155318_add_unique_service_field.php
@@ -1,5 +1,6 @@
string('file')->unique()->change();
@@ -18,10 +19,10 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('services', function (Blueprint $table) {
- $table->dropUnique('services_file_unique');
+ $table->dropUnique(['file']);
});
}
}
diff --git a/database/migrations/2016_02_27_163411_add_tasks_table.php b/database/migrations/2016_02_27_163411_add_tasks_table.php
index f4cb7b1e36..8fb1efb4aa 100644
--- a/database/migrations/2016_02_27_163411_add_tasks_table.php
+++ b/database/migrations/2016_02_27_163411_add_tasks_table.php
@@ -1,5 +1,6 @@
increments('id');
@@ -32,7 +33,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('tasks');
}
diff --git a/database/migrations/2016_02_27_163447_add_tasks_log_table.php b/database/migrations/2016_02_27_163447_add_tasks_log_table.php
index 265e7fd96b..6014a69b81 100644
--- a/database/migrations/2016_02_27_163447_add_tasks_log_table.php
+++ b/database/migrations/2016_02_27_163447_add_tasks_log_table.php
@@ -1,5 +1,6 @@
increments('id');
@@ -23,7 +24,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('tasks_log');
}
diff --git a/database/migrations/2016_08_30_212718_add_ip_alias.php b/database/migrations/2016_08_30_212718_add_ip_alias.php
index 26aa5eaa53..17272a2cc6 100644
--- a/database/migrations/2016_08_30_212718_add_ip_alias.php
+++ b/database/migrations/2016_08_30_212718_add_ip_alias.php
@@ -1,5 +1,6 @@
text('ip_alias')->nullable()->after('ip');
@@ -29,7 +30,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropColumn('ip_alias');
diff --git a/database/migrations/2016_08_30_213301_modify_ip_storage_method.php b/database/migrations/2016_08_30_213301_modify_ip_storage_method.php
index ee7e704fb0..7c8b1d46bf 100644
--- a/database/migrations/2016_08_30_213301_modify_ip_storage_method.php
+++ b/database/migrations/2016_08_30_213301_modify_ip_storage_method.php
@@ -1,5 +1,6 @@
mediumInteger('allocation')->unsigned()->after('oom_disabled');
@@ -47,7 +48,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->text('ip')->after('allocation');
diff --git a/database/migrations/2016_09_01_193520_add_suspension_for_servers.php b/database/migrations/2016_09_01_193520_add_suspension_for_servers.php
index 7bfb75b200..19cd965229 100644
--- a/database/migrations/2016_09_01_193520_add_suspension_for_servers.php
+++ b/database/migrations/2016_09_01_193520_add_suspension_for_servers.php
@@ -1,5 +1,6 @@
tinyInteger('suspended')->unsigned()->default(0)->after('active');
@@ -18,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('suspended');
diff --git a/database/migrations/2016_09_01_211924_remove_active_column.php b/database/migrations/2016_09_01_211924_remove_active_column.php
index 22a2bde136..7450c932d0 100644
--- a/database/migrations/2016_09_01_211924_remove_active_column.php
+++ b/database/migrations/2016_09_01_211924_remove_active_column.php
@@ -1,5 +1,6 @@
dropColumn('active');
@@ -18,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->tinyInteger('active')->after('name')->unsigned()->default(0);
diff --git a/database/migrations/2016_09_02_190647_add_sftp_password_storage.php b/database/migrations/2016_09_02_190647_add_sftp_password_storage.php
index 565957d599..57ce1f3b58 100644
--- a/database/migrations/2016_09_02_190647_add_sftp_password_storage.php
+++ b/database/migrations/2016_09_02_190647_add_sftp_password_storage.php
@@ -1,5 +1,6 @@
text('sftp_password')->after('username')->nullable();
@@ -18,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('sftp_password');
diff --git a/database/migrations/2016_09_04_171338_update_jobs_tables.php b/database/migrations/2016_09_04_171338_update_jobs_tables.php
index 840ecacb58..4c5bff23fd 100644
--- a/database/migrations/2016_09_04_171338_update_jobs_tables.php
+++ b/database/migrations/2016_09_04_171338_update_jobs_tables.php
@@ -9,11 +9,12 @@ class UpdateJobsTables extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('jobs', function (Blueprint $table) {
- $table->dropIndex('jobs_queue_reserved_reserved_at_index');
+ $table->dropIndex(['queue', 'reserved', 'reserved_at']);
$table->dropColumn('reserved');
+
$table->index(['queue', 'reserved_at']);
});
}
@@ -21,10 +22,11 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('jobs', function (Blueprint $table) {
- $table->dropIndex('jobs_queue_reserved_at_index');
+ $table->dropIndex(['queue', 'reserved_at']);
+
$table->tinyInteger('reserved')->unsigned();
$table->index(['queue', 'reserved', 'reserved_at']);
});
diff --git a/database/migrations/2016_09_04_172028_update_failed_jobs_table.php b/database/migrations/2016_09_04_172028_update_failed_jobs_table.php
index a00f5f18d7..b5157a1eff 100644
--- a/database/migrations/2016_09_04_172028_update_failed_jobs_table.php
+++ b/database/migrations/2016_09_04_172028_update_failed_jobs_table.php
@@ -9,7 +9,7 @@ class UpdateFailedJobsTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('failed_jobs', function (Blueprint $table) {
$table->text('exception');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('failed_jobs', function (Blueprint $table) {
$table->dropColumn('exception');
diff --git a/database/migrations/2016_09_04_182835_create_notifications_table.php b/database/migrations/2016_09_04_182835_create_notifications_table.php
index 30fc23a59a..8918f30090 100644
--- a/database/migrations/2016_09_04_182835_create_notifications_table.php
+++ b/database/migrations/2016_09_04_182835_create_notifications_table.php
@@ -1,5 +1,6 @@
string('id')->primary();
@@ -23,7 +24,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('notifications');
}
diff --git a/database/migrations/2016_09_07_163017_add_unique_identifier.php b/database/migrations/2016_09_07_163017_add_unique_identifier.php
index e1bab9ccc0..685a718a46 100644
--- a/database/migrations/2016_09_07_163017_add_unique_identifier.php
+++ b/database/migrations/2016_09_07_163017_add_unique_identifier.php
@@ -9,7 +9,7 @@ class AddUniqueIdentifier extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('services', function (Blueprint $table) {
$table->char('author', 36)->after('id');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('services', function (Blueprint $table) {
$table->dropColumn('author');
diff --git a/database/migrations/2016_09_14_145945_allow_longer_regex_field.php b/database/migrations/2016_09_14_145945_allow_longer_regex_field.php
index a7df1ca1b3..8d0ab04ac4 100644
--- a/database/migrations/2016_09_14_145945_allow_longer_regex_field.php
+++ b/database/migrations/2016_09_14_145945_allow_longer_regex_field.php
@@ -9,7 +9,7 @@ class AllowLongerRegexField extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_variables', function (Blueprint $table) {
$table->text('regex')->change();
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_variables', function (Blueprint $table) {
$table->string('regex')->change();
diff --git a/database/migrations/2016_09_17_194246_add_docker_image_column.php b/database/migrations/2016_09_17_194246_add_docker_image_column.php
index 05d26112ec..0e66f649e3 100644
--- a/database/migrations/2016_09_17_194246_add_docker_image_column.php
+++ b/database/migrations/2016_09_17_194246_add_docker_image_column.php
@@ -1,5 +1,6 @@
string('image')->after('daemonSecret');
@@ -32,7 +33,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('image');
diff --git a/database/migrations/2016_09_21_165554_update_servers_column_name.php b/database/migrations/2016_09_21_165554_update_servers_column_name.php
index 14ae07c4a5..919cdcaab7 100644
--- a/database/migrations/2016_09_21_165554_update_servers_column_name.php
+++ b/database/migrations/2016_09_21_165554_update_servers_column_name.php
@@ -9,7 +9,7 @@ class UpdateServersColumnName extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->renameColumn('server', 'server_id');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->renameColumn('server_id', 'server');
diff --git a/database/migrations/2016_09_29_213518_rename_double_insurgency.php b/database/migrations/2016_09_29_213518_rename_double_insurgency.php
index adb577754c..5f21c70365 100644
--- a/database/migrations/2016_09_29_213518_rename_double_insurgency.php
+++ b/database/migrations/2016_09_29_213518_rename_double_insurgency.php
@@ -7,7 +7,7 @@ class RenameDoubleInsurgency extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::transaction(function () {
$model = DB::table('service_options')->where('parent_service', 2)->where('id', 3)->where('name', 'Insurgency')->first();
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
}
}
diff --git a/database/migrations/2016_10_07_152117_build_api_log_table.php b/database/migrations/2016_10_07_152117_build_api_log_table.php
index 08ea312dcc..39356c5bab 100644
--- a/database/migrations/2016_10_07_152117_build_api_log_table.php
+++ b/database/migrations/2016_10_07_152117_build_api_log_table.php
@@ -9,7 +9,7 @@ class BuildApiLogTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('api_logs', function (Blueprint $table) {
$table->increments('id');
@@ -28,7 +28,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('api_logs');
}
diff --git a/database/migrations/2016_10_14_164802_update_api_keys.php b/database/migrations/2016_10_14_164802_update_api_keys.php
index 56c3e80977..b43eef1b1e 100644
--- a/database/migrations/2016_10_14_164802_update_api_keys.php
+++ b/database/migrations/2016_10_14_164802_update_api_keys.php
@@ -9,7 +9,7 @@ class UpdateApiKeys extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->unsignedInteger('user')->after('id');
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->dropColumn('user');
diff --git a/database/migrations/2016_10_23_181719_update_misnamed_bungee.php b/database/migrations/2016_10_23_181719_update_misnamed_bungee.php
index 70ec18b33e..a9cf3a35cd 100644
--- a/database/migrations/2016_10_23_181719_update_misnamed_bungee.php
+++ b/database/migrations/2016_10_23_181719_update_misnamed_bungee.php
@@ -7,7 +7,7 @@ class UpdateMisnamedBungee extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::table('service_variables')->select('env_variable')->where('env_variable', 'BUNGE_VERSION')->update([
'env_variable' => 'BUNGEE_VERSION',
@@ -17,7 +17,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
}
}
diff --git a/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php b/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php
index 1412720c9a..da0fc7c834 100644
--- a/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php
+++ b/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php
@@ -9,22 +9,21 @@ class AddForeignKeysServers extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- DB::statement('ALTER TABLE servers
- MODIFY COLUMN node INT(10) UNSIGNED NOT NULL,
- MODIFY COLUMN owner INT(10) UNSIGNED NOT NULL,
- MODIFY COLUMN allocation INT(10) UNSIGNED NOT NULL,
- MODIFY COLUMN service INT(10) UNSIGNED NOT NULL,
- MODIFY COLUMN `option` INT(10) UNSIGNED NOT NULL
- ');
-
Schema::table('servers', function (Blueprint $table) {
+ $table->integer('node', false, true)->change();
+ $table->integer('owner', false, true)->change();
+ $table->integer('allocation', false, true)->change();
+ $table->integer('service', false, true)->change();
+ $table->integer('option', false, true)->change();
+
$table->foreign('node')->references('id')->on('nodes');
$table->foreign('owner')->references('id')->on('users');
$table->foreign('allocation')->references('id')->on('allocations');
$table->foreign('service')->references('id')->on('services');
$table->foreign('option')->references('id')->on('service_options');
+
$table->softDeletes();
});
}
@@ -32,30 +31,31 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
- $table->dropForeign('servers_node_foreign');
- $table->dropForeign('servers_owner_foreign');
- $table->dropForeign('servers_allocation_foreign');
- $table->dropForeign('servers_service_foreign');
- $table->dropForeign('servers_option_foreign');
-
- $table->dropIndex('servers_node_foreign');
- $table->dropIndex('servers_owner_foreign');
- $table->dropIndex('servers_allocation_foreign');
- $table->dropIndex('servers_service_foreign');
- $table->dropIndex('servers_option_foreign');
+ $table->dropForeign(['node']);
+ $table->dropIndex(['node']);
+
+ $table->dropForeign(['owner']);
+ $table->dropIndex(['owner']);
+
+ $table->dropForeign(['allocation']);
+ $table->dropIndex(['allocation']);
+
+ $table->dropForeign(['service']);
+ $table->dropIndex(['service']);
+
+ $table->dropForeign(['option']);
+ $table->dropIndex(['option']);
$table->dropColumn('deleted_at');
- });
- DB::statement('ALTER TABLE servers
- MODIFY COLUMN node MEDIUMINT(8) UNSIGNED NOT NULL,
- MODIFY COLUMN owner MEDIUMINT(8) UNSIGNED NOT NULL,
- MODIFY COLUMN allocation MEDIUMINT(8) UNSIGNED NOT NULL,
- MODIFY COLUMN service MEDIUMINT(8) UNSIGNED NOT NULL,
- MODIFY COLUMN `option` MEDIUMINT(8) UNSIGNED NOT NULL
- ');
+ $table->mediumInteger('node', false, true)->change();
+ $table->mediumInteger('owner', false, true)->change();
+ $table->mediumInteger('allocation', false, true)->change();
+ $table->mediumInteger('service', false, true)->change();
+ $table->mediumInteger('option', false, true)->change();
+ });
}
}
diff --git a/database/migrations/2016_10_23_201624_add_foreign_allocations.php b/database/migrations/2016_10_23_201624_add_foreign_allocations.php
index 0660081cb7..7ae4b040dd 100644
--- a/database/migrations/2016_10_23_201624_add_foreign_allocations.php
+++ b/database/migrations/2016_10_23_201624_add_foreign_allocations.php
@@ -1,5 +1,6 @@
integer('assigned_to', false, true)->nullable()->change();
+ $table->integer('node', false, true)->nullable(false)->change();
$table->foreign('assigned_to')->references('id')->on('servers');
$table->foreign('node')->references('id')->on('nodes');
});
@@ -25,14 +23,17 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
- $table->dropForeign('allocations_assigned_to_foreign');
- $table->dropForeign('allocations_node_foreign');
+ $table->dropForeign(['assigned_to']);
+ $table->dropIndex(['assigned_to']);
+
+ $table->dropForeign(['node']);
+ $table->dropIndex(['node']);
- $table->dropIndex('allocations_assigned_to_foreign');
- $table->dropIndex('allocations_node_foreign');
+ $table->mediumInteger('assigned_to', false, true)->nullable()->change();
+ $table->mediumInteger('node', false, true)->nullable(false)->change();
});
DB::statement('ALTER TABLE allocations
diff --git a/database/migrations/2016_10_23_202222_add_foreign_api_keys.php b/database/migrations/2016_10_23_202222_add_foreign_api_keys.php
index 700342d749..44b11d0e5a 100644
--- a/database/migrations/2016_10_23_202222_add_foreign_api_keys.php
+++ b/database/migrations/2016_10_23_202222_add_foreign_api_keys.php
@@ -9,7 +9,7 @@ class AddForeignApiKeys extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->foreign('user')->references('id')->on('users');
@@ -19,11 +19,11 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('api_keys', function (Blueprint $table) {
- $table->dropForeign('api_keys_user_foreign');
- $table->dropIndex('api_keys_user_foreign');
+ $table->dropForeign(['user']);
+ $table->dropIndex(['user']);
});
}
}
diff --git a/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php b/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php
index d8eb3504da..2494eaba7d 100644
--- a/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php
+++ b/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php
@@ -9,11 +9,10 @@ class AddForeignApiPermissions extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- DB::statement('ALTER TABLE api_permissions MODIFY key_id INT(10) UNSIGNED NOT NULL');
-
Schema::table('api_permissions', function (Blueprint $table) {
+ $table->integer('key_id', false, true)->nullable(false)->change();
$table->foreign('key_id')->references('id')->on('api_keys');
});
}
@@ -21,13 +20,13 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('api_permissions', function (Blueprint $table) {
- $table->dropForeign('api_permissions_key_id_foreign');
- $table->dropIndex('api_permissions_key_id_foreign');
- });
+ $table->dropForeign(['key_id']);
+ $table->dropIndex(['key_id']);
- DB::statement('ALTER TABLE api_permissions MODIFY key_id MEDIUMINT(8) UNSIGNED NOT NULL');
+ $table->mediumInteger('key_id', false, true)->nullable(false)->change();
+ });
}
}
diff --git a/database/migrations/2016_10_23_202953_add_foreign_database_servers.php b/database/migrations/2016_10_23_202953_add_foreign_database_servers.php
index 769b7daa3d..78ee8264db 100644
--- a/database/migrations/2016_10_23_202953_add_foreign_database_servers.php
+++ b/database/migrations/2016_10_23_202953_add_foreign_database_servers.php
@@ -9,7 +9,7 @@ class AddForeignDatabaseServers extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('database_servers', function (Blueprint $table) {
$table->foreign('linked_node')->references('id')->on('nodes');
@@ -19,11 +19,11 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('database_servers', function (Blueprint $table) {
- $table->dropForeign('database_servers_linked_node_foreign');
- $table->dropIndex('database_servers_linked_node_foreign');
+ $table->dropForeign(['linked_node']);
+ $table->dropIndex(['linked_node']);
});
}
}
diff --git a/database/migrations/2016_10_23_203105_add_foreign_databases.php b/database/migrations/2016_10_23_203105_add_foreign_databases.php
index be26e3cb01..bea43049bf 100644
--- a/database/migrations/2016_10_23_203105_add_foreign_databases.php
+++ b/database/migrations/2016_10_23_203105_add_foreign_databases.php
@@ -9,7 +9,7 @@ class AddForeignDatabases extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->foreign('server_id')->references('id')->on('servers');
@@ -20,14 +20,14 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('databases', function (Blueprint $table) {
- $table->dropForeign('databases_server_id_foreign');
- $table->dropForeign('databases_db_server_foreign');
+ $table->dropForeign(['server_id']);
+ $table->dropIndex(['server_id']);
- $table->dropIndex('databases_server_id_foreign');
- $table->dropIndex('databases_db_server_foreign');
+ $table->dropForeign(['db_server']);
+ $table->dropIndex(['db_server']);
});
}
}
diff --git a/database/migrations/2016_10_23_203335_add_foreign_nodes.php b/database/migrations/2016_10_23_203335_add_foreign_nodes.php
index f861e0a7d2..375189a7fd 100644
--- a/database/migrations/2016_10_23_203335_add_foreign_nodes.php
+++ b/database/migrations/2016_10_23_203335_add_foreign_nodes.php
@@ -9,11 +9,10 @@ class AddForeignNodes extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- DB::statement('ALTER TABLE nodes MODIFY location INT(10) UNSIGNED NOT NULL');
-
Schema::table('nodes', function (Blueprint $table) {
+ $table->integer('location', false, true)->nullable(false)->change();
$table->foreign('location')->references('id')->on('locations');
});
}
@@ -21,13 +20,13 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
- $table->dropForeign('nodes_location_foreign');
- $table->dropIndex('nodes_location_foreign');
- });
+ $table->dropForeign(['location']);
+ $table->dropIndex(['location']);
- DB::statement('ALTER TABLE nodes MODIFY location MEDIUMINT(10) UNSIGNED NOT NULL');
+ $table->mediumInteger('location', false, true)->nullable(false)->change();
+ });
}
}
diff --git a/database/migrations/2016_10_23_203522_add_foreign_permissions.php b/database/migrations/2016_10_23_203522_add_foreign_permissions.php
index a43f0eacf3..78bbf32a5e 100644
--- a/database/migrations/2016_10_23_203522_add_foreign_permissions.php
+++ b/database/migrations/2016_10_23_203522_add_foreign_permissions.php
@@ -9,7 +9,7 @@ class AddForeignPermissions extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('permissions', function (Blueprint $table) {
$table->foreign('user_id')->references('id')->on('users');
@@ -20,14 +20,14 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('permissions', function (Blueprint $table) {
- $table->dropForeign('permissions_user_id_foreign');
- $table->dropForeign('permissions_server_id_foreign');
+ $table->dropForeign(['user_id']);
+ $table->dropIndex(['user_id']);
- $table->dropIndex('permissions_user_id_foreign');
- $table->dropIndex('permissions_server_id_foreign');
+ $table->dropForeign(['server_id']);
+ $table->dropIndex(['server_id']);
});
}
}
diff --git a/database/migrations/2016_10_23_203857_add_foreign_server_variables.php b/database/migrations/2016_10_23_203857_add_foreign_server_variables.php
index b4720495d4..3ccc3d1835 100644
--- a/database/migrations/2016_10_23_203857_add_foreign_server_variables.php
+++ b/database/migrations/2016_10_23_203857_add_foreign_server_variables.php
@@ -9,14 +9,11 @@ class AddForeignServerVariables extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- DB::statement('ALTER TABLE server_variables
- MODIFY COLUMN server_id INT(10) UNSIGNED NULL,
- MODIFY COLUMN variable_id INT(10) UNSIGNED NOT NULL
- ');
-
Schema::table('server_variables', function (Blueprint $table) {
+ $table->integer('server_id', false, true)->nullable()->change();
+ $table->integer('variable_id', false, true)->nullable(false)->change();
$table->foreign('server_id')->references('id')->on('servers');
$table->foreign('variable_id')->references('id')->on('service_variables');
});
@@ -25,16 +22,13 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('server_variables', function (Blueprint $table) {
$table->dropForeign(['server_id']);
$table->dropForeign(['variable_id']);
+ $table->mediumInteger('server_id', false, true)->nullable()->change();
+ $table->mediumInteger('variable_id', false, true)->nullable(false)->change();
});
-
- DB::statement('ALTER TABLE server_variables
- MODIFY COLUMN server_id MEDIUMINT(8) UNSIGNED NULL,
- MODIFY COLUMN variable_id MEDIUMINT(8) UNSIGNED NOT NULL
- ');
}
}
diff --git a/database/migrations/2016_10_23_204157_add_foreign_service_options.php b/database/migrations/2016_10_23_204157_add_foreign_service_options.php
index cb8c0e2e85..9f01905b7f 100644
--- a/database/migrations/2016_10_23_204157_add_foreign_service_options.php
+++ b/database/migrations/2016_10_23_204157_add_foreign_service_options.php
@@ -9,11 +9,10 @@ class AddForeignServiceOptions extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- DB::statement('ALTER TABLE service_options MODIFY parent_service INT(10) UNSIGNED NOT NULL');
-
Schema::table('service_options', function (Blueprint $table) {
+ $table->integer('parent_service', false, true)->change();
$table->foreign('parent_service')->references('id')->on('services');
});
}
@@ -21,13 +20,13 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
- $table->dropForeign('service_options_parent_service_foreign');
- $table->dropIndex('service_options_parent_service_foreign');
- });
+ $table->dropForeign(['parent_service']);
+ $table->dropIndex(['parent_service']);
- DB::statement('ALTER TABLE service_options MODIFY parent_service MEDIUMINT(8) UNSIGNED NOT NULL');
+ $table->mediumInteger('parent_service', false, true)->change();
+ });
}
}
diff --git a/database/migrations/2016_10_23_204321_add_foreign_service_variables.php b/database/migrations/2016_10_23_204321_add_foreign_service_variables.php
index 02bbc46f28..df998efafa 100644
--- a/database/migrations/2016_10_23_204321_add_foreign_service_variables.php
+++ b/database/migrations/2016_10_23_204321_add_foreign_service_variables.php
@@ -9,11 +9,10 @@ class AddForeignServiceVariables extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- DB::statement('ALTER TABLE service_variables MODIFY option_id INT(10) UNSIGNED NOT NULL');
-
Schema::table('service_variables', function (Blueprint $table) {
+ $table->integer('option_id', false, true)->change();
$table->foreign('option_id')->references('id')->on('service_options');
});
}
@@ -21,13 +20,13 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_variables', function (Blueprint $table) {
- $table->dropForeign('service_variables_option_id_foreign');
- $table->dropIndex('service_variables_option_id_foreign');
- });
+ $table->dropForeign(['option_id']);
+ $table->dropIndex(['option_id']);
- DB::statement('ALTER TABLE service_variables MODIFY option_id MEDIUMINT(8) UNSIGNED NOT NULL');
+ $table->mediumInteger('option_id', false, true)->change();
+ });
}
}
diff --git a/database/migrations/2016_10_23_204454_add_foreign_subusers.php b/database/migrations/2016_10_23_204454_add_foreign_subusers.php
index b637c80ae5..ff4bb95a3e 100644
--- a/database/migrations/2016_10_23_204454_add_foreign_subusers.php
+++ b/database/migrations/2016_10_23_204454_add_foreign_subusers.php
@@ -9,7 +9,7 @@ class AddForeignSubusers extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('subusers', function (Blueprint $table) {
$table->foreign('user_id')->references('id')->on('users');
@@ -20,14 +20,14 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('subusers', function (Blueprint $table) {
- $table->dropForeign('subusers_user_id_foreign');
- $table->dropForeign('subusers_server_id_foreign');
+ $table->dropForeign(['user_id']);
+ $table->dropIndex(['user_id']);
- $table->dropIndex('subusers_user_id_foreign');
- $table->dropIndex('subusers_server_id_foreign');
+ $table->dropForeign(['server_id']);
+ $table->dropIndex(['server_id']);
});
}
}
diff --git a/database/migrations/2016_10_23_204610_add_foreign_tasks.php b/database/migrations/2016_10_23_204610_add_foreign_tasks.php
index 18ea297e54..f32d89230e 100644
--- a/database/migrations/2016_10_23_204610_add_foreign_tasks.php
+++ b/database/migrations/2016_10_23_204610_add_foreign_tasks.php
@@ -9,7 +9,7 @@ class AddForeignTasks extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('tasks', function (Blueprint $table) {
$table->foreign('server')->references('id')->on('servers');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('tasks', function (Blueprint $table) {
$table->dropForeign(['server']);
diff --git a/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php b/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php
index 1547e32cc1..c5fff5523f 100644
--- a/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php
+++ b/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php
@@ -7,7 +7,7 @@ class AddArkServiceOptionFixed extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::transaction(function () {
$service = DB::table('services')->select('id')->where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('name', 'Source Engine')->first();
@@ -73,7 +73,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
DB::transaction(function () {
$service = DB::table('services')->select('id')->where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('name', 'Source Engine')->first();
diff --git a/database/migrations/2016_11_11_220649_add_pack_support.php b/database/migrations/2016_11_11_220649_add_pack_support.php
index b6fa0972ba..8fd638ae6c 100644
--- a/database/migrations/2016_11_11_220649_add_pack_support.php
+++ b/database/migrations/2016_11_11_220649_add_pack_support.php
@@ -9,7 +9,7 @@ class AddPackSupport extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('service_packs', function (Blueprint $table) {
$table->increments('id');
@@ -29,7 +29,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::drop('service_packs');
}
diff --git a/database/migrations/2016_11_11_231731_set_service_name_unique.php b/database/migrations/2016_11_11_231731_set_service_name_unique.php
index 42b0f6953e..261fdb3563 100644
--- a/database/migrations/2016_11_11_231731_set_service_name_unique.php
+++ b/database/migrations/2016_11_11_231731_set_service_name_unique.php
@@ -9,7 +9,7 @@ class SetServiceNameUnique extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('services', function (Blueprint $table) {
$table->unique('name');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('services', function (Blueprint $table) {
$table->dropUnique('services_name_unique');
diff --git a/database/migrations/2016_11_27_142519_add_pack_column.php b/database/migrations/2016_11_27_142519_add_pack_column.php
index d520466a88..3911ecb416 100644
--- a/database/migrations/2016_11_27_142519_add_pack_column.php
+++ b/database/migrations/2016_11_27_142519_add_pack_column.php
@@ -9,7 +9,7 @@ class AddPackColumn extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedInteger('pack')->nullable()->after('option');
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropForeign(['pack']);
diff --git a/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php b/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php
index d2d14f4d00..c5136fe9e4 100644
--- a/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php
+++ b/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php
@@ -9,7 +9,7 @@ class AddConfigurableUploadLimit extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->unsignedInteger('upload_size')->after('disk_overallocate')->default(100);
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->dropColumn('upload_size');
diff --git a/database/migrations/2016_12_02_185206_correct_service_variables.php b/database/migrations/2016_12_02_185206_correct_service_variables.php
index e9c87989ac..d94b3b78bd 100644
--- a/database/migrations/2016_12_02_185206_correct_service_variables.php
+++ b/database/migrations/2016_12_02_185206_correct_service_variables.php
@@ -7,7 +7,7 @@ class CorrectServiceVariables extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::transaction(function () {
// Modify Default Spigot Startup Line
@@ -66,7 +66,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
// do nothing
}
diff --git a/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php b/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php
index 7cdf96807c..35248d6bbd 100644
--- a/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php
+++ b/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php
@@ -7,7 +7,7 @@ class FixMisnamedOptionTag extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::transaction(function () {
DB::table('service_options')->where([
@@ -23,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
DB::table('service_options')->where([
['name', 'Sponge (SpongeVanilla)'],
diff --git a/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php b/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php
index 77693c265a..c4369f975b 100644
--- a/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php
+++ b/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php
@@ -9,7 +9,7 @@ class CreateNodeConfigurationTokensTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('node_configuration_tokens', function (Blueprint $table) {
$table->increments('id');
@@ -24,7 +24,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('node_configuration_tokens');
}
diff --git a/database/migrations/2017_01_12_135449_add_more_user_data.php b/database/migrations/2017_01_12_135449_add_more_user_data.php
index 0206040b50..82ae8c9e97 100644
--- a/database/migrations/2017_01_12_135449_add_more_user_data.php
+++ b/database/migrations/2017_01_12_135449_add_more_user_data.php
@@ -10,7 +10,7 @@ class AddMoreUserData extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->string('name_first')->after('email')->nullable();
@@ -34,7 +34,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('name_first');
diff --git a/database/migrations/2017_02_02_175548_UpdateColumnNames.php b/database/migrations/2017_02_02_175548_UpdateColumnNames.php
index c88aa8de73..7195133130 100644
--- a/database/migrations/2017_02_02_175548_UpdateColumnNames.php
+++ b/database/migrations/2017_02_02_175548_UpdateColumnNames.php
@@ -9,22 +9,15 @@ class UpdateColumnNames extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
- $table->dropForeign('servers_node_foreign');
- $table->dropForeign('servers_owner_foreign');
- $table->dropForeign('servers_allocation_foreign');
- $table->dropForeign('servers_service_foreign');
- $table->dropForeign('servers_option_foreign');
- $table->dropForeign('servers_pack_foreign');
-
- $table->dropIndex('servers_node_foreign');
- $table->dropIndex('servers_owner_foreign');
- $table->dropIndex('servers_allocation_foreign');
- $table->dropIndex('servers_service_foreign');
- $table->dropIndex('servers_option_foreign');
- $table->dropIndex('servers_pack_foreign');
+ $table->dropForeign(['node']);
+ $table->dropForeign(['owner']);
+ $table->dropForeign(['allocation']);
+ $table->dropForeign(['service']);
+ $table->dropForeign(['option']);
+ $table->dropForeign(['pack']);
$table->renameColumn('node', 'node_id');
$table->renameColumn('owner', 'owner_id');
@@ -47,14 +40,10 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
- $table->dropForeign(['node_id']);
- $table->dropForeign(['owner_id']);
- $table->dropForeign(['allocation_id']);
- $table->dropForeign(['service_id']);
- $table->dropForeign(['option_id']);
+ $table->dropForeign(['node_id', 'owner_id', 'allocation_id', 'service_id', 'option_id']);
$table->renameColumn('node_id', 'node');
$table->renameColumn('owner_id', 'owner');
diff --git a/database/migrations/2017_02_03_140948_UpdateNodesTable.php b/database/migrations/2017_02_03_140948_UpdateNodesTable.php
index 58ec63ef4a..e797cc704f 100644
--- a/database/migrations/2017_02_03_140948_UpdateNodesTable.php
+++ b/database/migrations/2017_02_03_140948_UpdateNodesTable.php
@@ -9,11 +9,10 @@ class UpdateNodesTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
- $table->dropForeign('nodes_location_foreign');
- $table->dropIndex('nodes_location_foreign');
+ $table->dropForeign(['location']);
$table->renameColumn('location', 'location_id');
$table->foreign('location_id')->references('id')->on('locations');
@@ -23,11 +22,10 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
- $table->dropForeign('nodes_location_id_foreign');
- $table->dropIndex('nodes_location_id_foreign');
+ $table->dropForeign(['location_id']);
$table->renameColumn('location_id', 'location');
$table->foreign('location')->references('id')->on('locations');
diff --git a/database/migrations/2017_02_03_155554_RenameColumns.php b/database/migrations/2017_02_03_155554_RenameColumns.php
index 5f617abec1..bd50e16bec 100644
--- a/database/migrations/2017_02_03_155554_RenameColumns.php
+++ b/database/migrations/2017_02_03_155554_RenameColumns.php
@@ -9,13 +9,11 @@ class RenameColumns extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('allocations', function (Blueprint $table) {
- $table->dropForeign('allocations_node_foreign');
- $table->dropForeign('allocations_assigned_to_foreign');
- $table->dropIndex('allocations_node_foreign');
- $table->dropIndex('allocations_assigned_to_foreign');
+ $table->dropForeign(['node']);
+ $table->dropForeign(['assigned_to']);
$table->renameColumn('node', 'node_id');
$table->renameColumn('assigned_to', 'server_id');
@@ -27,13 +25,13 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
- $table->dropForeign('allocations_node_id_foreign');
- $table->dropForeign('allocations_server_id_foreign');
- $table->dropIndex('allocations_node_id_foreign');
- $table->dropIndex('allocations_server_id_foreign');
+ $table->dropForeign(['node_id']);
+ $table->dropForeign(['server_id']);
+ $table->dropIndex(['node_id']);
+ $table->dropIndex(['server_id']);
$table->renameColumn('node_id', 'node');
$table->renameColumn('server_id', 'assigned_to');
diff --git a/database/migrations/2017_02_05_164123_AdjustColumnNames.php b/database/migrations/2017_02_05_164123_AdjustColumnNames.php
index c7688f0564..51c8818c7b 100644
--- a/database/migrations/2017_02_05_164123_AdjustColumnNames.php
+++ b/database/migrations/2017_02_05_164123_AdjustColumnNames.php
@@ -9,11 +9,10 @@ class AdjustColumnNames extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_options', function (Blueprint $table) {
- $table->dropForeign('service_options_parent_service_foreign');
- $table->dropIndex('service_options_parent_service_foreign');
+ $table->dropForeign(['parent_service']);
$table->renameColumn('parent_service', 'service_id');
$table->foreign('service_id')->references('id')->on('services');
@@ -23,11 +22,11 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
- $table->dropForeign('service_options_service_id_foreign');
- $table->dropIndex('service_options_service_id_foreign');
+ $table->dropForeign(['service_id']);
+ $table->dropIndex(['service_id']);
$table->renameColumn('service_id', 'parent_service');
$table->foreign('parent_service')->references('id')->on('services');
diff --git a/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php b/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php
index 6f86b3b6e7..69dc33dda2 100644
--- a/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php
+++ b/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php
@@ -9,11 +9,10 @@ class AdjustColumnNamesForServicePacks extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_packs', function (Blueprint $table) {
- $table->dropForeign('service_packs_option_foreign');
- $table->dropIndex('service_packs_option_foreign');
+ $table->dropForeign(['option']);
$table->renameColumn('option', 'option_id');
$table->foreign('option_id')->references('id')->on('service_options');
@@ -23,11 +22,11 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_packs', function (Blueprint $table) {
- $table->dropForeign('service_packs_option_id_foreign');
- $table->dropIndex('service_packs_option_id_foreign');
+ $table->dropForeign(['option_id']);
+ $table->dropIndex(['option_id']);
$table->renameColumn('option_id', 'option');
$table->foreign('option')->references('id')->on('service_options');
diff --git a/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php b/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php
index 45efce83a8..bf6469506b 100644
--- a/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php
+++ b/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php
@@ -11,7 +11,7 @@ class SetupPermissionsPivotTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('permissions', function (Blueprint $table) {
$table->unsignedInteger('subuser_id')->after('id');
@@ -19,17 +19,15 @@ public function up()
DB::transaction(function () {
foreach (Subuser::all() as &$subuser) {
- Permission::where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->update([
+ Permission::query()->where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->update([
'subuser_id' => $subuser->id,
]);
}
});
Schema::table('permissions', function (Blueprint $table) {
- $table->dropForeign('permissions_server_id_foreign');
- $table->dropIndex('permissions_server_id_foreign');
- $table->dropForeign('permissions_user_id_foreign');
- $table->dropIndex('permissions_user_id_foreign');
+ $table->dropForeign(['server_id']);
+ $table->dropForeign(['user_id']);
$table->dropColumn('server_id');
$table->dropColumn('user_id');
@@ -42,7 +40,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('permissions', function (Blueprint $table) {
$table->unsignedInteger('server_id')->after('subuser_id');
@@ -52,7 +50,7 @@ public function down()
DB::transaction(function () {
foreach (Subuser::all() as &$subuser) {
- Permission::where('subuser_id', $subuser->id)->update([
+ Permission::query()->where('subuser_id', $subuser->id)->update([
'user_id' => $subuser->user_id,
'server_id' => $subuser->server_id,
]);
@@ -60,8 +58,8 @@ public function down()
});
Schema::table('permissions', function (Blueprint $table) {
- $table->dropForeign('permissions_subuser_id_foreign');
- $table->dropIndex('permissions_subuser_id_foreign');
+ $table->dropForeign(['subuser_id']);
+ $table->dropIndex(['subuser_id']);
$table->dropColumn('subuser_id');
$table->foreign('server_id')->references('id')->on('servers');
diff --git a/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php b/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php
index 8b541d9415..8ae28c2c95 100644
--- a/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php
+++ b/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php
@@ -9,10 +9,10 @@ class UpdateAPIKeyColumnNames extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('api_keys', function (Blueprint $table) {
- $table->dropForeign('api_keys_user_foreign')->dropIndex('api_keys_user_foreign');
+ $table->dropForeign(['user']);
$table->renameColumn('user', 'user_id');
$table->foreign('user_id')->references('id')->on('users');
@@ -22,10 +22,10 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('api_keys', function (Blueprint $table) {
- $table->dropForeign('api_keys_user_id_foreign')->dropIndex('api_keys_user_id_foreign');
+ $table->dropForeign(['user_id']);
$table->renameColumn('user_id', 'user');
$table->foreign('user')->references('id')->on('users');
diff --git a/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php b/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php
index 4f27346fa4..aab6c2b95a 100644
--- a/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php
+++ b/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php
@@ -9,7 +9,7 @@ class UpdateNodeConfigTokensColumns extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('node_configuration_tokens', function (Blueprint $table) {
$table->dropForeign(['node']);
@@ -23,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('node_configuration_tokens', function (Blueprint $table) {
$table->dropForeign(['node_id']);
diff --git a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
index 6792f265a6..d697a3315f 100644
--- a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
+++ b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
@@ -9,7 +9,7 @@ class DeleteServiceExecutableOption extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('services', function (Blueprint $table) {
$table->renameColumn('file', 'folder');
@@ -22,7 +22,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('services', function (Blueprint $table) {
$table->string('executable')->after('folder');
diff --git a/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php b/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php
index 385004fa46..06c04694cd 100644
--- a/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php
+++ b/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php
@@ -9,7 +9,7 @@ class AddNewServiceOptionsColumns extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropColumn('executable');
@@ -27,7 +27,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropForeign(['config_from']);
diff --git a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
index 7cf5707c44..40aef15246 100644
--- a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
+++ b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
@@ -7,7 +7,7 @@ class MigrateToNewServiceSystem extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::transaction(function () {
$service = DB::table('services')->where('author', config('pterodactyl.service.core'))->where('folder', 'srcds')->first();
@@ -32,7 +32,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
// Not doing reversals right now...
}
diff --git a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
index 21fa514651..3e7e5f18b8 100644
--- a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
+++ b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
@@ -9,7 +9,7 @@ class ChangeServiceVariablesValidationRules extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_variables', function (Blueprint $table) {
$table->renameColumn('regex', 'rules');
@@ -30,7 +30,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_variables', function (Blueprint $table) {
$table->renameColumn('rules', 'regex');
diff --git a/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php b/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
index 3628ba7a4b..26599246cd 100644
--- a/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
+++ b/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
@@ -85,7 +85,7 @@ class Service extends Core {
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('services', function (Blueprint $table) {
$table->text('index_file')->after('startup');
@@ -105,7 +105,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('services', function (Blueprint $table) {
$table->dropColumn('index_file');
diff --git a/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php b/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php
index d01012e41c..f73befdba6 100644
--- a/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php
+++ b/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php
@@ -9,7 +9,7 @@ class RenameServicePacksToSingluarPacks extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_packs', function (Blueprint $table) {
$table->dropForeign(['option_id']);
@@ -25,7 +25,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('packs', function (Blueprint $table) {
$table->dropForeign(['option_id']);
diff --git a/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php b/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php
index b1a8ee3a04..b396954e06 100644
--- a/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php
+++ b/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php
@@ -9,7 +9,7 @@ class AddLockedStatusToTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('packs', function (Blueprint $table) {
$table->boolean('locked')->default(false)->after('visible');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('packs', function (Blueprint $table) {
$table->dropColumn('locked');
diff --git a/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php b/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php
index a7166df9e0..c973faa555 100644
--- a/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php
+++ b/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php
@@ -9,7 +9,7 @@ class ReOrganizeDatabaseServersToDatabaseHost extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('database_servers', function (Blueprint $table) {
$table->dropForeign(['linked_node']);
@@ -27,7 +27,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('database_hosts', function (Blueprint $table) {
$table->dropForeign(['node_id']);
diff --git a/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php b/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php
index bc6fb45c77..2b689c4817 100644
--- a/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php
+++ b/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php
@@ -9,7 +9,7 @@ class CleanupDatabasesDatabase extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropForeign(['db_server']);
@@ -23,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropForeign(['database_host_id']);
diff --git a/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php b/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php
index 3f26a1e34a..bdd1f1a543 100644
--- a/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php
+++ b/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php
@@ -9,7 +9,7 @@ class AddForeignKeyToPacks extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->foreign('pack_id')->references('id')->on('packs');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropForeign(['pack_id']);
diff --git a/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php b/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php
index e8ebcb20dc..69d0445823 100644
--- a/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php
+++ b/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php
@@ -9,7 +9,7 @@ class AddServerDescriptionColumn extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->text('description')->after('name');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('description');
diff --git a/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php b/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php
index 3cd08f1a94..0c193192b2 100644
--- a/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php
+++ b/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php
@@ -9,7 +9,7 @@ class DropDeletedAtColumnFromServers extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('deleted_at');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->timestamp('deleted_at')->nullable();
diff --git a/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php b/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php
index d069e1ba18..68d9492e30 100644
--- a/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php
+++ b/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php
@@ -10,7 +10,7 @@ class UpgradeTaskSystem extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('tasks', function (Blueprint $table) {
$table->dropForeign(['server']);
@@ -33,11 +33,11 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('tasks', function (Blueprint $table) {
-// $table->dropForeign(['server_id']);
-// $table->dropForeign(['user_id']);
+ // $table->dropForeign(['server_id']);
+ // $table->dropForeign(['user_id']);
$table->renameColumn('server_id', 'server');
$table->dropColumn('user_id');
diff --git a/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php b/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php
index ba2f57c41e..96a85be929 100644
--- a/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php
+++ b/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php
@@ -9,7 +9,7 @@ class AddScriptsToServiceOptions extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->text('script_install')->after('startup')->nullable();
@@ -22,7 +22,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropColumn('script_install');
diff --git a/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php b/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php
index 2bc8f27b31..970b417730 100644
--- a/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php
+++ b/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php
@@ -9,7 +9,7 @@ class AddServiceScriptTrackingToServers extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->boolean('skip_scripts')->default(false)->after('description');
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('skip_scripts');
diff --git a/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php b/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php
index 514d17e1c0..8888600fba 100644
--- a/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php
+++ b/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php
@@ -9,7 +9,7 @@ class AddCopyScriptFromColumn extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->unsignedInteger('copy_script_from')->nullable()->after('script_container');
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropForeign(['copy_script_from']);
diff --git a/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php b/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php
index aa5e04498b..96bb9aec55 100644
--- a/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php
+++ b/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php
@@ -9,7 +9,7 @@ class AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->boolean('behind_proxy')->after('scheme')->default(false);
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->dropColumn('behind_proxy');
diff --git a/database/migrations/2017_05_01_141528_DeleteDownloadTable.php b/database/migrations/2017_05_01_141528_DeleteDownloadTable.php
index 7dcae3c6f5..967c12615a 100644
--- a/database/migrations/2017_05_01_141528_DeleteDownloadTable.php
+++ b/database/migrations/2017_05_01_141528_DeleteDownloadTable.php
@@ -9,7 +9,7 @@ class DeleteDownloadTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::dropIfExists('downloads');
}
@@ -17,7 +17,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::create('downloads', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php b/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php
index 90c8c4b1ee..d230bc19ac 100644
--- a/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php
+++ b/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php
@@ -9,7 +9,7 @@ class DeleteNodeConfigurationTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::dropIfExists('node_configuration_tokens');
}
@@ -17,7 +17,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::create('node_configuration_tokens', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2017_06_10_152951_add_external_id_to_users.php b/database/migrations/2017_06_10_152951_add_external_id_to_users.php
index 9ce5057e83..bccfb43fde 100644
--- a/database/migrations/2017_06_10_152951_add_external_id_to_users.php
+++ b/database/migrations/2017_06_10_152951_add_external_id_to_users.php
@@ -9,7 +9,7 @@ class AddExternalIdToUsers extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->unsignedInteger('external_id')->after('id')->nullable()->unique();
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('external_id');
diff --git a/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php b/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php
index a089ab4db3..6f36d0e050 100644
--- a/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php
+++ b/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php
@@ -9,7 +9,7 @@ class ChangeForeignKeyToBeOnCascadeDelete extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('api_permissions', function (Blueprint $table) {
$table->dropForeign(['key_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('api_permissions', function (Blueprint $table) {
$table->dropForeign(['key_id']);
diff --git a/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php b/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php
index 0bfc7d5270..10058c8ccf 100644
--- a/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php
+++ b/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php
@@ -9,7 +9,7 @@ class ChangeUserPermissionsToDeleteOnUserDeletion extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('permissions', function (Blueprint $table) {
$table->dropForeign(['subuser_id']);
@@ -29,7 +29,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('subusers', function (Blueprint $table) {
$table->dropForeign(['user_id']);
diff --git a/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php b/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php
index fb156ba8c1..8ac6eccec5 100644
--- a/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php
+++ b/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php
@@ -9,7 +9,7 @@ class SetAllocationToReferenceNullOnServerDelete extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropForeign(['server_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropForeign(['server_id']);
diff --git a/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php b/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php
index 5ae9a29f95..ca5a4623f1 100644
--- a/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php
+++ b/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php
@@ -9,7 +9,7 @@ class CascadeDeletionWhenAServerOrVariableIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('server_variables', function (Blueprint $table) {
$table->dropForeign(['server_id']);
@@ -23,7 +23,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('server_variables', function (Blueprint $table) {
$table->dropForeign(['server_id']);
diff --git a/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php b/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php
index 89e1102289..cf0a4bba17 100644
--- a/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php
+++ b/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php
@@ -9,7 +9,7 @@ class DeleteTaskWhenParentServerIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('tasks', function (Blueprint $table) {
$table->dropForeign(['server_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
}
}
diff --git a/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php b/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php
index a33b78af6c..0eabe77db5 100644
--- a/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php
+++ b/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php
@@ -9,7 +9,7 @@ class CascadeNullValuesForDatabaseHostWhenNodeIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('database_hosts', function (Blueprint $table) {
$table->dropForeign(['node_id']);
@@ -20,7 +20,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('database_hosts', function (Blueprint $table) {
$table->dropForeign(['node_id']);
diff --git a/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php b/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php
index 77b7f984c9..3fb457dc47 100644
--- a/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php
+++ b/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php
@@ -9,7 +9,7 @@ class AllowNegativeValuesForOverallocation extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->integer('disk_overallocate')->default(0)->nullable(false)->change();
@@ -20,10 +20,10 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
- DB::statement('ALTER TABLE nodes MODIFY disk_overallocate MEDIUMINT UNSIGNED NULL,
+ DB::statement('ALTER TABLE nodes MODIFY disk_overallocate MEDIUMINT UNSIGNED NULL,
MODIFY memory_overallocate MEDIUMINT UNSIGNED NULL');
});
}
diff --git a/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php b/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php
index f7aab7c047..f2d8ad9bf8 100644
--- a/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php
+++ b/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php
@@ -9,7 +9,7 @@ class SetAllocationUnqiueUsingMultipleFields extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->unique(['node_id', 'ip', 'port']);
@@ -19,7 +19,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropForeign(['node_id']);
diff --git a/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php b/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php
index 074f872e0d..fbea750bc6 100644
--- a/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php
+++ b/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php
@@ -9,7 +9,7 @@ class CascadeDeletionWhenAParentServiceIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropForeign(['service_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropForeign(['service_id']);
diff --git a/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php b/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php
index 1b8f1a5677..7c59d801e0 100644
--- a/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php
+++ b/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php
@@ -9,7 +9,7 @@ class RemovePackWhenParentServiceOptionIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('packs', function (Blueprint $table) {
$table->dropForeign(['option_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('packs', function (Blueprint $table) {
$table->dropForeign(['option_id']);
diff --git a/database/migrations/2017_09_10_225749_RenameTasksTableForStructureRefactor.php b/database/migrations/2017_09_10_225749_RenameTasksTableForStructureRefactor.php
index 12eada73c8..14f60b3b65 100644
--- a/database/migrations/2017_09_10_225749_RenameTasksTableForStructureRefactor.php
+++ b/database/migrations/2017_09_10_225749_RenameTasksTableForStructureRefactor.php
@@ -8,7 +8,7 @@ class RenameTasksTableForStructureRefactor extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::rename('tasks', 'tasks_old');
}
@@ -16,7 +16,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::rename('tasks_old', 'tasks');
}
diff --git a/database/migrations/2017_09_10_225941_CreateSchedulesTable.php b/database/migrations/2017_09_10_225941_CreateSchedulesTable.php
index 3d5baa6d3e..588f48c8f5 100644
--- a/database/migrations/2017_09_10_225941_CreateSchedulesTable.php
+++ b/database/migrations/2017_09_10_225941_CreateSchedulesTable.php
@@ -9,7 +9,7 @@ class CreateSchedulesTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('schedules', function (Blueprint $table) {
$table->increments('id');
@@ -32,7 +32,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('schedules');
}
diff --git a/database/migrations/2017_09_10_230309_CreateNewTasksTableForSchedules.php b/database/migrations/2017_09_10_230309_CreateNewTasksTableForSchedules.php
index 9c225a834f..969c153612 100644
--- a/database/migrations/2017_09_10_230309_CreateNewTasksTableForSchedules.php
+++ b/database/migrations/2017_09_10_230309_CreateNewTasksTableForSchedules.php
@@ -9,7 +9,7 @@ class CreateNewTasksTableForSchedules extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('tasks', function (Blueprint $table) {
$table->increments('id');
@@ -29,7 +29,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('tasks');
}
diff --git a/database/migrations/2017_09_11_002938_TransferOldTasksToNewScheduler.php b/database/migrations/2017_09_11_002938_TransferOldTasksToNewScheduler.php
index 2a20ef10e7..4656e272e8 100644
--- a/database/migrations/2017_09_11_002938_TransferOldTasksToNewScheduler.php
+++ b/database/migrations/2017_09_11_002938_TransferOldTasksToNewScheduler.php
@@ -2,6 +2,7 @@
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
@@ -10,40 +11,40 @@ class TransferOldTasksToNewScheduler extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
- $tasks = DB::table('tasks_old')->get();
+ DB::transaction(function () {
+ $tasks = DB::table('tasks_old')->get();
- DB::beginTransaction();
- $tasks->each(function ($task) {
- $schedule = DB::table('schedules')->insertGetId([
- 'server_id' => $task->server_id,
- 'name' => null,
- 'cron_day_of_week' => $task->day_of_week,
- 'cron_day_of_month' => $task->day_of_month,
- 'cron_hour' => $task->hour,
- 'cron_minute' => $task->minute,
- 'is_active' => (bool) $task->active,
- 'is_processing' => false,
- 'last_run_at' => $task->last_run,
- 'next_run_at' => $task->next_run,
- 'created_at' => $task->created_at,
- 'updated_at' => Carbon::now()->toDateTimeString(),
- ]);
+ $tasks->each(function ($task) {
+ $schedule = DB::table('schedules')->insertGetId([
+ 'server_id' => $task->server_id,
+ 'name' => null,
+ 'cron_day_of_week' => $task->day_of_week,
+ 'cron_day_of_month' => $task->day_of_month,
+ 'cron_hour' => $task->hour,
+ 'cron_minute' => $task->minute,
+ 'is_active' => (bool) $task->active,
+ 'is_processing' => false,
+ 'last_run_at' => $task->last_run,
+ 'next_run_at' => $task->next_run,
+ 'created_at' => $task->created_at,
+ 'updated_at' => Carbon::now()->toDateTimeString(),
+ ]);
- DB::table('tasks')->insert([
- 'schedule_id' => $schedule,
- 'sequence_id' => 1,
- 'action' => $task->action,
- 'payload' => $task->data,
- 'time_offset' => 0,
- 'is_queued' => false,
- 'updated_at' => Carbon::now()->toDateTimeString(),
- 'created_at' => Carbon::now()->toDateTimeString(),
- ]);
+ DB::table('tasks')->insert([
+ 'schedule_id' => $schedule,
+ 'sequence_id' => 1,
+ 'action' => $task->action,
+ 'payload' => $task->data,
+ 'time_offset' => 0,
+ 'is_queued' => false,
+ 'updated_at' => Carbon::now()->toDateTimeString(),
+ 'created_at' => Carbon::now()->toDateTimeString(),
+ ]);
- DB::table('tasks_old')->delete($task->id);
- DB::commit();
+ DB::table('tasks_old')->delete($task->id);
+ });
});
Schema::dropIfExists('tasks_old');
@@ -52,7 +53,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::create('tasks_old', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2017_09_13_211810_UpdateOldPermissionsToPointToNewScheduleSystem.php b/database/migrations/2017_09_13_211810_UpdateOldPermissionsToPointToNewScheduleSystem.php
index ba3a8bac0e..7c0c574470 100644
--- a/database/migrations/2017_09_13_211810_UpdateOldPermissionsToPointToNewScheduleSystem.php
+++ b/database/migrations/2017_09_13_211810_UpdateOldPermissionsToPointToNewScheduleSystem.php
@@ -8,7 +8,7 @@ class UpdateOldPermissionsToPointToNewScheduleSystem extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
$permissions = DB::table('permissions')->where('permission', 'like', '%-task%')->get();
foreach ($permissions as $record) {
@@ -26,7 +26,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
$permissions = DB::table('permissions')->where('permission', 'like', '%-schedule%')->get();
foreach ($permissions as $record) {
diff --git a/database/migrations/2017_09_23_170933_CreateDaemonKeysTable.php b/database/migrations/2017_09_23_170933_CreateDaemonKeysTable.php
index cfbfc88b04..64ff02666a 100644
--- a/database/migrations/2017_09_23_170933_CreateDaemonKeysTable.php
+++ b/database/migrations/2017_09_23_170933_CreateDaemonKeysTable.php
@@ -9,7 +9,7 @@ class CreateDaemonKeysTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('daemon_keys', function (Blueprint $table) {
$table->increments('id');
@@ -28,7 +28,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('daemon_keys');
}
diff --git a/database/migrations/2017_09_23_173628_RemoveDaemonSecretFromServersTable.php b/database/migrations/2017_09_23_173628_RemoveDaemonSecretFromServersTable.php
index 84cb2d92bb..b284905a0f 100644
--- a/database/migrations/2017_09_23_173628_RemoveDaemonSecretFromServersTable.php
+++ b/database/migrations/2017_09_23_173628_RemoveDaemonSecretFromServersTable.php
@@ -12,7 +12,7 @@ class RemoveDaemonSecretFromServersTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
$inserts = [];
@@ -41,7 +41,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->char('daemonSecret', 36)->after('startup')->unique();
diff --git a/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php b/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
index d4d2dd695e..9ea90cff28 100644
--- a/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
+++ b/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
@@ -1,6 +1,7 @@
get();
@@ -39,7 +40,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('subusers', function (Blueprint $table) {
$table->char('daemonSecret', 36)->after('server_id');
diff --git a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
index dffa7687aa..aae62921a3 100644
--- a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
+++ b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
@@ -11,7 +11,7 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('services', function (Blueprint $table) {
$table->dropUnique(['name']);
@@ -39,7 +39,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('services', function (Blueprint $table) {
$table->dropColumn('uuid');
diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
index 5c9df79a5e..679a8b5e02 100644
--- a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
+++ b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -11,7 +11,7 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->char('uuid', 36)->after('id');
@@ -40,7 +40,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_options', function (Blueprint $table) {
$table->dropColumn('uuid');
diff --git a/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php b/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php
index 3b19e3d998..9a64abf074 100644
--- a/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php
+++ b/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php
@@ -9,7 +9,7 @@ class CascadeDeletionWhenServiceOptionIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('service_variables', function (Blueprint $table) {
$table->dropForeign(['option_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('service_variables', function (Blueprint $table) {
$table->dropForeign(['option_id']);
diff --git a/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php b/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php
index e7b70136ce..cea7460e63 100644
--- a/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php
+++ b/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php
@@ -1,5 +1,6 @@
dropUnique(['username']);
@@ -22,7 +22,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->string('username')->nullable()->after('image')->unique();
diff --git a/database/migrations/2017_11_11_161922_Add2FaLastAuthorizationTimeColumn.php b/database/migrations/2017_11_11_161922_Add2FaLastAuthorizationTimeColumn.php
index b90b150bd4..b02e326c64 100644
--- a/database/migrations/2017_11_11_161922_Add2FaLastAuthorizationTimeColumn.php
+++ b/database/migrations/2017_11_11_161922_Add2FaLastAuthorizationTimeColumn.php
@@ -12,7 +12,7 @@ class Add2FaLastAuthorizationTimeColumn extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->text('totp_secret')->nullable()->change();
@@ -36,7 +36,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
DB::transaction(function () {
DB::table('users')->get()->each(function ($user) {
diff --git a/database/migrations/2017_11_19_122708_MigratePubPrivFormatToSingleKey.php b/database/migrations/2017_11_19_122708_MigratePubPrivFormatToSingleKey.php
index c2947ee07c..229827dbcc 100644
--- a/database/migrations/2017_11_19_122708_MigratePubPrivFormatToSingleKey.php
+++ b/database/migrations/2017_11_19_122708_MigratePubPrivFormatToSingleKey.php
@@ -1,5 +1,6 @@
get()->each(function ($item) {
try {
$decrypted = Crypt::decrypt($item->secret);
- } catch (DecryptException $exception) {
+ } catch (DecryptException) {
$decrypted = str_random(32);
} finally {
DB::table('api_keys')->where('id', $item->id)->update([
@@ -30,27 +31,41 @@ public function up()
Schema::table('api_keys', function (Blueprint $table) {
$table->dropColumn('public');
- $table->string('secret', 32)->change();
+ $table->renameColumn('secret', 'token');
});
- DB::statement('ALTER TABLE `api_keys` CHANGE `secret` `token` CHAR(32) NOT NULL, ADD UNIQUE INDEX `api_keys_token_unique` (`token`(32))');
+ Schema::table('api_keys', function (Blueprint $table) {
+ $table->char('token', 32)->change();
+ $table->unique('token');
+ });
}
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
- DB::statement('ALTER TABLE `api_keys` CHANGE `token` `secret` TEXT, DROP INDEX `api_keys_token_unique`');
+ Schema::table('api_keys', function (Blueprint $table) {
+ $table->dropUnique(['token']);
+ $table->renameColumn('token', 'secret');
+ });
Schema::table('api_keys', function (Blueprint $table) {
+ $table->dropUnique('token');
+ $table->text('token')->change();
+ });
+
+ Schema::table('api_keys', function (Blueprint $table) {
+ $table->renameColumn('token', 'secret');
+
+ $table->text('secret')->nullable()->change();
$table->char('public', 16)->after('user_id');
});
DB::transaction(function () {
DB::table('api_keys')->get()->each(function ($item) {
DB::table('api_keys')->where('id', $item->id)->update([
- 'public' => str_random(16),
+ 'public' => Str::random(16),
'secret' => Crypt::encrypt($item->secret),
]);
});
diff --git a/database/migrations/2017_12_04_184012_DropAllocationsWhenNodeIsDeleted.php b/database/migrations/2017_12_04_184012_DropAllocationsWhenNodeIsDeleted.php
index d28109598c..9a0cc9114f 100644
--- a/database/migrations/2017_12_04_184012_DropAllocationsWhenNodeIsDeleted.php
+++ b/database/migrations/2017_12_04_184012_DropAllocationsWhenNodeIsDeleted.php
@@ -9,7 +9,7 @@ class DropAllocationsWhenNodeIsDeleted extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropForeign(['node_id']);
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropForeign(['node_id']);
diff --git a/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php b/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php
index 1bdaf6477b..8d639a37a9 100644
--- a/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php
+++ b/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php
@@ -10,7 +10,7 @@ class MigrateSettingsTableToNewFormat extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
DB::table('settings')->truncate();
Schema::table('settings', function (Blueprint $table) {
@@ -21,7 +21,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::table('settings', function (Blueprint $table) {
$table->dropColumn('id');
diff --git a/database/migrations/2018_01_01_122821_AllowNegativeValuesForServerSwap.php b/database/migrations/2018_01_01_122821_AllowNegativeValuesForServerSwap.php
index 8f9938da15..7ccae5d61a 100644
--- a/database/migrations/2018_01_01_122821_AllowNegativeValuesForServerSwap.php
+++ b/database/migrations/2018_01_01_122821_AllowNegativeValuesForServerSwap.php
@@ -8,10 +8,8 @@ class AllowNegativeValuesForServerSwap extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->integer('swap')->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedInteger('swap')->change();
diff --git a/database/migrations/2018_01_11_213943_AddApiKeyPermissionColumns.php b/database/migrations/2018_01_11_213943_AddApiKeyPermissionColumns.php
index adc6d2648f..118a422f4a 100644
--- a/database/migrations/2018_01_11_213943_AddApiKeyPermissionColumns.php
+++ b/database/migrations/2018_01_11_213943_AddApiKeyPermissionColumns.php
@@ -8,10 +8,8 @@ class AddApiKeyPermissionColumns extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::dropIfExists('api_permissions');
@@ -31,10 +29,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::create('api_permissions', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php b/database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php
index 1d36b3648b..f45b5bd85f 100644
--- a/database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php
+++ b/database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php
@@ -9,12 +9,10 @@ class SetupTableForKeyEncryption extends Migration
/**
* Run the migrations.
*
- * @return void
- *
- * @throws \Exception
- * @throws \Throwable
+ * @throws Exception
+ * @throws Throwable
*/
- public function up()
+ public function up(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->char('identifier', 16)->nullable()->unique()->after('user_id');
@@ -29,12 +27,10 @@ public function up()
/**
* Reverse the migrations.
*
- * @return void
- *
- * @throws \Exception
- * @throws \Throwable
+ * @throws Exception
+ * @throws Throwable
*/
- public function down()
+ public function down(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->dropColumn('identifier');
diff --git a/database/migrations/2018_01_13_145209_AddLastUsedAtColumn.php b/database/migrations/2018_01_13_145209_AddLastUsedAtColumn.php
index e0f86b9de8..f78f7a5d16 100644
--- a/database/migrations/2018_01_13_145209_AddLastUsedAtColumn.php
+++ b/database/migrations/2018_01_13_145209_AddLastUsedAtColumn.php
@@ -8,10 +8,8 @@ class AddLastUsedAtColumn extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->unsignedTinyInteger('key_type')->after('user_id')->default(0);
@@ -28,10 +26,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->timestamp('expires_at')->after('memo')->nullable();
diff --git a/database/migrations/2018_02_04_145617_AllowTextInUserExternalId.php b/database/migrations/2018_02_04_145617_AllowTextInUserExternalId.php
index 6a4a04e7d8..6166f016e5 100644
--- a/database/migrations/2018_02_04_145617_AllowTextInUserExternalId.php
+++ b/database/migrations/2018_02_04_145617_AllowTextInUserExternalId.php
@@ -8,10 +8,8 @@ class AllowTextInUserExternalId extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->string('external_id')->nullable()->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->unsignedInteger('external_id')->change();
diff --git a/database/migrations/2018_02_10_151150_remove_unique_index_on_external_id_column.php b/database/migrations/2018_02_10_151150_remove_unique_index_on_external_id_column.php
index b587cdcb06..64dbaf0dca 100644
--- a/database/migrations/2018_02_10_151150_remove_unique_index_on_external_id_column.php
+++ b/database/migrations/2018_02_10_151150_remove_unique_index_on_external_id_column.php
@@ -8,10 +8,8 @@ class RemoveUniqueIndexOnExternalIdColumn extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropUnique(['external_id']);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->unique(['external_id']);
diff --git a/database/migrations/2018_02_17_134254_ensure_unique_allocation_id_on_servers_table.php b/database/migrations/2018_02_17_134254_ensure_unique_allocation_id_on_servers_table.php
index bff7bbfb06..99f1db4549 100644
--- a/database/migrations/2018_02_17_134254_ensure_unique_allocation_id_on_servers_table.php
+++ b/database/migrations/2018_02_17_134254_ensure_unique_allocation_id_on_servers_table.php
@@ -8,10 +8,8 @@ class EnsureUniqueAllocationIdOnServersTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unique(['allocation_id']);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropForeign(['allocation_id']);
diff --git a/database/migrations/2018_02_24_112356_add_external_id_column_to_servers_table.php b/database/migrations/2018_02_24_112356_add_external_id_column_to_servers_table.php
index 2c8af99e22..c7d0f8fd45 100644
--- a/database/migrations/2018_02_24_112356_add_external_id_column_to_servers_table.php
+++ b/database/migrations/2018_02_24_112356_add_external_id_column_to_servers_table.php
@@ -8,10 +8,8 @@ class AddExternalIdColumnToServersTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->string('external_id')->after('id')->nullable()->unique();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('external_id');
diff --git a/database/migrations/2018_02_25_160152_remove_default_null_value_on_table.php b/database/migrations/2018_02_25_160152_remove_default_null_value_on_table.php
index 6469867f25..2db2f375ee 100644
--- a/database/migrations/2018_02_25_160152_remove_default_null_value_on_table.php
+++ b/database/migrations/2018_02_25_160152_remove_default_null_value_on_table.php
@@ -10,10 +10,10 @@ class RemoveDefaultNullValueOnTable extends Migration
/**
* Run the migrations.
*
- * @throws \Exception
- * @throws \Throwable
+ * @throws Exception
+ * @throws Throwable
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->string('external_id')->default(null)->change();
@@ -28,10 +28,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
// This should not be rolled back.
}
diff --git a/database/migrations/2018_02_25_160604_define_unique_index_on_users_external_id.php b/database/migrations/2018_02_25_160604_define_unique_index_on_users_external_id.php
index 0a9b8afe2b..38469af237 100644
--- a/database/migrations/2018_02_25_160604_define_unique_index_on_users_external_id.php
+++ b/database/migrations/2018_02_25_160604_define_unique_index_on_users_external_id.php
@@ -8,10 +8,8 @@ class DefineUniqueIndexOnUsersExternalId extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->index(['external_id']);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropIndex(['external_id']);
diff --git a/database/migrations/2018_03_01_192831_add_database_and_port_limit_columns_to_servers_table.php b/database/migrations/2018_03_01_192831_add_database_and_port_limit_columns_to_servers_table.php
index 4e85e8aebb..00fbd11c2b 100644
--- a/database/migrations/2018_03_01_192831_add_database_and_port_limit_columns_to_servers_table.php
+++ b/database/migrations/2018_03_01_192831_add_database_and_port_limit_columns_to_servers_table.php
@@ -8,10 +8,8 @@ class AddDatabaseAndPortLimitColumnsToServersTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedInteger('database_limit')->after('installed')->nullable()->default(0);
@@ -21,10 +19,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn(['database_limit', 'allocation_limit']);
diff --git a/database/migrations/2018_03_15_124536_add_description_to_nodes.php b/database/migrations/2018_03_15_124536_add_description_to_nodes.php
index 7208a4207c..a5c1b75421 100644
--- a/database/migrations/2018_03_15_124536_add_description_to_nodes.php
+++ b/database/migrations/2018_03_15_124536_add_description_to_nodes.php
@@ -8,10 +8,8 @@ class AddDescriptionToNodes extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->text('description')->after('name');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->dropColumn('description');
diff --git a/database/migrations/2018_05_04_123826_add_maintenance_to_nodes.php b/database/migrations/2018_05_04_123826_add_maintenance_to_nodes.php
index 04fdf000f3..e85eca8cda 100644
--- a/database/migrations/2018_05_04_123826_add_maintenance_to_nodes.php
+++ b/database/migrations/2018_05_04_123826_add_maintenance_to_nodes.php
@@ -8,10 +8,8 @@ class AddMaintenanceToNodes extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->boolean('maintenance_mode')->after('behind_proxy')->default(false);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->dropColumn('maintenance_mode');
diff --git a/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php b/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php
index 1996509407..e7a4089fa0 100644
--- a/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php
+++ b/database/migrations/2018_09_03_143756_allow_egg_variables_to_have_longer_values.php
@@ -8,10 +8,8 @@ class AllowEggVariablesToHaveLongerValues extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('egg_variables', function (Blueprint $table) {
$table->text('default_value')->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('egg_variables', function (Blueprint $table) {
$table->string('default_value')->change();
diff --git a/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php b/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php
index cc90e0e068..a1d581819b 100644
--- a/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php
+++ b/database/migrations/2018_09_03_144005_allow_server_variables_to_have_longer_values.php
@@ -8,10 +8,8 @@ class AllowServerVariablesToHaveLongerValues extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('server_variables', function (Blueprint $table) {
$table->text('variable_value')->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('server_variables', function (Blueprint $table) {
$table->string('variable_value')->change();
diff --git a/database/migrations/2019_03_02_142328_set_allocation_limit_default_null.php b/database/migrations/2019_03_02_142328_set_allocation_limit_default_null.php
index d91ce63720..6d43197dea 100644
--- a/database/migrations/2019_03_02_142328_set_allocation_limit_default_null.php
+++ b/database/migrations/2019_03_02_142328_set_allocation_limit_default_null.php
@@ -8,10 +8,8 @@ class SetAllocationLimitDefaultNull extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedInteger('allocation_limit')->nullable()->default(null)->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedInteger('allocation_limit')->nullable()->default(0)->change();
diff --git a/database/migrations/2019_03_02_151321_fix_unique_index_to_account_for_host.php b/database/migrations/2019_03_02_151321_fix_unique_index_to_account_for_host.php
index 59425aee76..de110a06bc 100644
--- a/database/migrations/2019_03_02_151321_fix_unique_index_to_account_for_host.php
+++ b/database/migrations/2019_03_02_151321_fix_unique_index_to_account_for_host.php
@@ -8,10 +8,8 @@ class FixUniqueIndexToAccountForHost extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropUnique(['database']);
@@ -24,10 +22,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropForeign(['database_host_id']);
diff --git a/database/migrations/2020_03_22_163911_merge_permissions_table_into_subusers.php b/database/migrations/2020_03_22_163911_merge_permissions_table_into_subusers.php
index 27d26674fa..b71189fe02 100644
--- a/database/migrations/2020_03_22_163911_merge_permissions_table_into_subusers.php
+++ b/database/migrations/2020_03_22_163911_merge_permissions_table_into_subusers.php
@@ -61,10 +61,8 @@ class MergePermissionsTableIntoSubusers extends Migration
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('subusers', function (Blueprint $table) {
$table->json('permissions')->nullable()->after('server_id');
@@ -72,7 +70,12 @@ public function up()
$cursor = DB::table('permissions')
->select(['subuser_id'])
- ->selectRaw('GROUP_CONCAT(permission) as permissions')
+ ->when(DB::getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME) === 'mysql', function ($query) {
+ $query->selectRaw('group_concat(permission) as permissions');
+ })
+ ->when(DB::getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME) === 'pgsql', function ($query) {
+ $query->selectRaw("string_agg(permission, ',') as permissions");
+ })
->from('permissions')
->groupBy(['subuser_id'])
->cursor();
@@ -98,10 +101,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
$flipped = array_flip(array_filter(self::$permissionsMap));
diff --git a/database/migrations/2020_03_22_164814_drop_permissions_table.php b/database/migrations/2020_03_22_164814_drop_permissions_table.php
index da9d677a8d..030a8a6bad 100644
--- a/database/migrations/2020_03_22_164814_drop_permissions_table.php
+++ b/database/migrations/2020_03_22_164814_drop_permissions_table.php
@@ -8,20 +8,16 @@ class DropPermissionsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::dropIfExists('permissions');
}
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::create('permissions', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2020_04_03_203624_add_threads_column_to_servers_table.php b/database/migrations/2020_04_03_203624_add_threads_column_to_servers_table.php
index 9b0202cab2..d4c08c5e5f 100644
--- a/database/migrations/2020_04_03_203624_add_threads_column_to_servers_table.php
+++ b/database/migrations/2020_04_03_203624_add_threads_column_to_servers_table.php
@@ -8,10 +8,8 @@ class AddThreadsColumnToServersTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->string('threads')->nullable()->after('cpu');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('threads');
diff --git a/database/migrations/2020_04_03_230614_create_backups_table.php b/database/migrations/2020_04_03_230614_create_backups_table.php
index daa35dd3b5..a8c28d96d5 100644
--- a/database/migrations/2020_04_03_230614_create_backups_table.php
+++ b/database/migrations/2020_04_03_230614_create_backups_table.php
@@ -9,10 +9,8 @@ class CreateBackupsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
$db = config('database.default');
// There exists a backups plugin for the 0.7 version of the Panel. However, it didn't properly
@@ -49,10 +47,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('backups');
}
diff --git a/database/migrations/2020_04_04_131016_add_table_server_transfers.php b/database/migrations/2020_04_04_131016_add_table_server_transfers.php
index 096b5384f4..c9f3e849a9 100644
--- a/database/migrations/2020_04_04_131016_add_table_server_transfers.php
+++ b/database/migrations/2020_04_04_131016_add_table_server_transfers.php
@@ -8,10 +8,8 @@ class AddTableServerTransfers extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
// Nuclear approach to whatever plugins are out there and not properly namespacing their own tables
// leading to constant support requests from people...
@@ -20,13 +18,13 @@ public function up()
Schema::create('server_transfers', function (Blueprint $table) {
$table->increments('id');
$table->integer('server_id')->unsigned();
- $table->tinyInteger('successful')->unsigned()->default(0);
+ $table->boolean('successful')->unsigned()->default(0);
$table->integer('old_node')->unsigned();
$table->integer('new_node')->unsigned();
$table->integer('old_allocation')->unsigned();
$table->integer('new_allocation')->unsigned();
- $table->string('old_additional_allocations')->nullable();
- $table->string('new_additional_allocations')->nullable();
+ $table->json('old_additional_allocations')->nullable();
+ $table->json('new_additional_allocations')->nullable();
$table->timestamps();
$table->foreign('server_id')->references('id')->on('servers')->onDelete('cascade');
@@ -35,10 +33,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('server_transfers');
}
diff --git a/database/migrations/2020_04_10_141024_store_node_tokens_as_encrypted_value.php b/database/migrations/2020_04_10_141024_store_node_tokens_as_encrypted_value.php
index 6544679fe8..2e750dfa21 100644
--- a/database/migrations/2020_04_10_141024_store_node_tokens_as_encrypted_value.php
+++ b/database/migrations/2020_04_10_141024_store_node_tokens_as_encrypted_value.php
@@ -13,11 +13,9 @@ class StoreNodeTokensAsEncryptedValue extends Migration
/**
* Run the migrations.
*
- * @return void
- *
- * @throws \Exception
+ * @throws Exception
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->dropUnique(['daemonSecret']);
@@ -26,14 +24,15 @@ public function up()
Schema::table('nodes', function (Blueprint $table) {
$table->char('uuid', 36)->after('id');
$table->char('daemon_token_id', 16)->after('upload_size');
- $table->renameColumn('daemonSecret', 'daemon_token');
+
+ $table->renameColumn('`daemonSecret`', 'daemon_token');
});
Schema::table('nodes', function (Blueprint $table) {
$table->text('daemon_token')->change();
});
- /** @var \Illuminate\Contracts\Encryption\Encrypter $encrypter */
+ /** @var Encrypter $encrypter */
$encrypter = Container::getInstance()->make(Encrypter::class);
foreach (DB::select('SELECT id, daemon_token FROM nodes') as $datum) {
@@ -53,13 +52,11 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
DB::transaction(function () {
- /** @var \Illuminate\Contracts\Encryption\Encrypter $encrypter */
+ /** @var Encrypter $encrypter */
$encrypter = Container::getInstance()->make(Encrypter::class);
foreach (DB::select('SELECT id, daemon_token_id, daemon_token FROM nodes') as $datum) {
diff --git a/database/migrations/2020_04_17_203438_allow_nullable_descriptions.php b/database/migrations/2020_04_17_203438_allow_nullable_descriptions.php
index dfd55fb423..8c2c149cfd 100644
--- a/database/migrations/2020_04_17_203438_allow_nullable_descriptions.php
+++ b/database/migrations/2020_04_17_203438_allow_nullable_descriptions.php
@@ -8,10 +8,8 @@ class AllowNullableDescriptions extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->text('description')->nullable()->change();
@@ -32,10 +30,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->text('description')->nullable(false)->change();
diff --git a/database/migrations/2020_04_22_055500_add_max_connections_column.php b/database/migrations/2020_04_22_055500_add_max_connections_column.php
index 02253dfd75..57604117c5 100644
--- a/database/migrations/2020_04_22_055500_add_max_connections_column.php
+++ b/database/migrations/2020_04_22_055500_add_max_connections_column.php
@@ -8,10 +8,8 @@ class AddMaxConnectionsColumn extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->integer('max_connections')->nullable()->default(0)->after('password');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropColumn('max_connections');
diff --git a/database/migrations/2020_04_26_111208_add_backup_limit_to_servers.php b/database/migrations/2020_04_26_111208_add_backup_limit_to_servers.php
index b0f859c9fc..af1b72e649 100644
--- a/database/migrations/2020_04_26_111208_add_backup_limit_to_servers.php
+++ b/database/migrations/2020_04_26_111208_add_backup_limit_to_servers.php
@@ -9,10 +9,8 @@ class AddBackupLimitToServers extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
$db = config('database.default');
// Same as in the backups migration, we need to handle that plugin messing with the data structure
@@ -35,10 +33,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('backup_limit');
diff --git a/database/migrations/2020_05_20_234655_add_mounts_table.php b/database/migrations/2020_05_20_234655_add_mounts_table.php
index 09846a0a5d..db3b409d8c 100644
--- a/database/migrations/2020_05_20_234655_add_mounts_table.php
+++ b/database/migrations/2020_05_20_234655_add_mounts_table.php
@@ -8,10 +8,8 @@ class AddMountsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::create('mounts', function (Blueprint $table) {
$table->increments('id')->unique();
@@ -41,10 +39,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('mount_node');
Schema::dropIfExists('egg_mount');
diff --git a/database/migrations/2020_05_21_192756_add_mount_server_table.php b/database/migrations/2020_05_21_192756_add_mount_server_table.php
index 682bd578d9..7d8e9438b2 100644
--- a/database/migrations/2020_05_21_192756_add_mount_server_table.php
+++ b/database/migrations/2020_05_21_192756_add_mount_server_table.php
@@ -8,10 +8,8 @@ class AddMountServerTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::create('mount_server', function (Blueprint $table) {
$table->integer('server_id');
@@ -23,10 +21,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('mount_server');
}
diff --git a/database/migrations/2020_07_02_213612_create_user_recovery_tokens_table.php b/database/migrations/2020_07_02_213612_create_user_recovery_tokens_table.php
index 9b0743af23..11a6f513c7 100644
--- a/database/migrations/2020_07_02_213612_create_user_recovery_tokens_table.php
+++ b/database/migrations/2020_07_02_213612_create_user_recovery_tokens_table.php
@@ -8,10 +8,8 @@ class CreateUserRecoveryTokensTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::create('recovery_tokens', function (Blueprint $table) {
$table->id();
@@ -25,10 +23,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('recovery_tokens');
}
diff --git a/database/migrations/2020_07_09_201845_add_notes_column_for_allocations.php b/database/migrations/2020_07_09_201845_add_notes_column_for_allocations.php
index 711495edfd..a93b48053d 100644
--- a/database/migrations/2020_07_09_201845_add_notes_column_for_allocations.php
+++ b/database/migrations/2020_07_09_201845_add_notes_column_for_allocations.php
@@ -8,10 +8,8 @@ class AddNotesColumnForAllocations extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->string('notes')->nullable()->after('server_id');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('allocations', function (Blueprint $table) {
$table->dropColumn('notes');
diff --git a/database/migrations/2020_08_20_205533_add_backup_state_column_to_backups.php b/database/migrations/2020_08_20_205533_add_backup_state_column_to_backups.php
index 9e6faa42b5..4ac99feddd 100644
--- a/database/migrations/2020_08_20_205533_add_backup_state_column_to_backups.php
+++ b/database/migrations/2020_08_20_205533_add_backup_state_column_to_backups.php
@@ -8,10 +8,8 @@ class AddBackupStateColumnToBackups extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->boolean('is_successful')->after('uuid')->default(true);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->dropColumn('is_successful');
diff --git a/database/migrations/2020_08_22_132500_update_bytes_to_unsigned_bigint.php b/database/migrations/2020_08_22_132500_update_bytes_to_unsigned_bigint.php
index e8e9c38f37..5c4adca1a5 100644
--- a/database/migrations/2020_08_22_132500_update_bytes_to_unsigned_bigint.php
+++ b/database/migrations/2020_08_22_132500_update_bytes_to_unsigned_bigint.php
@@ -8,10 +8,8 @@ class UpdateBytesToUnsignedBigint extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->unsignedBigInteger('bytes')->default(0)->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->integer('bytes')->default(0)->change();
diff --git a/database/migrations/2020_08_23_175331_modify_checksums_column_for_backups.php b/database/migrations/2020_08_23_175331_modify_checksums_column_for_backups.php
index 0de248bfd5..763b204571 100644
--- a/database/migrations/2020_08_23_175331_modify_checksums_column_for_backups.php
+++ b/database/migrations/2020_08_23_175331_modify_checksums_column_for_backups.php
@@ -9,10 +9,8 @@ class ModifyChecksumsColumnForBackups extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->renameColumn('sha256_hash', 'checksum');
@@ -25,10 +23,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->renameColumn('checksum', 'sha256_hash');
diff --git a/database/migrations/2020_09_13_110007_drop_packs_from_servers.php b/database/migrations/2020_09_13_110007_drop_packs_from_servers.php
index 638435a81f..53cba54f50 100644
--- a/database/migrations/2020_09_13_110007_drop_packs_from_servers.php
+++ b/database/migrations/2020_09_13_110007_drop_packs_from_servers.php
@@ -8,10 +8,8 @@ class DropPacksFromServers extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropForeign(['pack_id']);
@@ -21,10 +19,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedInteger('pack_id')->after('egg_id')->nullable();
diff --git a/database/migrations/2020_09_13_110021_drop_packs_from_api_key_permissions.php b/database/migrations/2020_09_13_110021_drop_packs_from_api_key_permissions.php
index 9bcce8d4db..7c051db2cc 100644
--- a/database/migrations/2020_09_13_110021_drop_packs_from_api_key_permissions.php
+++ b/database/migrations/2020_09_13_110021_drop_packs_from_api_key_permissions.php
@@ -8,10 +8,8 @@ class DropPacksFromApiKeyPermissions extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->dropColumn('r_packs');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('api_keys', function (Blueprint $table) {
$table->unsignedTinyInteger('r_packs')->default(0);
diff --git a/database/migrations/2020_09_13_110047_drop_packs_table.php b/database/migrations/2020_09_13_110047_drop_packs_table.php
index 4f83c0f2e7..58194b8fa0 100644
--- a/database/migrations/2020_09_13_110047_drop_packs_table.php
+++ b/database/migrations/2020_09_13_110047_drop_packs_table.php
@@ -8,20 +8,16 @@ class DropPacksTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::dropIfExists('packs');
}
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::create('packs', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2020_09_13_113503_drop_daemon_key_table.php b/database/migrations/2020_09_13_113503_drop_daemon_key_table.php
index 7b90d41b9b..274f9fd979 100644
--- a/database/migrations/2020_09_13_113503_drop_daemon_key_table.php
+++ b/database/migrations/2020_09_13_113503_drop_daemon_key_table.php
@@ -8,20 +8,16 @@ class DropDaemonKeyTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::dropIfExists('daemon_keys');
}
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::create('daemon_keys', function (Blueprint $table) {
$table->increments('id');
diff --git a/database/migrations/2020_10_10_165437_change_unique_database_name_to_account_for_server.php b/database/migrations/2020_10_10_165437_change_unique_database_name_to_account_for_server.php
index 7420989a71..6a277e4495 100644
--- a/database/migrations/2020_10_10_165437_change_unique_database_name_to_account_for_server.php
+++ b/database/migrations/2020_10_10_165437_change_unique_database_name_to_account_for_server.php
@@ -8,10 +8,8 @@ class ChangeUniqueDatabaseNameToAccountForServer extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropUnique(['database_host_id', 'database']);
@@ -24,10 +22,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('databases', function (Blueprint $table) {
$table->dropUnique(['database_host_id', 'server_id', 'database']);
diff --git a/database/migrations/2020_10_26_194904_remove_nullable_from_schedule_name_field.php b/database/migrations/2020_10_26_194904_remove_nullable_from_schedule_name_field.php
index 69593e656e..d0b3118e5a 100644
--- a/database/migrations/2020_10_26_194904_remove_nullable_from_schedule_name_field.php
+++ b/database/migrations/2020_10_26_194904_remove_nullable_from_schedule_name_field.php
@@ -9,10 +9,8 @@ class RemoveNullableFromScheduleNameField extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
DB::update("UPDATE schedules SET name = 'Schedule' WHERE name IS NULL OR name = ''");
@@ -23,10 +21,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('schedules', function (Blueprint $table) {
$table->string('name')->nullable()->change();
diff --git a/database/migrations/2020_11_02_201014_add_features_column_to_eggs.php b/database/migrations/2020_11_02_201014_add_features_column_to_eggs.php
index 1a001ae988..e134fe9a61 100644
--- a/database/migrations/2020_11_02_201014_add_features_column_to_eggs.php
+++ b/database/migrations/2020_11_02_201014_add_features_column_to_eggs.php
@@ -8,10 +8,8 @@ class AddFeaturesColumnToEggs extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->json('features')->after('description')->nullable();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('features');
diff --git a/database/migrations/2020_12_12_102435_support_multiple_docker_images_and_updates.php b/database/migrations/2020_12_12_102435_support_multiple_docker_images_and_updates.php
index 776d3c6ba2..c7d2cff7f4 100644
--- a/database/migrations/2020_12_12_102435_support_multiple_docker_images_and_updates.php
+++ b/database/migrations/2020_12_12_102435_support_multiple_docker_images_and_updates.php
@@ -9,19 +9,22 @@ class SupportMultipleDockerImagesAndUpdates extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->json('docker_images')->after('docker_image')->nullable();
$table->text('update_url')->after('docker_images')->nullable();
});
- Schema::table('eggs', function (Blueprint $table) {
- DB::statement('UPDATE `eggs` SET `docker_images` = JSON_ARRAY(docker_image)');
- });
+ switch (DB::getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+ case 'mysql':
+ DB::table('eggs')->update(['docker_images' => DB::raw('JSON_ARRAY(docker_image)')]);
+ break;
+ case 'pgsql':
+ DB::table('eggs')->update(['docker_images' => DB::raw('jsonb_build_array(docker_image)')]);
+ break;
+ }
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('docker_image');
@@ -30,18 +33,22 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->text('docker_image')->after('docker_images');
});
- Schema::table('eggs', function (Blueprint $table) {
- DB::statement('UPDATE `eggs` SET `docker_image` = JSON_UNQUOTE(JSON_EXTRACT(docker_images, "$[0]"))');
- });
+ switch (DB::getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+ case 'mysql':
+ DB::table('eggs')->update(['docker_images' => DB::raw('JSON_UNQUOTE(JSON_EXTRACT(docker_images, "$[0]")')]);
+ break;
+ case 'pgsql':
+ DB::table('eggs')->update(['docker_images' => DB::raw('JSON_UNQUOTE(JSON_EXTRACT(docker_images, "$[0]")')]);
+ DB::table('eggs')->update(['docker_images' => DB::raw('docker_images->>0')]);
+ break;
+ }
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('docker_images');
diff --git a/database/migrations/2020_12_14_013707_make_successful_nullable_in_server_transfers.php b/database/migrations/2020_12_14_013707_make_successful_nullable_in_server_transfers.php
index 0a28852844..4c28b6c2b1 100644
--- a/database/migrations/2020_12_14_013707_make_successful_nullable_in_server_transfers.php
+++ b/database/migrations/2020_12_14_013707_make_successful_nullable_in_server_transfers.php
@@ -8,10 +8,8 @@ class MakeSuccessfulNullableInServerTransfers extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('server_transfers', function (Blueprint $table) {
$table->boolean('successful')->nullable()->default(null)->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('server_transfers', function (Blueprint $table) {
$table->boolean('successful')->default(0)->change();
diff --git a/database/migrations/2020_12_17_014330_add_archived_field_to_server_transfers_table.php b/database/migrations/2020_12_17_014330_add_archived_field_to_server_transfers_table.php
index 1162d8a4ff..bc5d3356d9 100644
--- a/database/migrations/2020_12_17_014330_add_archived_field_to_server_transfers_table.php
+++ b/database/migrations/2020_12_17_014330_add_archived_field_to_server_transfers_table.php
@@ -9,27 +9,21 @@ class AddArchivedFieldToServerTransfersTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('server_transfers', function (Blueprint $table) {
$table->boolean('archived')->default(0)->after('new_additional_allocations');
});
// Update archived to all be true on existing transfers.
- Schema::table('server_transfers', function (Blueprint $table) {
- DB::statement('UPDATE `server_transfers` SET `archived` = 1 WHERE `successful` = 1');
- });
+ DB::table('server_transfers')->where('successful', true)->update(['archived' => 1]);
}
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('server_transfers', function (Blueprint $table) {
$table->dropColumn('archived');
diff --git a/database/migrations/2020_12_26_184914_add_upload_id_column_to_backups_table.php b/database/migrations/2020_12_26_184914_add_upload_id_column_to_backups_table.php
index 2e1c50556b..771e06ab11 100644
--- a/database/migrations/2020_12_26_184914_add_upload_id_column_to_backups_table.php
+++ b/database/migrations/2020_12_26_184914_add_upload_id_column_to_backups_table.php
@@ -8,10 +8,8 @@ class AddUploadIdColumnToBackupsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->text('upload_id')->nullable()->after('uuid');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->dropColumn('upload_id');
diff --git a/database/migrations/2021_01_10_153937_add_file_denylist_to_egg_configs.php b/database/migrations/2021_01_10_153937_add_file_denylist_to_egg_configs.php
index 8d617fc199..4a956625e3 100644
--- a/database/migrations/2021_01_10_153937_add_file_denylist_to_egg_configs.php
+++ b/database/migrations/2021_01_10_153937_add_file_denylist_to_egg_configs.php
@@ -8,10 +8,8 @@ class AddFileDenylistToEggConfigs extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->text('file_denylist')->after('docker_images');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('file_denylist');
diff --git a/database/migrations/2021_01_13_013420_add_cron_month.php b/database/migrations/2021_01_13_013420_add_cron_month.php
index 85e534248b..da0bf88418 100644
--- a/database/migrations/2021_01_13_013420_add_cron_month.php
+++ b/database/migrations/2021_01_13_013420_add_cron_month.php
@@ -8,10 +8,8 @@ class AddCronMonth extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('schedules', function (Blueprint $table) {
$table->string('cron_month')->after('cron_day_of_week');
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('schedules', function (Blueprint $table) {
$table->dropColumn('cron_month');
diff --git a/database/migrations/2021_01_17_102401_create_audit_logs_table.php b/database/migrations/2021_01_17_102401_create_audit_logs_table.php
index f67e7d647c..d0fddf801e 100644
--- a/database/migrations/2021_01_17_102401_create_audit_logs_table.php
+++ b/database/migrations/2021_01_17_102401_create_audit_logs_table.php
@@ -8,10 +8,8 @@ class CreateAuditLogsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::create('audit_logs', function (Blueprint $table) {
$table->id();
@@ -32,10 +30,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('audit_logs');
}
diff --git a/database/migrations/2021_01_17_152623_add_generic_server_status_column.php b/database/migrations/2021_01_17_152623_add_generic_server_status_column.php
index 12e6abb958..f8c9dec2ca 100644
--- a/database/migrations/2021_01_17_152623_add_generic_server_status_column.php
+++ b/database/migrations/2021_01_17_152623_add_generic_server_status_column.php
@@ -9,20 +9,16 @@ class AddGenericServerStatusColumn extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->string('status')->nullable()->after('description');
});
- DB::transaction(function () {
- DB::update('UPDATE servers SET `status` = \'suspended\' WHERE `suspended` = 1');
- DB::update('UPDATE servers SET `status` = \'installing\' WHERE `installed` = 0');
- DB::update('UPDATE servers SET `status` = \'install_failed\' WHERE `installed` = 2');
- });
+ DB::table('servers')->where('suspended', 1)->update(['status' => 'suspended']);
+ DB::table('servers')->where('installed', 1)->update(['status' => 'installing']);
+ DB::table('servers')->where('installed', 1)->update(['status' => 'install_failed']);
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('suspended');
@@ -32,21 +28,17 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->unsignedTinyInteger('suspended')->default(0);
$table->unsignedTinyInteger('installed')->default(0);
});
- DB::transaction(function () {
- DB::update('UPDATE servers SET `suspended` = 1 WHERE `status` = \'suspended\'');
- DB::update('UPDATE servers SET `installed` = 1 WHERE `status` IS NULL');
- DB::update('UPDATE servers SET `installed` = 2 WHERE `status` = \'install_failed\'');
- });
+ DB::table('servers')->where('status', 'suspended')->update(['suspended' => 1]);
+ DB::table('servers')->whereNull('status')->update(['installed' => 1]);
+ DB::table('servers')->where('status', 'install_failed')->update(['installed' => 2]);
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('status');
diff --git a/database/migrations/2021_01_26_210502_update_file_denylist_to_json.php b/database/migrations/2021_01_26_210502_update_file_denylist_to_json.php
index af49611353..7c2c5fa069 100644
--- a/database/migrations/2021_01_26_210502_update_file_denylist_to_json.php
+++ b/database/migrations/2021_01_26_210502_update_file_denylist_to_json.php
@@ -8,10 +8,8 @@ class UpdateFileDenylistToJson extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('file_denylist');
@@ -24,10 +22,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('file_denylist');
diff --git a/database/migrations/2021_02_23_205021_add_index_for_server_and_action.php b/database/migrations/2021_02_23_205021_add_index_for_server_and_action.php
index 888125468f..1fd63559c1 100644
--- a/database/migrations/2021_02_23_205021_add_index_for_server_and_action.php
+++ b/database/migrations/2021_02_23_205021_add_index_for_server_and_action.php
@@ -8,10 +8,8 @@ class AddIndexForServerAndAction extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('audit_logs', function (Blueprint $table) {
// Doing the index in this order lets me use the action alone without the server
@@ -27,10 +25,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('audit_logs', function (Blueprint $table) {
$table->dropIndex(['action', 'server_id']);
diff --git a/database/migrations/2021_02_23_212657_make_sftp_port_unsigned_int.php b/database/migrations/2021_02_23_212657_make_sftp_port_unsigned_int.php
index 8eea84819e..b9196a0ae5 100644
--- a/database/migrations/2021_02_23_212657_make_sftp_port_unsigned_int.php
+++ b/database/migrations/2021_02_23_212657_make_sftp_port_unsigned_int.php
@@ -8,10 +8,8 @@ class MakeSftpPortUnsignedInt extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->unsignedSmallInteger('daemonSFTP')->default(2022)->change();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('nodes', function (Blueprint $table) {
$table->smallInteger('daemonSFTP')->default(2022)->change();
diff --git a/database/migrations/2021_03_21_104718_force_cron_month_field_to_have_value_if_missing.php b/database/migrations/2021_03_21_104718_force_cron_month_field_to_have_value_if_missing.php
index 57e1299523..61abdbd6c6 100644
--- a/database/migrations/2021_03_21_104718_force_cron_month_field_to_have_value_if_missing.php
+++ b/database/migrations/2021_03_21_104718_force_cron_month_field_to_have_value_if_missing.php
@@ -1,30 +1,22 @@
where('cron_month', '')->update(['cron_month' => '*']);
}
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
// No down function.
}
diff --git a/database/migrations/2021_05_01_092457_add_continue_on_failure_option_to_tasks.php b/database/migrations/2021_05_01_092457_add_continue_on_failure_option_to_tasks.php
index 703f1524f9..0790454966 100644
--- a/database/migrations/2021_05_01_092457_add_continue_on_failure_option_to_tasks.php
+++ b/database/migrations/2021_05_01_092457_add_continue_on_failure_option_to_tasks.php
@@ -8,10 +8,8 @@ class AddContinueOnFailureOptionToTasks extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('tasks', function (Blueprint $table) {
$table->unsignedTinyInteger('continue_on_failure')->after('is_queued')->default(0);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('tasks', function (Blueprint $table) {
$table->dropColumn('continue_on_failure');
diff --git a/database/migrations/2021_05_01_092523_add_only_run_when_server_online_option_to_schedules.php b/database/migrations/2021_05_01_092523_add_only_run_when_server_online_option_to_schedules.php
index 91bb43be91..a0143fdd6f 100644
--- a/database/migrations/2021_05_01_092523_add_only_run_when_server_online_option_to_schedules.php
+++ b/database/migrations/2021_05_01_092523_add_only_run_when_server_online_option_to_schedules.php
@@ -8,10 +8,8 @@ class AddOnlyRunWhenServerOnlineOptionToSchedules extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('schedules', function (Blueprint $table) {
$table->unsignedTinyInteger('only_when_online')->after('is_processing')->default(0);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('schedules', function (Blueprint $table) {
$table->dropColumn('only_when_online');
diff --git a/database/migrations/2021_05_03_201016_add_support_for_locking_a_backup.php b/database/migrations/2021_05_03_201016_add_support_for_locking_a_backup.php
index bafa4dd76d..3296e3e8fb 100644
--- a/database/migrations/2021_05_03_201016_add_support_for_locking_a_backup.php
+++ b/database/migrations/2021_05_03_201016_add_support_for_locking_a_backup.php
@@ -8,10 +8,8 @@ class AddSupportForLockingABackup extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->unsignedTinyInteger('is_locked')->after('is_successful')->default(0);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->dropColumn('is_locked');
diff --git a/database/migrations/2021_07_12_013420_remove_userinteraction.php b/database/migrations/2021_07_12_013420_remove_userinteraction.php
index 05321d4b33..33b4d5d3b4 100644
--- a/database/migrations/2021_07_12_013420_remove_userinteraction.php
+++ b/database/migrations/2021_07_12_013420_remove_userinteraction.php
@@ -7,22 +7,41 @@ class RemoveUserInteraction extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
// Remove User Interaction from startup config
- DB::table('eggs')->update([
- 'config_startup' => DB::raw('JSON_REMOVE(config_startup, \'$.userInteraction\')'),
- ]);
+ switch (DB::getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+ case 'mysql':
+ DB::table('eggs')->update([
+ 'config_startup' => DB::raw('JSON_REMOVE(config_startup, \'$.userInteraction\')'),
+ ]);
+ break;
+ case 'pgsql':
+ DB::table('eggs')->update([
+ 'config_startup' => DB::raw('config_startup::jsonb - \'userInteraction\''),
+ ]);
+ break;
+ }
}
- public function down()
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
{
// Add blank User Interaction array back to startup config
- DB::table('eggs')->update([
- 'config_startup' => DB::raw('JSON_SET(config_startup, \'$.userInteraction\', JSON_ARRAY())'),
- ]);
+ switch (DB::getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+ case 'mysql':
+ DB::table('eggs')->update([
+ 'config_startup' => DB::raw('JSON_SET(config_startup, \'$.userInteraction\', JSON_ARRAY())'),
+ ]);
+ break;
+ case 'pgsql':
+ DB::table('eggs')->update([
+ 'config_startup' => DB::raw('jsonb_set(config_startup::jsonb, \'$.userInteraction\', jsonb_build_array())'),
+ ]);
+ break;
+ }
}
}
diff --git a/database/migrations/2021_07_17_211512_create_user_ssh_keys_table.php b/database/migrations/2021_07_17_211512_create_user_ssh_keys_table.php
index d5b8a13c6a..a33bb4d310 100644
--- a/database/migrations/2021_07_17_211512_create_user_ssh_keys_table.php
+++ b/database/migrations/2021_07_17_211512_create_user_ssh_keys_table.php
@@ -9,7 +9,7 @@ class CreateUserSshKeysTable extends Migration
/**
* Run the migrations.
*/
- public function up()
+ public function up(): void
{
Schema::create('user_ssh_keys', function (Blueprint $table) {
$table->increments('id');
@@ -27,7 +27,7 @@ public function up()
/**
* Reverse the migrations.
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('user_ssh_keys');
}
diff --git a/database/migrations/2021_08_03_210600_change_successful_field_to_default_to_false_on_backups_table.php b/database/migrations/2021_08_03_210600_change_successful_field_to_default_to_false_on_backups_table.php
index d47b0e5d2f..b9284eb0cc 100644
--- a/database/migrations/2021_08_03_210600_change_successful_field_to_default_to_false_on_backups_table.php
+++ b/database/migrations/2021_08_03_210600_change_successful_field_to_default_to_false_on_backups_table.php
@@ -9,10 +9,8 @@ class ChangeSuccessfulFieldToDefaultToFalseOnBackupsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->boolean('is_successful')->after('uuid')->default(false)->change();
@@ -26,10 +24,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('backups', function (Blueprint $table) {
$table->boolean('is_successful')->after('uuid')->default(true)->change();
diff --git a/database/migrations/2021_08_21_175111_add_foreign_keys_to_mount_node_table.php b/database/migrations/2021_08_21_175111_add_foreign_keys_to_mount_node_table.php
index fad8dc1936..5210f60d2b 100644
--- a/database/migrations/2021_08_21_175111_add_foreign_keys_to_mount_node_table.php
+++ b/database/migrations/2021_08_21_175111_add_foreign_keys_to_mount_node_table.php
@@ -9,10 +9,8 @@ class AddForeignKeysToMountNodeTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
// Fix the columns having a different type than their relations.
Schema::table('mount_node', function (Blueprint $table) {
@@ -46,10 +44,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('mount_node', function (Blueprint $table) {
$table->dropForeign(['node_id']);
diff --git a/database/migrations/2021_08_21_175118_add_foreign_keys_to_mount_server_table.php b/database/migrations/2021_08_21_175118_add_foreign_keys_to_mount_server_table.php
index 9c5a403b20..f564ec491e 100644
--- a/database/migrations/2021_08_21_175118_add_foreign_keys_to_mount_server_table.php
+++ b/database/migrations/2021_08_21_175118_add_foreign_keys_to_mount_server_table.php
@@ -8,10 +8,8 @@ class AddForeignKeysToMountServerTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
// Fix the columns having a different type than their relations.
Schema::table('mount_server', function (Blueprint $table) {
@@ -45,10 +43,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('mount_server', function (Blueprint $table) {
$table->dropForeign(['server_id']);
diff --git a/database/migrations/2021_08_21_180921_add_foreign_keys_to_egg_mount_table.php b/database/migrations/2021_08_21_180921_add_foreign_keys_to_egg_mount_table.php
index 7bf99506b7..11285a5c54 100644
--- a/database/migrations/2021_08_21_180921_add_foreign_keys_to_egg_mount_table.php
+++ b/database/migrations/2021_08_21_180921_add_foreign_keys_to_egg_mount_table.php
@@ -8,10 +8,8 @@ class AddForeignKeysToEggMountTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
// Fix the columns having a different type than their relations.
Schema::table('egg_mount', function (Blueprint $table) {
@@ -45,10 +43,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('egg_mount', function (Blueprint $table) {
$table->dropForeign(['egg_id']);
diff --git a/database/migrations/2022_01_25_030847_drop_google_analytics.php b/database/migrations/2022_01_25_030847_drop_google_analytics.php
index 5daf0bc39e..0d65e5d4d9 100644
--- a/database/migrations/2022_01_25_030847_drop_google_analytics.php
+++ b/database/migrations/2022_01_25_030847_drop_google_analytics.php
@@ -7,25 +7,19 @@ class DropGoogleAnalytics extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
DB::table('settings')->where('key', 'settings::app:analytics')->delete();
}
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
- DB::table('settings')->insert(
- [
+ DB::table('settings')->insert([
'key' => 'settings::app:analytics',
- ]
- );
+ ]);
}
}
diff --git a/database/migrations/2022_05_07_165334_migrate_egg_images_array_to_new_format.php b/database/migrations/2022_05_07_165334_migrate_egg_images_array_to_new_format.php
index 78dfe6e37a..057ce9d743 100644
--- a/database/migrations/2022_05_07_165334_migrate_egg_images_array_to_new_format.php
+++ b/database/migrations/2022_05_07_165334_migrate_egg_images_array_to_new_format.php
@@ -10,7 +10,7 @@ class MigrateEggImagesArrayToNewFormat extends Migration
* images array to both exist, and have key => value pairings to support naming the
* images provided.
*/
- public function up()
+ public function up(): void
{
DB::table('eggs')->select(['id', 'docker_images'])->cursor()->each(function ($egg) {
$images = is_null($egg->docker_images) ? [] : json_decode($egg->docker_images, true, 512, JSON_THROW_ON_ERROR);
@@ -26,10 +26,8 @@ public function up()
/**
* Reverse the migrations. This just keeps the values from the docker images array.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
DB::table('eggs')->select(['id', 'docker_images'])->cursor()->each(function ($egg) {
DB::table('eggs')->where('id', $egg->id)->update([
diff --git a/database/migrations/2022_05_28_135717_create_activity_logs_table.php b/database/migrations/2022_05_28_135717_create_activity_logs_table.php
index 448439dc81..4c4f05f1f1 100644
--- a/database/migrations/2022_05_28_135717_create_activity_logs_table.php
+++ b/database/migrations/2022_05_28_135717_create_activity_logs_table.php
@@ -8,10 +8,8 @@ class CreateActivityLogsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::create('activity_logs', function (Blueprint $table) {
$table->id();
@@ -27,10 +25,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('activity_logs');
}
diff --git a/database/migrations/2022_05_29_140349_create_activity_log_actors_table.php b/database/migrations/2022_05_29_140349_create_activity_log_actors_table.php
index 6dc45d7f8a..c9997ac419 100644
--- a/database/migrations/2022_05_29_140349_create_activity_log_actors_table.php
+++ b/database/migrations/2022_05_29_140349_create_activity_log_actors_table.php
@@ -8,10 +8,8 @@ class CreateActivityLogActorsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::create('activity_log_subjects', function (Blueprint $table) {
$table->id();
@@ -22,10 +20,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::dropIfExists('activity_log_subjects');
}
diff --git a/database/migrations/2022_06_18_112822_track_api_key_usage_for_activity_events.php b/database/migrations/2022_06_18_112822_track_api_key_usage_for_activity_events.php
index 6e35df9a28..f138786373 100644
--- a/database/migrations/2022_06_18_112822_track_api_key_usage_for_activity_events.php
+++ b/database/migrations/2022_06_18_112822_track_api_key_usage_for_activity_events.php
@@ -7,10 +7,8 @@
return new class () extends Migration {
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('activity_logs', function (Blueprint $table) {
$table->unsignedInteger('api_key_id')->nullable()->after('actor_id');
@@ -19,10 +17,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('activity_logs', function (Blueprint $table) {
$table->dropColumn('api_key_id');
diff --git a/database/migrations/2022_08_16_214400_add_force_outgoing_ip_column_to_eggs_table.php b/database/migrations/2022_08_16_214400_add_force_outgoing_ip_column_to_eggs_table.php
index eb3a56bf26..c5b30a49ae 100644
--- a/database/migrations/2022_08_16_214400_add_force_outgoing_ip_column_to_eggs_table.php
+++ b/database/migrations/2022_08_16_214400_add_force_outgoing_ip_column_to_eggs_table.php
@@ -8,10 +8,8 @@ class AddForceOutgoingIpColumnToEggsTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->boolean('force_outgoing_ip')->default(false);
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('eggs', function (Blueprint $table) {
$table->dropColumn('force_outgoing_ip');
diff --git a/database/migrations/2022_08_16_230204_add_installed_at_column_to_servers_table.php b/database/migrations/2022_08_16_230204_add_installed_at_column_to_servers_table.php
index 50a5e23f84..541117a3aa 100644
--- a/database/migrations/2022_08_16_230204_add_installed_at_column_to_servers_table.php
+++ b/database/migrations/2022_08_16_230204_add_installed_at_column_to_servers_table.php
@@ -8,10 +8,8 @@ class AddInstalledAtColumnToServersTable extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->timestamp('installed_at')->nullable();
@@ -20,10 +18,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('installed_at');
diff --git a/database/schema/mysql-schema.sql b/database/schema/mysql-schema.sql
new file mode 100644
index 0000000000..a758e313f0
--- /dev/null
+++ b/database/schema/mysql-schema.sql
@@ -0,0 +1,880 @@
+/*M!999999\- enable the sandbox mode */
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `activity_log_subjects`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `activity_log_subjects` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `activity_log_id` bigint(20) unsigned NOT NULL,
+ `subject_type` varchar(191) NOT NULL,
+ `subject_id` bigint(20) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `activity_log_subjects_activity_log_id_foreign` (`activity_log_id`),
+ KEY `activity_log_subjects_subject_type_subject_id_index` (`subject_type`,`subject_id`),
+ CONSTRAINT `activity_log_subjects_activity_log_id_foreign` FOREIGN KEY (`activity_log_id`) REFERENCES `activity_logs` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `activity_logs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `activity_logs` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `batch` char(36) DEFAULT NULL,
+ `event` varchar(191) NOT NULL,
+ `ip` varchar(191) NOT NULL,
+ `description` text DEFAULT NULL,
+ `actor_type` varchar(191) DEFAULT NULL,
+ `actor_id` bigint(20) unsigned DEFAULT NULL,
+ `api_key_id` int(10) unsigned DEFAULT NULL,
+ `properties` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`properties`)),
+ `timestamp` timestamp NOT NULL DEFAULT current_timestamp(),
+ PRIMARY KEY (`id`),
+ KEY `activity_logs_actor_type_actor_id_index` (`actor_type`,`actor_id`),
+ KEY `activity_logs_event_index` (`event`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `allocations`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `allocations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `node_id` int(10) unsigned NOT NULL,
+ `ip` varchar(191) NOT NULL,
+ `ip_alias` text DEFAULT NULL,
+ `port` mediumint(8) unsigned NOT NULL,
+ `server_id` int(10) unsigned DEFAULT NULL,
+ `notes` varchar(191) DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `allocations_node_id_ip_port_unique` (`node_id`,`ip`,`port`),
+ KEY `allocations_server_id_foreign` (`server_id`),
+ CONSTRAINT `allocations_node_id_foreign` FOREIGN KEY (`node_id`) REFERENCES `nodes` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `allocations_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `api_keys`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `api_keys` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `key_type` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `identifier` char(16) DEFAULT NULL,
+ `token` text NOT NULL,
+ `allowed_ips` text DEFAULT NULL,
+ `memo` text DEFAULT NULL,
+ `last_used_at` timestamp NULL DEFAULT NULL,
+ `expires_at` timestamp NULL DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ `r_servers` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_nodes` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_allocations` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_users` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_locations` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_nests` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_eggs` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_database_hosts` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `r_server_databases` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `api_keys_identifier_unique` (`identifier`),
+ KEY `api_keys_user_id_foreign` (`user_id`),
+ CONSTRAINT `api_keys_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `api_logs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `api_logs` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `authorized` tinyint(1) NOT NULL,
+ `error` text DEFAULT NULL,
+ `key` char(16) DEFAULT NULL,
+ `method` char(6) NOT NULL,
+ `route` text NOT NULL,
+ `content` text DEFAULT NULL,
+ `user_agent` text NOT NULL,
+ `request_ip` varchar(45) NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `audit_logs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `audit_logs` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` char(36) NOT NULL,
+ `is_system` tinyint(1) NOT NULL DEFAULT 0,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `server_id` int(10) unsigned DEFAULT NULL,
+ `action` varchar(191) NOT NULL,
+ `subaction` varchar(191) DEFAULT NULL,
+ `device` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`device`)),
+ `metadata` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`metadata`)),
+ `created_at` timestamp NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `audit_logs_user_id_foreign` (`user_id`),
+ KEY `audit_logs_server_id_foreign` (`server_id`),
+ KEY `audit_logs_action_server_id_index` (`action`,`server_id`),
+ CONSTRAINT `audit_logs_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `audit_logs_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `backups`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `backups` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `server_id` int(10) unsigned NOT NULL,
+ `uuid` char(36) NOT NULL,
+ `upload_id` text DEFAULT NULL,
+ `is_successful` tinyint(1) NOT NULL DEFAULT 0,
+ `is_locked` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(191) NOT NULL,
+ `ignored_files` text NOT NULL,
+ `disk` varchar(191) NOT NULL,
+ `checksum` varchar(191) DEFAULT NULL,
+ `bytes` bigint(20) unsigned NOT NULL DEFAULT 0,
+ `completed_at` timestamp NULL DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `backups_uuid_unique` (`uuid`),
+ KEY `backups_server_id_foreign` (`server_id`),
+ CONSTRAINT `backups_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `database_hosts`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `database_hosts` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) NOT NULL,
+ `host` varchar(191) NOT NULL,
+ `port` int(10) unsigned NOT NULL,
+ `username` varchar(191) NOT NULL,
+ `password` text NOT NULL,
+ `max_databases` int(10) unsigned DEFAULT NULL,
+ `node_id` int(10) unsigned DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `database_hosts_node_id_foreign` (`node_id`),
+ CONSTRAINT `database_hosts_node_id_foreign` FOREIGN KEY (`node_id`) REFERENCES `nodes` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `databases`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `databases` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `server_id` int(10) unsigned NOT NULL,
+ `database_host_id` int(10) unsigned NOT NULL,
+ `database` varchar(191) NOT NULL,
+ `username` varchar(191) NOT NULL,
+ `remote` varchar(191) NOT NULL DEFAULT '%',
+ `password` text NOT NULL,
+ `max_connections` int(11) DEFAULT 0,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `databases_database_host_id_username_unique` (`database_host_id`,`username`),
+ UNIQUE KEY `databases_database_host_id_server_id_database_unique` (`database_host_id`,`server_id`,`database`),
+ KEY `databases_server_id_foreign` (`server_id`),
+ CONSTRAINT `databases_database_host_id_foreign` FOREIGN KEY (`database_host_id`) REFERENCES `database_hosts` (`id`),
+ CONSTRAINT `databases_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `egg_mount`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `egg_mount` (
+ `egg_id` int(10) unsigned NOT NULL,
+ `mount_id` int(10) unsigned NOT NULL,
+ UNIQUE KEY `egg_mount_egg_id_mount_id_unique` (`egg_id`,`mount_id`),
+ KEY `egg_mount_mount_id_foreign` (`mount_id`),
+ CONSTRAINT `egg_mount_egg_id_foreign` FOREIGN KEY (`egg_id`) REFERENCES `eggs` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `egg_mount_mount_id_foreign` FOREIGN KEY (`mount_id`) REFERENCES `mounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `egg_variables`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `egg_variables` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `egg_id` int(10) unsigned NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `description` text NOT NULL,
+ `env_variable` varchar(191) NOT NULL,
+ `default_value` text NOT NULL,
+ `user_viewable` tinyint(3) unsigned NOT NULL,
+ `user_editable` tinyint(3) unsigned NOT NULL,
+ `rules` text DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `service_variables_egg_id_foreign` (`egg_id`),
+ CONSTRAINT `service_variables_egg_id_foreign` FOREIGN KEY (`egg_id`) REFERENCES `eggs` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `eggs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `eggs` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` char(36) NOT NULL,
+ `nest_id` int(10) unsigned NOT NULL,
+ `author` varchar(191) NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `description` text DEFAULT NULL,
+ `features` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`features`)),
+ `docker_images` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`docker_images`)),
+ `file_denylist` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`file_denylist`)),
+ `update_url` text DEFAULT NULL,
+ `config_files` text DEFAULT NULL,
+ `config_startup` text DEFAULT NULL,
+ `config_logs` text DEFAULT NULL,
+ `config_stop` varchar(191) DEFAULT NULL,
+ `config_from` int(10) unsigned DEFAULT NULL,
+ `startup` text DEFAULT NULL,
+ `script_container` varchar(191) NOT NULL DEFAULT 'alpine:3.4',
+ `copy_script_from` int(10) unsigned DEFAULT NULL,
+ `script_entry` varchar(191) NOT NULL DEFAULT 'ash',
+ `script_is_privileged` tinyint(1) NOT NULL DEFAULT 1,
+ `script_install` text DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ `force_outgoing_ip` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `service_options_uuid_unique` (`uuid`),
+ KEY `service_options_nest_id_foreign` (`nest_id`),
+ KEY `eggs_config_from_foreign` (`config_from`),
+ KEY `eggs_copy_script_from_foreign` (`copy_script_from`),
+ CONSTRAINT `eggs_config_from_foreign` FOREIGN KEY (`config_from`) REFERENCES `eggs` (`id`) ON DELETE SET NULL,
+ CONSTRAINT `eggs_copy_script_from_foreign` FOREIGN KEY (`copy_script_from`) REFERENCES `eggs` (`id`) ON DELETE SET NULL,
+ CONSTRAINT `service_options_nest_id_foreign` FOREIGN KEY (`nest_id`) REFERENCES `nests` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `failed_jobs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `failed_jobs` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` varchar(191) DEFAULT NULL,
+ `connection` text NOT NULL,
+ `queue` text NOT NULL,
+ `payload` longtext NOT NULL,
+ `failed_at` timestamp NOT NULL,
+ `exception` text NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `failed_jobs_uuid_unique` (`uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `jobs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `jobs` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `queue` varchar(191) NOT NULL,
+ `payload` longtext NOT NULL,
+ `attempts` tinyint(3) unsigned NOT NULL,
+ `reserved_at` int(10) unsigned DEFAULT NULL,
+ `available_at` int(10) unsigned NOT NULL,
+ `created_at` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `jobs_queue_reserved_at_index` (`queue`,`reserved_at`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `locations`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `locations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `short` varchar(191) NOT NULL,
+ `long` text DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `locations_short_unique` (`short`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `migrations`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `migrations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `migration` varchar(191) NOT NULL,
+ `batch` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `mount_node`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount_node` (
+ `node_id` int(10) unsigned NOT NULL,
+ `mount_id` int(10) unsigned NOT NULL,
+ UNIQUE KEY `mount_node_node_id_mount_id_unique` (`node_id`,`mount_id`),
+ KEY `mount_node_mount_id_foreign` (`mount_id`),
+ CONSTRAINT `mount_node_mount_id_foreign` FOREIGN KEY (`mount_id`) REFERENCES `mounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `mount_node_node_id_foreign` FOREIGN KEY (`node_id`) REFERENCES `nodes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `mount_server`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount_server` (
+ `server_id` int(10) unsigned NOT NULL,
+ `mount_id` int(10) unsigned NOT NULL,
+ UNIQUE KEY `mount_server_server_id_mount_id_unique` (`server_id`,`mount_id`),
+ KEY `mount_server_mount_id_foreign` (`mount_id`),
+ CONSTRAINT `mount_server_mount_id_foreign` FOREIGN KEY (`mount_id`) REFERENCES `mounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `mount_server_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `mounts`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mounts` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` char(36) NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `description` text DEFAULT NULL,
+ `source` varchar(191) NOT NULL,
+ `target` varchar(191) NOT NULL,
+ `read_only` tinyint(3) unsigned NOT NULL,
+ `user_mountable` tinyint(3) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `mounts_id_unique` (`id`),
+ UNIQUE KEY `mounts_uuid_unique` (`uuid`),
+ UNIQUE KEY `mounts_name_unique` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `nests`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `nests` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` char(36) NOT NULL,
+ `author` char(191) NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `description` text DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `services_uuid_unique` (`uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `nodes`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `nodes` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` char(36) NOT NULL,
+ `public` smallint(5) unsigned NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `description` text DEFAULT NULL,
+ `location_id` int(10) unsigned NOT NULL,
+ `fqdn` varchar(191) NOT NULL,
+ `scheme` varchar(191) NOT NULL DEFAULT 'https',
+ `behind_proxy` tinyint(1) NOT NULL DEFAULT 0,
+ `maintenance_mode` tinyint(1) NOT NULL DEFAULT 0,
+ `memory` int(10) unsigned NOT NULL,
+ `memory_overallocate` int(11) NOT NULL DEFAULT 0,
+ `disk` int(10) unsigned NOT NULL,
+ `disk_overallocate` int(11) NOT NULL DEFAULT 0,
+ `upload_size` int(10) unsigned NOT NULL DEFAULT 100,
+ `daemon_token_id` char(16) NOT NULL,
+ `daemon_token` text NOT NULL,
+ `daemonListen` smallint(5) unsigned NOT NULL DEFAULT 8080,
+ `daemonSFTP` smallint(5) unsigned NOT NULL DEFAULT 2022,
+ `daemonBase` varchar(191) NOT NULL DEFAULT '/home/daemon-files',
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `nodes_uuid_unique` (`uuid`),
+ UNIQUE KEY `nodes_daemon_token_id_unique` (`daemon_token_id`),
+ KEY `nodes_location_id_foreign` (`location_id`),
+ CONSTRAINT `nodes_location_id_foreign` FOREIGN KEY (`location_id`) REFERENCES `locations` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `notifications`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `notifications` (
+ `id` varchar(191) NOT NULL,
+ `type` varchar(191) NOT NULL,
+ `notifiable_type` varchar(191) NOT NULL,
+ `notifiable_id` bigint(20) unsigned NOT NULL,
+ `data` text NOT NULL,
+ `read_at` timestamp NULL DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `notifications_notifiable_type_notifiable_id_index` (`notifiable_type`,`notifiable_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `password_resets`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `password_resets` (
+ `email` varchar(191) NOT NULL,
+ `token` varchar(191) NOT NULL,
+ `created_at` timestamp NOT NULL,
+ KEY `password_resets_email_index` (`email`),
+ KEY `password_resets_token_index` (`token`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `recovery_tokens`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `recovery_tokens` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `token` varchar(191) NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `recovery_tokens_user_id_foreign` (`user_id`),
+ CONSTRAINT `recovery_tokens_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `schedules`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `schedules` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `server_id` int(10) unsigned NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `cron_day_of_week` varchar(191) NOT NULL,
+ `cron_month` varchar(191) NOT NULL,
+ `cron_day_of_month` varchar(191) NOT NULL,
+ `cron_hour` varchar(191) NOT NULL,
+ `cron_minute` varchar(191) NOT NULL,
+ `is_active` tinyint(1) NOT NULL,
+ `is_processing` tinyint(1) NOT NULL,
+ `only_when_online` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `last_run_at` timestamp NULL DEFAULT NULL,
+ `next_run_at` timestamp NULL DEFAULT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `schedules_server_id_foreign` (`server_id`),
+ CONSTRAINT `schedules_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `server_transfers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `server_transfers` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `server_id` int(10) unsigned NOT NULL,
+ `successful` tinyint(1) DEFAULT NULL,
+ `old_node` int(10) unsigned NOT NULL,
+ `new_node` int(10) unsigned NOT NULL,
+ `old_allocation` int(10) unsigned NOT NULL,
+ `new_allocation` int(10) unsigned NOT NULL,
+ `old_additional_allocations` longtext DEFAULT NULL COMMENT '(DC2Type:json)',
+ `new_additional_allocations` longtext DEFAULT NULL COMMENT '(DC2Type:json)',
+ `archived` tinyint(1) NOT NULL DEFAULT 0,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `server_transfers_server_id_foreign` (`server_id`),
+ CONSTRAINT `server_transfers_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `server_variables`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `server_variables` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `server_id` int(10) unsigned DEFAULT NULL,
+ `variable_id` int(10) unsigned NOT NULL,
+ `variable_value` text NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `server_variables_server_id_foreign` (`server_id`),
+ KEY `server_variables_variable_id_foreign` (`variable_id`),
+ CONSTRAINT `server_variables_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `server_variables_variable_id_foreign` FOREIGN KEY (`variable_id`) REFERENCES `egg_variables` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `servers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `servers` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `external_id` varchar(191) DEFAULT NULL,
+ `uuid` char(36) NOT NULL,
+ `uuidShort` char(8) NOT NULL,
+ `node_id` int(10) unsigned NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `description` text NOT NULL,
+ `status` varchar(191) DEFAULT NULL,
+ `skip_scripts` tinyint(1) NOT NULL DEFAULT 0,
+ `owner_id` int(10) unsigned NOT NULL,
+ `memory` int(10) unsigned NOT NULL,
+ `swap` int(11) NOT NULL,
+ `disk` int(10) unsigned NOT NULL,
+ `io` int(10) unsigned NOT NULL,
+ `cpu` int(10) unsigned NOT NULL,
+ `threads` varchar(191) DEFAULT NULL,
+ `oom_disabled` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `allocation_id` int(10) unsigned NOT NULL,
+ `nest_id` int(10) unsigned NOT NULL,
+ `egg_id` int(10) unsigned NOT NULL,
+ `startup` text NOT NULL,
+ `image` varchar(191) NOT NULL,
+ `allocation_limit` int(10) unsigned DEFAULT NULL,
+ `database_limit` int(10) unsigned DEFAULT 0,
+ `backup_limit` int(10) unsigned NOT NULL DEFAULT 0,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ `installed_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `servers_uuid_unique` (`uuid`),
+ UNIQUE KEY `servers_uuidshort_unique` (`uuidShort`),
+ UNIQUE KEY `servers_allocation_id_unique` (`allocation_id`),
+ UNIQUE KEY `servers_external_id_unique` (`external_id`),
+ KEY `servers_node_id_foreign` (`node_id`),
+ KEY `servers_owner_id_foreign` (`owner_id`),
+ KEY `servers_nest_id_foreign` (`nest_id`),
+ KEY `servers_egg_id_foreign` (`egg_id`),
+ CONSTRAINT `servers_allocation_id_foreign` FOREIGN KEY (`allocation_id`) REFERENCES `allocations` (`id`),
+ CONSTRAINT `servers_egg_id_foreign` FOREIGN KEY (`egg_id`) REFERENCES `eggs` (`id`),
+ CONSTRAINT `servers_nest_id_foreign` FOREIGN KEY (`nest_id`) REFERENCES `nests` (`id`),
+ CONSTRAINT `servers_node_id_foreign` FOREIGN KEY (`node_id`) REFERENCES `nodes` (`id`),
+ CONSTRAINT `servers_owner_id_foreign` FOREIGN KEY (`owner_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `sessions`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sessions` (
+ `id` varchar(191) NOT NULL,
+ `user_id` int(11) DEFAULT NULL,
+ `ip_address` varchar(45) DEFAULT NULL,
+ `user_agent` text DEFAULT NULL,
+ `payload` text NOT NULL,
+ `last_activity` int(11) NOT NULL,
+ UNIQUE KEY `sessions_id_unique` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `settings`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `settings` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `key` varchar(191) NOT NULL,
+ `value` text NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `settings_key_unique` (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `subusers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `subusers` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `server_id` int(10) unsigned NOT NULL,
+ `permissions` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`permissions`)),
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `subusers_user_id_foreign` (`user_id`),
+ KEY `subusers_server_id_foreign` (`server_id`),
+ CONSTRAINT `subusers_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `subusers_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `tasks`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tasks` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `schedule_id` int(10) unsigned NOT NULL,
+ `sequence_id` int(10) unsigned NOT NULL,
+ `action` varchar(191) NOT NULL,
+ `payload` text NOT NULL,
+ `time_offset` int(10) unsigned NOT NULL,
+ `is_queued` tinyint(1) NOT NULL,
+ `continue_on_failure` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `tasks_schedule_id_sequence_id_index` (`schedule_id`,`sequence_id`),
+ CONSTRAINT `tasks_schedule_id_foreign` FOREIGN KEY (`schedule_id`) REFERENCES `schedules` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `tasks_log`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tasks_log` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `task_id` int(10) unsigned NOT NULL,
+ `run_time` timestamp NOT NULL,
+ `run_status` int(10) unsigned NOT NULL,
+ `response` text NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_ssh_keys`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_ssh_keys` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `name` varchar(191) NOT NULL,
+ `fingerprint` varchar(191) NOT NULL,
+ `public_key` text NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `user_ssh_keys_user_id_foreign` (`user_id`),
+ CONSTRAINT `user_ssh_keys_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `external_id` varchar(191) DEFAULT NULL,
+ `uuid` char(36) NOT NULL,
+ `username` varchar(191) NOT NULL,
+ `email` varchar(191) NOT NULL,
+ `name_first` varchar(191) DEFAULT NULL,
+ `name_last` varchar(191) DEFAULT NULL,
+ `password` text NOT NULL,
+ `remember_token` varchar(191) DEFAULT NULL,
+ `language` char(5) NOT NULL DEFAULT 'en',
+ `root_admin` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `use_totp` tinyint(3) unsigned NOT NULL,
+ `totp_secret` text DEFAULT NULL,
+ `totp_authenticated_at` timestamp NULL DEFAULT NULL,
+ `gravatar` tinyint(1) NOT NULL DEFAULT 1,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `users_uuid_unique` (`uuid`),
+ UNIQUE KEY `users_email_unique` (`email`),
+ UNIQUE KEY `users_username_unique` (`username`),
+ KEY `users_external_id_index` (`external_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+/*M!999999\- enable the sandbox mode */
+INSERT INTO `migrations` VALUES (1,'2016_01_23_195641_add_allocations_table',1);
+INSERT INTO `migrations` VALUES (2,'2016_01_23_195851_add_api_keys',1);
+INSERT INTO `migrations` VALUES (3,'2016_01_23_200044_add_api_permissions',1);
+INSERT INTO `migrations` VALUES (4,'2016_01_23_200159_add_downloads',1);
+INSERT INTO `migrations` VALUES (5,'2016_01_23_200421_create_failed_jobs_table',1);
+INSERT INTO `migrations` VALUES (6,'2016_01_23_200440_create_jobs_table',1);
+INSERT INTO `migrations` VALUES (7,'2016_01_23_200528_add_locations',1);
+INSERT INTO `migrations` VALUES (8,'2016_01_23_200648_add_nodes',1);
+INSERT INTO `migrations` VALUES (9,'2016_01_23_201433_add_password_resets',1);
+INSERT INTO `migrations` VALUES (10,'2016_01_23_201531_add_permissions',1);
+INSERT INTO `migrations` VALUES (11,'2016_01_23_201649_add_server_variables',1);
+INSERT INTO `migrations` VALUES (12,'2016_01_23_201748_add_servers',1);
+INSERT INTO `migrations` VALUES (13,'2016_01_23_202544_add_service_options',1);
+INSERT INTO `migrations` VALUES (14,'2016_01_23_202731_add_service_varibles',1);
+INSERT INTO `migrations` VALUES (15,'2016_01_23_202943_add_services',1);
+INSERT INTO `migrations` VALUES (16,'2016_01_23_203119_create_settings_table',1);
+INSERT INTO `migrations` VALUES (17,'2016_01_23_203150_add_subusers',1);
+INSERT INTO `migrations` VALUES (18,'2016_01_23_203159_add_users',1);
+INSERT INTO `migrations` VALUES (19,'2016_01_23_203947_create_sessions_table',1);
+INSERT INTO `migrations` VALUES (20,'2016_01_25_234418_rename_permissions_column',1);
+INSERT INTO `migrations` VALUES (21,'2016_02_07_172148_add_databases_tables',1);
+INSERT INTO `migrations` VALUES (22,'2016_02_07_181319_add_database_servers_table',1);
+INSERT INTO `migrations` VALUES (23,'2016_02_13_154306_add_service_option_default_startup',1);
+INSERT INTO `migrations` VALUES (24,'2016_02_20_155318_add_unique_service_field',1);
+INSERT INTO `migrations` VALUES (25,'2016_02_27_163411_add_tasks_table',1);
+INSERT INTO `migrations` VALUES (26,'2016_02_27_163447_add_tasks_log_table',1);
+INSERT INTO `migrations` VALUES (27,'2016_03_18_155649_add_nullable_field_lastrun',1);
+INSERT INTO `migrations` VALUES (28,'2016_08_30_212718_add_ip_alias',1);
+INSERT INTO `migrations` VALUES (29,'2016_08_30_213301_modify_ip_storage_method',1);
+INSERT INTO `migrations` VALUES (30,'2016_09_01_193520_add_suspension_for_servers',1);
+INSERT INTO `migrations` VALUES (31,'2016_09_01_211924_remove_active_column',1);
+INSERT INTO `migrations` VALUES (32,'2016_09_02_190647_add_sftp_password_storage',1);
+INSERT INTO `migrations` VALUES (33,'2016_09_04_171338_update_jobs_tables',1);
+INSERT INTO `migrations` VALUES (34,'2016_09_04_172028_update_failed_jobs_table',1);
+INSERT INTO `migrations` VALUES (35,'2016_09_04_182835_create_notifications_table',1);
+INSERT INTO `migrations` VALUES (36,'2016_09_07_163017_add_unique_identifier',1);
+INSERT INTO `migrations` VALUES (37,'2016_09_14_145945_allow_longer_regex_field',1);
+INSERT INTO `migrations` VALUES (38,'2016_09_17_194246_add_docker_image_column',1);
+INSERT INTO `migrations` VALUES (39,'2016_09_21_165554_update_servers_column_name',1);
+INSERT INTO `migrations` VALUES (40,'2016_09_29_213518_rename_double_insurgency',1);
+INSERT INTO `migrations` VALUES (41,'2016_10_07_152117_build_api_log_table',1);
+INSERT INTO `migrations` VALUES (42,'2016_10_14_164802_update_api_keys',1);
+INSERT INTO `migrations` VALUES (43,'2016_10_23_181719_update_misnamed_bungee',1);
+INSERT INTO `migrations` VALUES (44,'2016_10_23_193810_add_foreign_keys_servers',1);
+INSERT INTO `migrations` VALUES (45,'2016_10_23_201624_add_foreign_allocations',1);
+INSERT INTO `migrations` VALUES (46,'2016_10_23_202222_add_foreign_api_keys',1);
+INSERT INTO `migrations` VALUES (47,'2016_10_23_202703_add_foreign_api_permissions',1);
+INSERT INTO `migrations` VALUES (48,'2016_10_23_202953_add_foreign_database_servers',1);
+INSERT INTO `migrations` VALUES (49,'2016_10_23_203105_add_foreign_databases',1);
+INSERT INTO `migrations` VALUES (50,'2016_10_23_203335_add_foreign_nodes',1);
+INSERT INTO `migrations` VALUES (51,'2016_10_23_203522_add_foreign_permissions',1);
+INSERT INTO `migrations` VALUES (52,'2016_10_23_203857_add_foreign_server_variables',1);
+INSERT INTO `migrations` VALUES (53,'2016_10_23_204157_add_foreign_service_options',1);
+INSERT INTO `migrations` VALUES (54,'2016_10_23_204321_add_foreign_service_variables',1);
+INSERT INTO `migrations` VALUES (55,'2016_10_23_204454_add_foreign_subusers',1);
+INSERT INTO `migrations` VALUES (56,'2016_10_23_204610_add_foreign_tasks',1);
+INSERT INTO `migrations` VALUES (57,'2016_11_04_000949_add_ark_service_option_fixed',1);
+INSERT INTO `migrations` VALUES (58,'2016_11_11_220649_add_pack_support',1);
+INSERT INTO `migrations` VALUES (59,'2016_11_11_231731_set_service_name_unique',1);
+INSERT INTO `migrations` VALUES (60,'2016_11_27_142519_add_pack_column',1);
+INSERT INTO `migrations` VALUES (61,'2016_12_01_173018_add_configurable_upload_limit',1);
+INSERT INTO `migrations` VALUES (62,'2016_12_02_185206_correct_service_variables',1);
+INSERT INTO `migrations` VALUES (63,'2017_01_03_150436_fix_misnamed_option_tag',1);
+INSERT INTO `migrations` VALUES (64,'2017_01_07_154228_create_node_configuration_tokens_table',1);
+INSERT INTO `migrations` VALUES (65,'2017_01_12_135449_add_more_user_data',1);
+INSERT INTO `migrations` VALUES (66,'2017_02_02_175548_UpdateColumnNames',1);
+INSERT INTO `migrations` VALUES (67,'2017_02_03_140948_UpdateNodesTable',1);
+INSERT INTO `migrations` VALUES (68,'2017_02_03_155554_RenameColumns',1);
+INSERT INTO `migrations` VALUES (69,'2017_02_05_164123_AdjustColumnNames',1);
+INSERT INTO `migrations` VALUES (70,'2017_02_05_164516_AdjustColumnNamesForServicePacks',1);
+INSERT INTO `migrations` VALUES (71,'2017_02_09_174834_SetupPermissionsPivotTable',1);
+INSERT INTO `migrations` VALUES (72,'2017_02_10_171858_UpdateAPIKeyColumnNames',1);
+INSERT INTO `migrations` VALUES (73,'2017_03_03_224254_UpdateNodeConfigTokensColumns',1);
+INSERT INTO `migrations` VALUES (74,'2017_03_05_212803_DeleteServiceExecutableOption',1);
+INSERT INTO `migrations` VALUES (75,'2017_03_10_162934_AddNewServiceOptionsColumns',1);
+INSERT INTO `migrations` VALUES (76,'2017_03_10_173607_MigrateToNewServiceSystem',1);
+INSERT INTO `migrations` VALUES (77,'2017_03_11_215455_ChangeServiceVariablesValidationRules',1);
+INSERT INTO `migrations` VALUES (78,'2017_03_12_150648_MoveFunctionsFromFileToDatabase',1);
+INSERT INTO `migrations` VALUES (79,'2017_03_14_175631_RenameServicePacksToSingluarPacks',1);
+INSERT INTO `migrations` VALUES (80,'2017_03_14_200326_AddLockedStatusToTable',1);
+INSERT INTO `migrations` VALUES (81,'2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost',1);
+INSERT INTO `migrations` VALUES (82,'2017_03_16_181515_CleanupDatabasesDatabase',1);
+INSERT INTO `migrations` VALUES (83,'2017_03_18_204953_AddForeignKeyToPacks',1);
+INSERT INTO `migrations` VALUES (84,'2017_03_31_221948_AddServerDescriptionColumn',1);
+INSERT INTO `migrations` VALUES (85,'2017_04_02_163232_DropDeletedAtColumnFromServers',1);
+INSERT INTO `migrations` VALUES (86,'2017_04_15_125021_UpgradeTaskSystem',1);
+INSERT INTO `migrations` VALUES (87,'2017_04_20_171943_AddScriptsToServiceOptions',1);
+INSERT INTO `migrations` VALUES (88,'2017_04_21_151432_AddServiceScriptTrackingToServers',1);
+INSERT INTO `migrations` VALUES (89,'2017_04_27_145300_AddCopyScriptFromColumn',1);
+INSERT INTO `migrations` VALUES (90,'2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy',1);
+INSERT INTO `migrations` VALUES (91,'2017_05_01_141528_DeleteDownloadTable',1);
+INSERT INTO `migrations` VALUES (92,'2017_05_01_141559_DeleteNodeConfigurationTable',1);
+INSERT INTO `migrations` VALUES (93,'2017_06_10_152951_add_external_id_to_users',1);
+INSERT INTO `migrations` VALUES (94,'2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete',1);
+INSERT INTO `migrations` VALUES (95,'2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion',1);
+INSERT INTO `migrations` VALUES (96,'2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete',1);
+INSERT INTO `migrations` VALUES (97,'2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted',1);
+INSERT INTO `migrations` VALUES (98,'2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted',1);
+INSERT INTO `migrations` VALUES (99,'2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted',1);
+INSERT INTO `migrations` VALUES (100,'2017_08_05_144104_AllowNegativeValuesForOverallocation',1);
+INSERT INTO `migrations` VALUES (101,'2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields',1);
+INSERT INTO `migrations` VALUES (102,'2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted',1);
+INSERT INTO `migrations` VALUES (103,'2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted',1);
+INSERT INTO `migrations` VALUES (104,'2017_09_10_225749_RenameTasksTableForStructureRefactor',1);
+INSERT INTO `migrations` VALUES (105,'2017_09_10_225941_CreateSchedulesTable',1);
+INSERT INTO `migrations` VALUES (106,'2017_09_10_230309_CreateNewTasksTableForSchedules',1);
+INSERT INTO `migrations` VALUES (107,'2017_09_11_002938_TransferOldTasksToNewScheduler',1);
+INSERT INTO `migrations` VALUES (108,'2017_09_13_211810_UpdateOldPermissionsToPointToNewScheduleSystem',1);
+INSERT INTO `migrations` VALUES (109,'2017_09_23_170933_CreateDaemonKeysTable',1);
+INSERT INTO `migrations` VALUES (110,'2017_09_23_173628_RemoveDaemonSecretFromServersTable',1);
+INSERT INTO `migrations` VALUES (111,'2017_09_23_185022_RemoveDaemonSecretFromSubusersTable',1);
+INSERT INTO `migrations` VALUES (112,'2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier',1);
+INSERT INTO `migrations` VALUES (113,'2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration',1);
+INSERT INTO `migrations` VALUES (114,'2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted',1);
+INSERT INTO `migrations` VALUES (115,'2017_10_06_214026_ServicesToNestsConversion',1);
+INSERT INTO `migrations` VALUES (116,'2017_10_06_214053_ServiceOptionsToEggsConversion',1);
+INSERT INTO `migrations` VALUES (117,'2017_10_06_215741_ServiceVariablesToEggVariablesConversion',1);
+INSERT INTO `migrations` VALUES (118,'2017_10_24_222238_RemoveLegacySFTPInformation',1);
+INSERT INTO `migrations` VALUES (119,'2017_11_11_161922_Add2FaLastAuthorizationTimeColumn',1);
+INSERT INTO `migrations` VALUES (120,'2017_11_19_122708_MigratePubPrivFormatToSingleKey',1);
+INSERT INTO `migrations` VALUES (121,'2017_12_04_184012_DropAllocationsWhenNodeIsDeleted',1);
+INSERT INTO `migrations` VALUES (122,'2017_12_12_220426_MigrateSettingsTableToNewFormat',1);
+INSERT INTO `migrations` VALUES (123,'2018_01_01_122821_AllowNegativeValuesForServerSwap',1);
+INSERT INTO `migrations` VALUES (124,'2018_01_11_213943_AddApiKeyPermissionColumns',1);
+INSERT INTO `migrations` VALUES (125,'2018_01_13_142012_SetupTableForKeyEncryption',1);
+INSERT INTO `migrations` VALUES (126,'2018_01_13_145209_AddLastUsedAtColumn',1);
+INSERT INTO `migrations` VALUES (127,'2018_02_04_145617_AllowTextInUserExternalId',1);
+INSERT INTO `migrations` VALUES (128,'2018_02_10_151150_remove_unique_index_on_external_id_column',1);
+INSERT INTO `migrations` VALUES (129,'2018_02_17_134254_ensure_unique_allocation_id_on_servers_table',1);
+INSERT INTO `migrations` VALUES (130,'2018_02_24_112356_add_external_id_column_to_servers_table',1);
+INSERT INTO `migrations` VALUES (131,'2018_02_25_160152_remove_default_null_value_on_table',1);
+INSERT INTO `migrations` VALUES (132,'2018_02_25_160604_define_unique_index_on_users_external_id',1);
+INSERT INTO `migrations` VALUES (133,'2018_03_01_192831_add_database_and_port_limit_columns_to_servers_table',1);
+INSERT INTO `migrations` VALUES (134,'2018_03_15_124536_add_description_to_nodes',1);
+INSERT INTO `migrations` VALUES (135,'2018_05_04_123826_add_maintenance_to_nodes',1);
+INSERT INTO `migrations` VALUES (136,'2018_09_03_143756_allow_egg_variables_to_have_longer_values',1);
+INSERT INTO `migrations` VALUES (137,'2018_09_03_144005_allow_server_variables_to_have_longer_values',1);
+INSERT INTO `migrations` VALUES (138,'2019_03_02_142328_set_allocation_limit_default_null',1);
+INSERT INTO `migrations` VALUES (139,'2019_03_02_151321_fix_unique_index_to_account_for_host',1);
+INSERT INTO `migrations` VALUES (140,'2020_03_22_163911_merge_permissions_table_into_subusers',1);
+INSERT INTO `migrations` VALUES (141,'2020_03_22_164814_drop_permissions_table',1);
+INSERT INTO `migrations` VALUES (142,'2020_04_03_203624_add_threads_column_to_servers_table',1);
+INSERT INTO `migrations` VALUES (143,'2020_04_03_230614_create_backups_table',1);
+INSERT INTO `migrations` VALUES (144,'2020_04_04_131016_add_table_server_transfers',1);
+INSERT INTO `migrations` VALUES (145,'2020_04_10_141024_store_node_tokens_as_encrypted_value',1);
+INSERT INTO `migrations` VALUES (146,'2020_04_17_203438_allow_nullable_descriptions',1);
+INSERT INTO `migrations` VALUES (147,'2020_04_22_055500_add_max_connections_column',1);
+INSERT INTO `migrations` VALUES (148,'2020_04_26_111208_add_backup_limit_to_servers',1);
+INSERT INTO `migrations` VALUES (149,'2020_05_20_234655_add_mounts_table',1);
+INSERT INTO `migrations` VALUES (150,'2020_05_21_192756_add_mount_server_table',1);
+INSERT INTO `migrations` VALUES (151,'2020_07_02_213612_create_user_recovery_tokens_table',1);
+INSERT INTO `migrations` VALUES (152,'2020_07_09_201845_add_notes_column_for_allocations',1);
+INSERT INTO `migrations` VALUES (153,'2020_08_20_205533_add_backup_state_column_to_backups',1);
+INSERT INTO `migrations` VALUES (154,'2020_08_22_132500_update_bytes_to_unsigned_bigint',1);
+INSERT INTO `migrations` VALUES (155,'2020_08_23_175331_modify_checksums_column_for_backups',1);
+INSERT INTO `migrations` VALUES (156,'2020_09_13_110007_drop_packs_from_servers',1);
+INSERT INTO `migrations` VALUES (157,'2020_09_13_110021_drop_packs_from_api_key_permissions',1);
+INSERT INTO `migrations` VALUES (158,'2020_09_13_110047_drop_packs_table',1);
+INSERT INTO `migrations` VALUES (159,'2020_09_13_113503_drop_daemon_key_table',1);
+INSERT INTO `migrations` VALUES (160,'2020_10_10_165437_change_unique_database_name_to_account_for_server',1);
+INSERT INTO `migrations` VALUES (161,'2020_10_26_194904_remove_nullable_from_schedule_name_field',1);
+INSERT INTO `migrations` VALUES (162,'2020_11_02_201014_add_features_column_to_eggs',1);
+INSERT INTO `migrations` VALUES (163,'2020_12_12_102435_support_multiple_docker_images_and_updates',1);
+INSERT INTO `migrations` VALUES (164,'2020_12_14_013707_make_successful_nullable_in_server_transfers',1);
+INSERT INTO `migrations` VALUES (165,'2020_12_17_014330_add_archived_field_to_server_transfers_table',1);
+INSERT INTO `migrations` VALUES (166,'2020_12_24_092449_make_allocation_fields_json',1);
+INSERT INTO `migrations` VALUES (167,'2020_12_26_184914_add_upload_id_column_to_backups_table',1);
+INSERT INTO `migrations` VALUES (168,'2021_01_10_153937_add_file_denylist_to_egg_configs',1);
+INSERT INTO `migrations` VALUES (169,'2021_01_13_013420_add_cron_month',1);
+INSERT INTO `migrations` VALUES (170,'2021_01_17_102401_create_audit_logs_table',1);
+INSERT INTO `migrations` VALUES (171,'2021_01_17_152623_add_generic_server_status_column',1);
+INSERT INTO `migrations` VALUES (172,'2021_01_26_210502_update_file_denylist_to_json',1);
+INSERT INTO `migrations` VALUES (173,'2021_02_23_205021_add_index_for_server_and_action',1);
+INSERT INTO `migrations` VALUES (174,'2021_02_23_212657_make_sftp_port_unsigned_int',1);
+INSERT INTO `migrations` VALUES (175,'2021_03_21_104718_force_cron_month_field_to_have_value_if_missing',1);
+INSERT INTO `migrations` VALUES (176,'2021_05_01_092457_add_continue_on_failure_option_to_tasks',1);
+INSERT INTO `migrations` VALUES (177,'2021_05_01_092523_add_only_run_when_server_online_option_to_schedules',1);
+INSERT INTO `migrations` VALUES (178,'2021_05_03_201016_add_support_for_locking_a_backup',1);
+INSERT INTO `migrations` VALUES (179,'2021_07_12_013420_remove_userinteraction',1);
+INSERT INTO `migrations` VALUES (180,'2021_07_17_211512_create_user_ssh_keys_table',1);
+INSERT INTO `migrations` VALUES (181,'2021_08_03_210600_change_successful_field_to_default_to_false_on_backups_table',1);
+INSERT INTO `migrations` VALUES (182,'2021_08_21_175111_add_foreign_keys_to_mount_node_table',1);
+INSERT INTO `migrations` VALUES (183,'2021_08_21_175118_add_foreign_keys_to_mount_server_table',1);
+INSERT INTO `migrations` VALUES (184,'2021_08_21_180921_add_foreign_keys_to_egg_mount_table',1);
+INSERT INTO `migrations` VALUES (185,'2022_01_25_030847_drop_google_analytics',1);
+INSERT INTO `migrations` VALUES (186,'2022_05_07_165334_migrate_egg_images_array_to_new_format',1);
+INSERT INTO `migrations` VALUES (187,'2022_05_28_135717_create_activity_logs_table',1);
+INSERT INTO `migrations` VALUES (188,'2022_05_29_140349_create_activity_log_actors_table',1);
+INSERT INTO `migrations` VALUES (189,'2022_06_18_112822_track_api_key_usage_for_activity_events',1);
+INSERT INTO `migrations` VALUES (190,'2022_08_16_214400_add_force_outgoing_ip_column_to_eggs_table',1);
+INSERT INTO `migrations` VALUES (191,'2022_08_16_230204_add_installed_at_column_to_servers_table',1);
+INSERT INTO `migrations` VALUES (192,'2022_12_12_213937_update_mail_settings_to_new_format',1);
+INSERT INTO `migrations` VALUES (193,'2023_01_24_210051_add_uuid_column_to_failed_jobs_table',1);
+INSERT INTO `migrations` VALUES (194,'2023_02_23_191004_add_expires_at_column_to_api_keys_table',1);
diff --git a/flake.lock b/flake.lock
index afb0fb1749..70cc00d198 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,77 +1,32 @@
{
"nodes": {
- "dream2nix": {
+ "flake-parts": {
"inputs": {
- "nixpkgs": [
+ "nixpkgs-lib": [
"nixpkgs"
- ],
- "purescript-overlay": "purescript-overlay",
- "pyproject-nix": "pyproject-nix"
- },
- "locked": {
- "lastModified": 1710268378,
- "narHash": "sha256-O61PtxUHbmwI6Ltjn9jY3QY2hRPPz7pe3BHhIYK4QkU=",
- "owner": "nix-community",
- "repo": "dream2nix",
- "rev": "cd782df677aad08f7193c97376d615943c3cd4c9",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "dream2nix",
- "type": "github"
- }
- },
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "mk-node-package": {
- "inputs": {
- "flake-utils": [
- "flake-utils"
- ],
- "nixpkgs": [
- "nixpkgs"
- ],
- "npmlock2nix": "npmlock2nix",
- "pnpm2nix": "pnpm2nix"
+ ]
},
"locked": {
- "lastModified": 1633790997,
- "narHash": "sha256-1mk4EwNkWtTNpeRivZmJTzB+92g07maeFRVUMnnRh1U=",
- "owner": "winston0410",
- "repo": "mkNodePackage",
- "rev": "a7eca5e027c8b260dca4ece7d8dd187f92420611",
+ "lastModified": 1726153070,
+ "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
- "owner": "winston0410",
- "repo": "mkNodePackage",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1709961763,
- "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+ "lastModified": 1726463316,
+ "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+ "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@@ -81,107 +36,11 @@
"type": "github"
}
},
- "npmlock2nix": {
- "flake": false,
- "locked": {
- "lastModified": 1633729941,
- "narHash": "sha256-v2YPcEWI1Wz8ErivorubgLcDT06H6YzFT7uhp1ymqnE=",
- "owner": "winston0410",
- "repo": "npmlock2nix",
- "rev": "6ade47a330b6919defb45c0eb984a64234aa8468",
- "type": "github"
- },
- "original": {
- "owner": "winston0410",
- "ref": "issue113",
- "repo": "npmlock2nix",
- "type": "github"
- }
- },
- "pnpm2nix": {
- "flake": false,
- "locked": {
- "lastModified": 1594396611,
- "narHash": "sha256-UXOUQ+2A89/zaxYhTHiRrRBU5exbUWrg+FoJYMcNwuI=",
- "owner": "nix-community",
- "repo": "pnpm2nix",
- "rev": "f67be0925a91b92f54d99dbdead7a06920b979ac",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "master",
- "repo": "pnpm2nix",
- "type": "github"
- }
- },
- "purescript-overlay": {
- "inputs": {
- "nixpkgs": [
- "dream2nix",
- "nixpkgs"
- ],
- "slimlock": "slimlock"
- },
- "locked": {
- "lastModified": 1696022621,
- "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=",
- "owner": "thomashoneyman",
- "repo": "purescript-overlay",
- "rev": "047c7933abd6da8aa239904422e22d190ce55ead",
- "type": "github"
- },
- "original": {
- "owner": "thomashoneyman",
- "repo": "purescript-overlay",
- "type": "github"
- }
- },
- "pyproject-nix": {
- "flake": false,
- "locked": {
- "lastModified": 1702448246,
- "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=",
- "owner": "davhau",
- "repo": "pyproject.nix",
- "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb",
- "type": "github"
- },
- "original": {
- "owner": "davhau",
- "ref": "dream2nix",
- "repo": "pyproject.nix",
- "type": "github"
- }
- },
"root": {
"inputs": {
- "dream2nix": "dream2nix",
- "flake-utils": "flake-utils",
- "mk-node-package": "mk-node-package",
- "nixpkgs": "nixpkgs"
- }
- },
- "slimlock": {
- "inputs": {
- "nixpkgs": [
- "dream2nix",
- "purescript-overlay",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1688610262,
- "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=",
- "owner": "thomashoneyman",
- "repo": "slimlock",
- "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6",
- "type": "github"
- },
- "original": {
- "owner": "thomashoneyman",
- "repo": "slimlock",
- "type": "github"
+ "flake-parts": "flake-parts",
+ "nixpkgs": "nixpkgs",
+ "systems": "systems"
}
},
"systems": {
diff --git a/flake.nix b/flake.nix
index 43d760ef93..9c260f5eef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,45 +2,25 @@
description = "Pterodactyl Panel";
inputs = {
- dream2nix = {
- url = "github:nix-community/dream2nix";
- inputs.nixpkgs.follows = "nixpkgs";
+ flake-parts = {
+ url = "github:hercules-ci/flake-parts";
+ inputs.nixpkgs-lib.follows = "nixpkgs";
};
- flake-utils = {
- url = "github:numtide/flake-utils";
- };
-
- mk-node-package = {
- url = "github:winston0410/mkNodePackage";
- inputs = {
- flake-utils.follows = "flake-utils";
- nixpkgs.follows = "nixpkgs";
- };
- };
-
- nixpkgs = {
- url = "github:NixOS/nixpkgs/nixos-unstable";
- };
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ systems.url = "github:nix-systems/default";
};
- outputs = {
- self,
- dream2nix,
- flake-utils,
- mk-node-package,
- nixpkgs,
- ...
- }:
- flake-utils.lib.eachDefaultSystem (
- system: let
- version = "latest";
-
- pkgs = import nixpkgs {inherit system;};
- mkNodePackage = mk-node-package.lib."${system}".mkNodePackage;
+ outputs = {self, ...} @ inputs:
+ inputs.flake-parts.lib.mkFlake {inherit inputs;} {
+ systems = import inputs.systems;
+ perSystem = {
+ pkgs,
+ system,
+ ...
+ }: let
php = pkgs.php; # PHP 8.2
- phpPackages = pkgs.phpPackages; # PHP 8.2
phpWithExtensions = php.buildEnv {
extensions = {
@@ -56,207 +36,102 @@
xdebug.mode=debug
'';
};
- composer = phpPackages.composer.override {php = phpWithExtensions;};
-
- caCertificates = pkgs.runCommand "ca-certificates" {} ''
- mkdir -p $out/etc/ssl/certs $out/etc/pki/tls/certs
- ln -s ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-bundle.crt
- ln -s ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-certificates.crt
- ln -s ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/pki/tls/certs/ca-bundle.crt
- '';
-
- caddyfile = pkgs.writeText "Caddyfile" ''
- :80 {
- root * /var/www/html/public/
- file_server
-
- header {
- -Server
- -X-Powered-By
- Referrer-Policy "same-origin"
- X-Frame-Options "deny"
- X-XSS-Protection "1; mode=block"
- X-Content-Type-Options "nosniff"
- }
-
- encode gzip zstd
-
- php_fastcgi localhost:9000
-
- try_files {path} {path}/ /index.php?{query}
- }
- '';
-
- phpfpmConf = pkgs.writeText "php-fpm.conf" ''
- [global]
- error_log = /dev/stderr
- daemonize = no
-
- [www]
- user = nobody
- group = nobody
-
- listen = 0.0.0.0:9000
-
- pm = dynamic
- pm.start_servers = 4
- pm.min_spare_servers = 4
- pm.max_spare_servers = 16
- pm.max_children = 64
- pm.max_requests = 256
-
- clear_env = no
- catch_workers_output = yes
-
- decorate_workers_output = no
- '';
-
- configs = pkgs.runCommand "configs" {} ''
- mkdir -p $out/etc/caddy
- ln -s ${caddyfile} $out/etc/caddy/Caddyfile
- ln -s ${phpfpmConf} $out/etc/php-fpm.conf
- '';
-
- src = with pkgs.lib;
- cleanSource (cleanSourceWith {
- filter = name: type: let
- baseName = baseNameOf (toString name);
- in
- !(builtins.elem baseName [
- ".direnv"
- ".github"
- "bootstrap/cache"
- "node_modules"
- "public/build"
- "public/hot"
- "storage"
- "vendor"
- ".editorconfig"
- ".env"
- ".env.testing"
- ".envrc"
- ".gitignore"
- ".php-cs-fixer.cache"
- ".phpunit.result.cache"
- "BUILDING.md"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.md"
- "docker-compose.development.yaml"
- "docker-compose.example.yaml"
- "docker-compose.yaml"
- "flake.lock"
- "flake.nix"
- "shell.nix"
- ]);
- src = ./.;
- });
-
- app =
- (dream2nix.lib.makeFlakeOutputs {
- config.projectRoot = src;
- source = src;
- settings = [
- {
- translator = "composer-lock";
- subsystemInfo.noDev = true;
- }
- ];
- systems = [system];
- autoProjects = true;
- })
- .packages
- ."${system}"
- ."pterodactyl/panel";
-
- ui = mkNodePackage {
- inherit src version;
-
- pname = "pterodactyl";
- buildInputs = [];
- buildPhase = ''
- yarn run build:production
- '';
-
- installPhase = ''
- mkdir -p $out
- cp -r public/build $out
- '';
+ composer = php.packages.composer.override {php = phpWithExtensions;};
+ in {
+ # Initialize pkgs with our overlays
+ _module.args.pkgs = import inputs.nixpkgs {
+ inherit system;
};
- panel = pkgs.stdenv.mkDerivation {
- inherit src version;
-
- pname = "pterodactyl";
- buildInputs = [app ui];
+ devShells.default = pkgs.mkShellNoCC {
+ buildInputs = with pkgs; [
+ composer
+ nodejs_18
+ nodePackages.pnpm
+ phpWithExtensions
+ ];
- installPhase = ''
- cp -r ${app}/lib/vendor/pterodactyl/panel $out
-
- chmod 755 $out
- chmod 755 $out/public
-
- mkdir -p $out/public/build
- cp -r ${ui}/build/* $out/public/build
-
- rm $out/composer.json.orig
+ shellHook = ''
+ PATH="$PATH:${pkgs.docker-compose}/libexec/docker/cli-plugins"
'';
};
- in {
- defaultPackage = panel;
- devShell = import ./shell.nix {inherit composer phpWithExtensions pkgs;};
-
- packages = {
- inherit panel;
- development = with pkgs;
- dockerTools.buildImage {
- name = "pterodactyl/development";
- tag = "panel";
+ packages.development = pkgs.dockerTools.buildImage {
+ name = "pterodactyl/development";
+ tag = "panel";
- copyToRoot = pkgs.buildEnv {
- name = "image-root";
- paths = [
- bash
- dockerTools.fakeNss
- caCertificates
- caddy
- composer
- configs
- coreutils
- mysql80
- nodejs_18
- nodePackages.yarn
- phpWithExtensions
- ];
- pathsToLink = ["/bin" "/etc"];
- };
- };
+ copyToRoot = pkgs.buildEnv (let
+ caddyfile = pkgs.writeText "Caddyfile" ''
+ :80 {
+ root * /var/www/html/public/
+ file_server
- oci = with pkgs;
- dockerTools.buildImage {
- name = "pterodactyl/panel";
- tag = version;
+ header {
+ -Server
+ -X-Powered-By
+ Referrer-Policy "same-origin"
+ X-Frame-Options "deny"
+ X-XSS-Protection "1; mode=block"
+ X-Content-Type-Options "nosniff"
+ }
- copyToRoot = buildEnv {
- name = "image-root";
- paths = [
- dockerTools.fakeNss
- caCertificates
- caddy
- configs
- phpWithExtensions
+ encode gzip zstd
- panel
- ];
- pathsToLink = ["/bin" "/etc"];
- };
+ php_fastcgi localhost:9000 {
+ trusted_proxies private_ranges
+ }
- config = {
- Cmd = [];
- };
- };
+ try_files {path} {path}/ /index.php?{query}
+ }
+ '';
+
+ phpfpmConf = pkgs.writeText "php-fpm.conf" ''
+ [global]
+ error_log = /dev/stderr
+ daemonize = no
+
+ [www]
+ user = nobody
+ group = nobody
+
+ listen = 0.0.0.0:9000
+
+ pm = dynamic
+ pm.start_servers = 4
+ pm.min_spare_servers = 4
+ pm.max_spare_servers = 16
+ pm.max_children = 64
+ pm.max_requests = 256
+
+ clear_env = no
+ catch_workers_output = yes
+
+ decorate_workers_output = no
+ '';
+ in {
+ name = "image-root";
+ paths = with pkgs; [
+ (pkgs.runCommand "configs" {} ''
+ mkdir -p "$out"/etc/caddy
+ ln -s ${caddyfile} "$out"/etc/caddy/Caddyfile
+ ln -s ${phpfpmConf} "$out"/etc/php-fpm.conf
+ '')
+ bash
+ dockerTools.caCertificates
+ dockerTools.fakeNss
+ caddy
+ composer
+ coreutils
+ mysql80
+ nodejs_18
+ nodePackages.pnpm
+ nodePackages.yarn
+ phpWithExtensions
+ ];
+ pathsToLink = ["/bin" "/etc"];
+ });
};
- }
- );
+ };
+ };
}
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000000..d1ba612ace
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,21 @@
+includes:
+ - ./vendor/larastan/larastan/extension.neon
+
+parameters:
+ # Level 9 is the highest level
+ level: 4
+ paths:
+ - app/
+ ignoreErrors:
+ # Ignore repository interface missing methods
+ - '#Call to an undefined method Pterodactyl\\Repositories\\Wings\\DaemonRepository::(\w+)\(\)#'
+
+ # Ignore magic spatie calls
+ - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Builder::allowed(\w+)\(\)#'
+ excludePaths:
+ - app/Repositories
+
+ # More magic spatie to be replaced
+ - app/Extensions/Spatie/Fractalistic/Fractal.php
+ #
+ # checkMissingIterableValueType: false
diff --git a/phpunit.xml b/phpunit.xml
index 8d47f564fc..bf173ed267 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -20,11 +20,12 @@
+
+
-
+
-
diff --git a/resources/scripts/api/account/disableAccountTwoFactor.ts b/resources/scripts/api/account/disableAccountTwoFactor.ts
index 2b41fe20fe..fe8064008e 100644
--- a/resources/scripts/api/account/disableAccountTwoFactor.ts
+++ b/resources/scripts/api/account/disableAccountTwoFactor.ts
@@ -1,9 +1,11 @@
import http from '@/api/http';
-export default (password: string): Promise => {
+function disableAccountTwoFactor(password: string): Promise {
return new Promise((resolve, reject) => {
- http.delete('/api/client/account/two-factor', { params: { password } })
+ http.post('/api/client/account/two-factor/disable', { password })
.then(() => resolve())
.catch(reject);
});
-};
+}
+
+export default disableAccountTwoFactor;
diff --git a/routes/api-client.php b/routes/api-client.php
index 64ceecf3e4..6887f1b294 100644
--- a/routes/api-client.php
+++ b/routes/api-client.php
@@ -24,7 +24,7 @@
Route::get('/', [Client\AccountController::class, 'index'])->name('api:client.account');
Route::get('/two-factor', [Client\TwoFactorController::class, 'index']);
Route::post('/two-factor', [Client\TwoFactorController::class, 'store']);
- Route::delete('/two-factor', [Client\TwoFactorController::class, 'delete']);
+ Route::post('/two-factor/disable', [Client\TwoFactorController::class, 'delete']);
});
Route::put('/email', [Client\AccountController::class, 'updateEmail'])->name('api:client.account.update-email');
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
index 104980aa3b..fedb287fec 100755
--- a/storage/app/.gitignore
+++ b/storage/app/.gitignore
@@ -1,6 +1,4 @@
*
+!private/
+!public/
!.gitignore
-!services/*
-packs/**/*
-services/.bak/*
-!packs/.githold
diff --git a/storage/app/packs/.githold b/storage/app/packs/.githold
deleted file mode 100755
index e69de29bb2..0000000000
diff --git a/storage/app/private/.gitignore b/storage/app/private/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/storage/app/private/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/storage/app/public/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
deleted file mode 100755
index c96a04f008..0000000000
--- a/storage/debugbar/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
index 953edb7a99..05c4471f2b 100755
--- a/storage/framework/.gitignore
+++ b/storage/framework/.gitignore
@@ -1,7 +1,9 @@
-config.php
-routes.php
compiled.php
-services.json
+config.php
+down
events.scanned.php
+maintenance.php
+routes.php
routes.scanned.php
-down
+schedule-*
+services.json
diff --git a/tests/Assertions/AssertsActivityLogged.php b/tests/Assertions/AssertsActivityLogged.php
index 7c3232418c..7bf990d5d3 100644
--- a/tests/Assertions/AssertsActivityLogged.php
+++ b/tests/Assertions/AssertsActivityLogged.php
@@ -11,7 +11,7 @@
trait AssertsActivityLogged
{
/**
- * @param \Illuminate\Database\Eloquent\Model|array $subjects
+ * @param Model|array $subjects
*/
public function assertActivityFor(string $event, ?Model $actor, ...$subjects): void
{
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
deleted file mode 100644
index e9dc91089f..0000000000
--- a/tests/CreatesApplication.php
+++ /dev/null
@@ -1,21 +0,0 @@
-make(Kernel::class)->bootstrap();
-
- return $app;
- }
-}
diff --git a/tests/Integration/Api/Application/Users/UserControllerTest.php b/tests/Integration/Api/Application/Users/UserControllerTest.php
index 04709e55f2..a2512094b4 100644
--- a/tests/Integration/Api/Application/Users/UserControllerTest.php
+++ b/tests/Integration/Api/Application/Users/UserControllerTest.php
@@ -279,9 +279,8 @@ public function testDeleteUser()
/**
* Test that an API key without write permissions cannot create, update, or
* delete a user model.
- *
- * @dataProvider userWriteEndpointsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('userWriteEndpointsDataProvider')]
public function testApiKeyWithoutWritePermissions(string $method, string $url)
{
$this->createNewDefaultApiKey($this->getApiUser(), ['r_users' => AdminAcl::READ]);
diff --git a/tests/Integration/Api/Client/AccountControllerTest.php b/tests/Integration/Api/Client/AccountControllerTest.php
index 0980396dc7..a10bc05ba9 100644
--- a/tests/Integration/Api/Client/AccountControllerTest.php
+++ b/tests/Integration/Api/Client/AccountControllerTest.php
@@ -14,7 +14,7 @@ class AccountControllerTest extends ClientApiIntegrationTestCase
*/
public function testAccountDetailsAreReturned()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$response = $this->actingAs($user)->get('/api/client/account');
@@ -38,7 +38,7 @@ public function testAccountDetailsAreReturned()
*/
public function testEmailIsUpdated()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$response = $this->actingAs($user)->putJson('/api/client/account/email', [
@@ -57,7 +57,7 @@ public function testEmailIsUpdated()
*/
public function testEmailIsNotUpdatedWhenPasswordIsInvalid()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$response = $this->actingAs($user)->putJson('/api/client/account/email', [
@@ -76,7 +76,7 @@ public function testEmailIsNotUpdatedWhenPasswordIsInvalid()
*/
public function testEmailIsNotUpdatedWhenNotValid()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$response = $this->actingAs($user)->putJson('/api/client/account/email', [
@@ -103,7 +103,7 @@ public function testEmailIsNotUpdatedWhenNotValid()
*/
public function testPasswordIsUpdated()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$initialHash = $user->password;
@@ -129,7 +129,7 @@ public function testPasswordIsUpdated()
*/
public function testPasswordIsNotUpdatedIfCurrentPasswordIsInvalid()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$response = $this->actingAs($user)->putJson('/api/client/account/password', [
@@ -172,7 +172,7 @@ public function testErrorIsReturnedForInvalidRequestData()
*/
public function testErrorIsReturnedIfPasswordIsNotConfirmed()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$response = $this->actingAs($user)->putJson('/api/client/account/password', [
diff --git a/tests/Integration/Api/Client/ApiKeyControllerTest.php b/tests/Integration/Api/Client/ApiKeyControllerTest.php
index 5b3d09e5a6..3d76d72978 100644
--- a/tests/Integration/Api/Client/ApiKeyControllerTest.php
+++ b/tests/Integration/Api/Client/ApiKeyControllerTest.php
@@ -25,9 +25,9 @@ protected function tearDown(): void
*/
public function testApiKeysAreReturned()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = ApiKey::factory()->for($user)->create([
'key_type' => ApiKey::TYPE_ACCOUNT,
]);
@@ -44,12 +44,11 @@ public function testApiKeysAreReturned()
* Test that an API key can be created for the client account. This also checks that the
* API key secret is returned as metadata in the response since it will not be returned
* after that point.
- *
- * @dataProvider validIPAddressDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('validIPAddressDataProvider')]
public function testApiKeyCanBeCreatedForAccount(array $data)
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
// Small subtest to ensure we're always comparing the number of keys to the
@@ -67,7 +66,7 @@ public function testApiKeyCanBeCreatedForAccount(array $data)
->assertOk()
->assertJsonPath('object', ApiKey::RESOURCE_NAME);
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = ApiKey::query()->where('identifier', $response->json('attributes.identifier'))->firstOrFail();
$this->assertJsonTransformedWith($response->json('attributes'), $key);
@@ -104,7 +103,7 @@ public function testApiKeyCannotSpecifyMoreThanFiftyIps()
*/
public function testApiKeyLimitIsApplied()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
ApiKey::factory()->times(25)->for($user)->create([
'key_type' => ApiKey::TYPE_ACCOUNT,
@@ -145,9 +144,9 @@ public function testValidationErrorIsReturnedForBadRequests()
->assertJsonPath('errors.0.detail', 'description 不能大于 500 个字符。');
$this->postJson('/api/client/account/api-keys', [
- 'description' => 'Foobar',
- 'allowed_ips' => ['hodor', '127.0.0.1', 'hodor/24'],
- ])
+ 'description' => 'Foobar',
+ 'allowed_ips' => ['hodor', '127.0.0.1', 'hodor/24'],
+ ])
->assertUnprocessable()
->assertJsonPath('errors.0.detail', '"hodor" is not a valid IP address or CIDR range.')
->assertJsonPath('errors.0.meta.source_field', 'allowed_ips.0')
@@ -160,9 +159,9 @@ public function testValidationErrorIsReturnedForBadRequests()
*/
public function testApiKeyCanBeDeleted()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = ApiKey::factory()->for($user)->create([
'key_type' => ApiKey::TYPE_ACCOUNT,
]);
@@ -179,9 +178,9 @@ public function testApiKeyCanBeDeleted()
*/
public function testNonExistentApiKeyDeletionReturns404Error()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = ApiKey::factory()->create([
'user_id' => $user->id,
'key_type' => ApiKey::TYPE_ACCOUNT,
@@ -200,11 +199,11 @@ public function testNonExistentApiKeyDeletionReturns404Error()
*/
public function testApiKeyBelongingToAnotherUserCannotBeDeleted()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\User $user2 */
+ /** @var User $user2 */
$user2 = User::factory()->create();
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = ApiKey::factory()->for($user2)->create([
'key_type' => ApiKey::TYPE_ACCOUNT,
]);
@@ -223,9 +222,9 @@ public function testApiKeyBelongingToAnotherUserCannotBeDeleted()
*/
public function testApplicationApiKeyCannotBeDeleted()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\ApiKey $key */
+ /** @var ApiKey $key */
$key = ApiKey::factory()->for($user)->create([
'key_type' => ApiKey::TYPE_APPLICATION,
]);
diff --git a/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php b/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
index bc515386c7..d7ceb34a22 100644
--- a/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
+++ b/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
@@ -43,18 +43,19 @@ protected function tearDown(): void
* to keep re-assigning variables.
*
* @param \Illuminate\Http\Response $response
+ * @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Testing\TestResponse
*/
- protected function createTestResponse($response)
+ protected function createTestResponse($response, $request)
{
- return TestResponse::fromBaseResponse($response);
+ return TestResponse::fromBaseResponse($response, $request);
}
/**
* Returns a link to the specific resource using the client API.
*/
- protected function link(mixed $model, string $append = null): string
+ protected function link(mixed $model, ?string $append = null): string
{
switch (get_class($model)) {
case Server::class:
diff --git a/tests/Integration/Api/Client/ClientControllerTest.php b/tests/Integration/Api/Client/ClientControllerTest.php
index 3a080e23e4..954ca6f53b 100644
--- a/tests/Integration/Api/Client/ClientControllerTest.php
+++ b/tests/Integration/Api/Client/ClientControllerTest.php
@@ -101,8 +101,8 @@ public function testServersAreFilteredUsingNameAndUuidInformation()
*/
public function testServersAreFilteredUsingAllocationInformation()
{
- /** @var \Pterodactyl\Models\User $user */
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var User $user */
+ /** @var Server $server */
[$user, $server] = $this->generateTestAccount();
$server2 = $this->createServerModel(['user_id' => $user->id, 'node_id' => $server->node_id]);
@@ -203,7 +203,7 @@ public function testFilterOnlyOwnerServers()
*/
public function testPermissionsAreReturned()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$this->actingAs($user)
@@ -285,9 +285,8 @@ public function testAllServersAreReturnedToAdmin()
/**
* Test that no servers get returned if the user requests all admin level servers by using
* ?type=admin or ?type=admin-all in the request.
- *
- * @dataProvider filterTypeDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('filterTypeDataProvider')]
public function testNoServersAreReturnedIfAdminFilterIsPassedByRegularUser(string $type)
{
/** @var \Pterodactyl\Models\User[] $users */
@@ -309,7 +308,7 @@ public function testNoServersAreReturnedIfAdminFilterIsPassedByRegularUser(strin
*/
public function testOnlyPrimaryAllocationIsReturnedToSubuser()
{
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
[$user, $server] = $this->generateTestAccount([Permission::ACTION_WEBSOCKET_CONNECT]);
$server->allocation->notes = 'Test notes';
$server->allocation->save();
diff --git a/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php b/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php
index 9c5eebd107..c5d6ac127c 100644
--- a/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php
+++ b/tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php
@@ -8,9 +8,7 @@
class AllocationAuthorizationTest extends ClientApiIntegrationTestCase
{
- /**
- * @dataProvider methodDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('methodDataProvider')]
public function testAccessToAServersAllocationsIsRestrictedProperly(string $method, string $endpoint)
{
// The API $user is the owner of $server1.
diff --git a/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php b/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php
index 0ef17dd842..49dc565a16 100644
--- a/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php
+++ b/tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php
@@ -23,9 +23,8 @@ public function setUp(): void
/**
* Tests that a new allocation can be properly assigned to a server.
- *
- * @dataProvider permissionDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionDataProvider')]
public function testNewAllocationCanBeAssignedToServer(array $permission)
{
/** @var \Pterodactyl\Models\Server $server */
diff --git a/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php b/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php
index 4304f20c4e..01902aafae 100644
--- a/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php
+++ b/tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php
@@ -12,16 +12,15 @@ class DeleteAllocationTest extends ClientApiIntegrationTestCase
/**
* Test that an allocation is deleted from the server and the notes are properly reset
* to an empty value on assignment.
- *
- * @dataProvider permissionDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionDataProvider')]
public function testAllocationCanBeDeletedFromServer(array $permission)
{
/** @var \Pterodactyl\Models\Server $server */
[$user, $server] = $this->generateTestAccount($permission);
$server->update(['allocation_limit' => 2]);
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create([
'server_id' => $server->id,
'node_id' => $server->node_id,
@@ -41,7 +40,7 @@ public function testErrorIsReturnedIfUserDoesNotHavePermission()
/** @var \Pterodactyl\Models\Server $server */
[$user, $server] = $this->generateTestAccount([Permission::ACTION_ALLOCATION_CREATE]);
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create([
'server_id' => $server->id,
'node_id' => $server->node_id,
@@ -73,7 +72,7 @@ public function testAllocationCannotBeDeletedIfServerLimitIsNotDefined()
{
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->forServer($server)->create(['notes' => 'Test notes']);
$this->actingAs($user)->deleteJson($this->link($allocation))
diff --git a/tests/Integration/Api/Client/Server/Backup/BackupAuthorizationTest.php b/tests/Integration/Api/Client/Server/Backup/BackupAuthorizationTest.php
index 20d9e13a76..33fde157c6 100644
--- a/tests/Integration/Api/Client/Server/Backup/BackupAuthorizationTest.php
+++ b/tests/Integration/Api/Client/Server/Backup/BackupAuthorizationTest.php
@@ -10,9 +10,7 @@
class BackupAuthorizationTest extends ClientApiIntegrationTestCase
{
- /**
- * @dataProvider methodDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('methodDataProvider')]
public function testAccessToAServersBackupIsRestrictedProperly(string $method, string $endpoint)
{
// The API $user is the owner of $server1.
diff --git a/tests/Integration/Api/Client/Server/Backup/DeleteBackupTest.php b/tests/Integration/Api/Client/Server/Backup/DeleteBackupTest.php
index 5c4d53e496..d6aea997d6 100644
--- a/tests/Integration/Api/Client/Server/Backup/DeleteBackupTest.php
+++ b/tests/Integration/Api/Client/Server/Backup/DeleteBackupTest.php
@@ -43,7 +43,7 @@ public function testBackupCanBeDeleted()
[$user, $server] = $this->generateTestAccount([Permission::ACTION_BACKUP_DELETE]);
- /** @var \Pterodactyl\Models\Backup $backup */
+ /** @var Backup $backup */
$backup = Backup::factory()->create(['server_id' => $server->id]);
$this->repository->expects('setServer->delete')->with(
diff --git a/tests/Integration/Api/Client/Server/Database/DatabaseAuthorizationTest.php b/tests/Integration/Api/Client/Server/Database/DatabaseAuthorizationTest.php
index 2ea709ce51..c31aed6e29 100644
--- a/tests/Integration/Api/Client/Server/Database/DatabaseAuthorizationTest.php
+++ b/tests/Integration/Api/Client/Server/Database/DatabaseAuthorizationTest.php
@@ -12,9 +12,7 @@
class DatabaseAuthorizationTest extends ClientApiIntegrationTestCase
{
- /**
- * @dataProvider methodDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('methodDataProvider')]
public function testAccessToAServersDatabasesIsRestrictedProperly(string $method, string $endpoint)
{
// The API $user is the owner of $server1.
diff --git a/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php b/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php
index b19be99ccf..0fc9a865b3 100644
--- a/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php
+++ b/tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php
@@ -48,9 +48,8 @@ public function testServerAllocationsAreNotReturnedWithoutPermission()
/**
* Tests that notes on an allocation can be set correctly.
- *
- * @dataProvider updatePermissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('updatePermissionsDataProvider')]
public function testAllocationNotesCanBeUpdated(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
@@ -96,9 +95,7 @@ public function testAllocationNotesCannotBeUpdatedByInvalidUsers()
$this->actingAs($user)->postJson($this->link($server->allocation))->assertForbidden();
}
- /**
- * @dataProvider updatePermissionsDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('updatePermissionsDataProvider')]
public function testPrimaryAllocationCanBeModified(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
diff --git a/tests/Integration/Api/Client/Server/PowerControllerTest.php b/tests/Integration/Api/Client/Server/PowerControllerTest.php
index d17ca1bc03..ee0b57b7cf 100644
--- a/tests/Integration/Api/Client/Server/PowerControllerTest.php
+++ b/tests/Integration/Api/Client/Server/PowerControllerTest.php
@@ -15,9 +15,8 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
* the command to the server.
*
* @param string[] $permissions
- *
- * @dataProvider invalidPermissionDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('invalidPermissionDataProvider')]
public function testSubuserWithoutPermissionsReceivesError(string $action, array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
@@ -45,9 +44,8 @@ public function testInvalidPowerSignalResultsInError()
/**
* Test that sending a valid power actions works.
- *
- * @dataProvider validPowerActionDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('validPowerActionDataProvider')]
public function testActionCanBeSentToServer(string $action, string $permission)
{
$service = \Mockery::mock(DaemonPowerRepository::class);
diff --git a/tests/Integration/Api/Client/Server/Schedule/CreateServerScheduleTest.php b/tests/Integration/Api/Client/Server/Schedule/CreateServerScheduleTest.php
index f72ef09f57..26ab866e05 100644
--- a/tests/Integration/Api/Client/Server/Schedule/CreateServerScheduleTest.php
+++ b/tests/Integration/Api/Client/Server/Schedule/CreateServerScheduleTest.php
@@ -11,9 +11,8 @@ class CreateServerScheduleTest extends ClientApiIntegrationTestCase
{
/**
* Test that a schedule can be created for the server.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testScheduleCanBeCreatedForServer(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
@@ -32,7 +31,7 @@ public function testScheduleCanBeCreatedForServer(array $permissions)
$this->assertNotNull($id = $response->json('attributes.id'));
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::query()->findOrFail($id);
$this->assertFalse($schedule->is_active);
$this->assertFalse($schedule->is_processing);
diff --git a/tests/Integration/Api/Client/Server/Schedule/DeleteServerScheduleTest.php b/tests/Integration/Api/Client/Server/Schedule/DeleteServerScheduleTest.php
index d444470256..c204ff4f54 100644
--- a/tests/Integration/Api/Client/Server/Schedule/DeleteServerScheduleTest.php
+++ b/tests/Integration/Api/Client/Server/Schedule/DeleteServerScheduleTest.php
@@ -12,9 +12,8 @@ class DeleteServerScheduleTest extends ClientApiIntegrationTestCase
{
/**
* Test that a schedule can be deleted from the system.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testScheduleCanBeDeleted(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
diff --git a/tests/Integration/Api/Client/Server/Schedule/ExecuteScheduleTest.php b/tests/Integration/Api/Client/Server/Schedule/ExecuteScheduleTest.php
index 7ca3552995..eafcf3c05a 100644
--- a/tests/Integration/Api/Client/Server/Schedule/ExecuteScheduleTest.php
+++ b/tests/Integration/Api/Client/Server/Schedule/ExecuteScheduleTest.php
@@ -14,16 +14,15 @@ class ExecuteScheduleTest extends ClientApiIntegrationTestCase
{
/**
* Test that a schedule can be executed and is updated in the database correctly.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testScheduleIsExecutedRightAway(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
Bus::fake();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create([
'server_id' => $server->id,
]);
@@ -33,7 +32,7 @@ public function testScheduleIsExecutedRightAway(array $permissions)
$response->assertJsonPath('errors.0.code', 'DisplayException');
$response->assertJsonPath('errors.0.detail', 'Cannot process schedule for task execution: no tasks are registered.');
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create([
'schedule_id' => $schedule->id,
'sequence_id' => 1,
@@ -58,7 +57,7 @@ public function testUserWithoutScheduleUpdatePermissionCannotExecute()
{
[$user, $server] = $this->generateTestAccount([Permission::ACTION_SCHEDULE_CREATE]);
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
$this->actingAs($user)->postJson($this->link($schedule, '/execute'))->assertForbidden();
diff --git a/tests/Integration/Api/Client/Server/Schedule/GetServerSchedulesTest.php b/tests/Integration/Api/Client/Server/Schedule/GetServerSchedulesTest.php
index 483c7ae42f..cc5db4139c 100644
--- a/tests/Integration/Api/Client/Server/Schedule/GetServerSchedulesTest.php
+++ b/tests/Integration/Api/Client/Server/Schedule/GetServerSchedulesTest.php
@@ -22,16 +22,15 @@ protected function tearDown(): void
/**
* Test that schedules for a server are returned.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testServerSchedulesAreReturned(array $permissions, bool $individual)
{
[$user, $server] = $this->generateTestAccount($permissions);
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'sequence_id' => 1, 'time_offset' => 0]);
$response = $this->actingAs($user)
diff --git a/tests/Integration/Api/Client/Server/Schedule/ScheduleAuthorizationTest.php b/tests/Integration/Api/Client/Server/Schedule/ScheduleAuthorizationTest.php
index bf5b8d729d..26a83de4c2 100644
--- a/tests/Integration/Api/Client/Server/Schedule/ScheduleAuthorizationTest.php
+++ b/tests/Integration/Api/Client/Server/Schedule/ScheduleAuthorizationTest.php
@@ -16,9 +16,8 @@ class ScheduleAuthorizationTest extends ClientApiIntegrationTestCase
*
* The comments within the test code itself are better at explaining exactly what is
* being tested and protected against.
- *
- * @dataProvider methodDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('methodDataProvider')]
public function testAccessToAServersSchedulesIsRestrictedProperly(string $method, string $endpoint)
{
// The API $user is the owner of $server1.
diff --git a/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php b/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php
index 23a054b34d..6b6ad10917 100644
--- a/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php
+++ b/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php
@@ -24,14 +24,13 @@ class UpdateServerScheduleTest extends ClientApiIntegrationTestCase
/**
* Test that a schedule can be updated.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testScheduleCanBeUpdated(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
$expected = Utilities::getScheduleNextRunDate('5', '*', '*', '*', '*');
@@ -89,7 +88,7 @@ public function testScheduleIsProcessingIsSetToFalseWhenActiveStateChanges()
{
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create([
'server_id' => $server->id,
'is_active' => true,
diff --git a/tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php b/tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php
index 1add37dcb3..4d34f7aeee 100644
--- a/tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php
+++ b/tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php
@@ -12,14 +12,13 @@ class CreateServerScheduleTaskTest extends ClientApiIntegrationTestCase
{
/**
* Test that a task can be created.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testTaskCanBeCreated(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
$this->assertEmpty($schedule->tasks);
@@ -31,7 +30,7 @@ public function testTaskCanBeCreated(array $permissions)
]);
$response->assertOk();
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::query()->findOrFail($response->json('attributes.id'));
$this->assertSame($schedule->id, $task->schedule_id);
@@ -49,7 +48,7 @@ public function testValidationErrorsAreReturned()
{
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
$response = $this->actingAs($user)->postJson($this->link($schedule, '/tasks'))->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
@@ -94,7 +93,7 @@ public function testBackupsCanNotBeTaskedIfLimit0()
{
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
$this->actingAs($user)->postJson($this->link($schedule, '/tasks'), [
@@ -123,7 +122,7 @@ public function testErrorIsReturnedIfTooManyTasksExistForSchedule()
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
Task::factory()->times(2)->create(['schedule_id' => $schedule->id]);
@@ -146,7 +145,7 @@ public function testErrorIsReturnedIfScheduleDoesNotBelongToServer()
[$user, $server] = $this->generateTestAccount();
$server2 = $this->createServerModel(['owner_id' => $user->id]);
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server2->id]);
$this->actingAs($user)
@@ -162,7 +161,7 @@ public function testErrorIsReturnedIfSubuserDoesNotHaveScheduleUpdatePermissions
{
[$user, $server] = $this->generateTestAccount([Permission::ACTION_SCHEDULE_CREATE]);
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
$this->actingAs($user)
diff --git a/tests/Integration/Api/Client/Server/SettingsControllerTest.php b/tests/Integration/Api/Client/Server/SettingsControllerTest.php
index fcc7a5ce7e..1497927cd1 100644
--- a/tests/Integration/Api/Client/Server/SettingsControllerTest.php
+++ b/tests/Integration/Api/Client/Server/SettingsControllerTest.php
@@ -12,12 +12,11 @@ class SettingsControllerTest extends ClientApiIntegrationTestCase
{
/**
* Test that the server's name can be changed.
- *
- * @dataProvider renamePermissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('renamePermissionsDataProvider')]
public function testServerNameCanBeChanged(array $permissions)
{
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
[$user, $server] = $this->generateTestAccount($permissions);
$originalName = $server->name;
$originalDescription = $server->description;
@@ -68,12 +67,11 @@ public function testSubuserCannotChangeServerNameWithoutPermission()
/**
* Test that a server can be reinstalled. Honestly this test doesn't do much of anything other
* than make sure the endpoint works since.
- *
- * @dataProvider reinstallPermissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('reinstallPermissionsDataProvider')]
public function testServerCanBeReinstalled(array $permissions)
{
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
[$user, $server] = $this->generateTestAccount($permissions);
$this->assertTrue($server->isInstalled());
diff --git a/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php b/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
index 04150e07f6..493cc6a0a6 100644
--- a/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
+++ b/tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
@@ -12,9 +12,8 @@ class GetStartupAndVariablesTest extends ClientApiIntegrationTestCase
/**
* Test that the startup command and variables are returned for a server, but only the variables
* that can be viewed by a user (e.g. user_viewable=true).
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testStartupVariablesAreReturnedForServer(array $permissions)
{
/** @var \Pterodactyl\Models\Server $server */
diff --git a/tests/Integration/Api/Client/Server/Startup/UpdateStartupVariableTest.php b/tests/Integration/Api/Client/Server/Startup/UpdateStartupVariableTest.php
index ba9031ad4c..963c3ef645 100644
--- a/tests/Integration/Api/Client/Server/Startup/UpdateStartupVariableTest.php
+++ b/tests/Integration/Api/Client/Server/Startup/UpdateStartupVariableTest.php
@@ -12,9 +12,8 @@ class UpdateStartupVariableTest extends ClientApiIntegrationTestCase
{
/**
* Test that a startup variable can be edited successfully for a server.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testStartupVariableCanBeUpdated(array $permissions)
{
/** @var \Pterodactyl\Models\Server $server */
@@ -47,9 +46,8 @@ public function testStartupVariableCanBeUpdated(array $permissions)
/**
* Test that variables that are either not user_viewable, or not user_editable, cannot be
* updated via this endpoint.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testStartupVariableCannotBeUpdatedIfNotUserViewableOrEditable(array $permissions)
{
/** @var \Pterodactyl\Models\Server $server */
diff --git a/tests/Integration/Api/Client/Server/Subuser/CreateServerSubuserTest.php b/tests/Integration/Api/Client/Server/Subuser/CreateServerSubuserTest.php
index ff3fb33fea..95dc846138 100644
--- a/tests/Integration/Api/Client/Server/Subuser/CreateServerSubuserTest.php
+++ b/tests/Integration/Api/Client/Server/Subuser/CreateServerSubuserTest.php
@@ -16,9 +16,8 @@ class CreateServerSubuserTest extends ClientApiIntegrationTestCase
/**
* Test that a subuser can be created for a server.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testSubuserCanBeCreated(array $permissions)
{
[$user, $server] = $this->generateTestAccount($permissions);
@@ -32,7 +31,7 @@ public function testSubuserCanBeCreated(array $permissions)
$response->assertOk();
- /** @var \Pterodactyl\Models\User $subuser */
+ /** @var User $subuser */
$subuser = User::query()->where('email', $email)->firstOrFail();
$response->assertJsonPath('object', Subuser::RESOURCE_NAME);
@@ -111,7 +110,7 @@ public function testCreatingSubuserWithSameEmailAsExistingUserWorks()
{
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\User $existing */
+ /** @var User $existing */
$existing = User::factory()->create(['email' => $this->faker->email]);
$response = $this->actingAs($user)->postJson($this->link($server) . '/users', [
diff --git a/tests/Integration/Api/Client/Server/Subuser/DeleteSubuserTest.php b/tests/Integration/Api/Client/Server/Subuser/DeleteSubuserTest.php
index 45753ea6cf..921e79fd12 100644
--- a/tests/Integration/Api/Client/Server/Subuser/DeleteSubuserTest.php
+++ b/tests/Integration/Api/Client/Server/Subuser/DeleteSubuserTest.php
@@ -28,14 +28,14 @@ public function testCorrectSubuserIsDeletedFromServer()
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\User $differentUser */
+ /** @var User $differentUser */
$differentUser = User::factory()->create();
$real = Uuid::uuid4()->toString();
// Generate a UUID that lines up with a user in the database if it were to be cast to an int.
$uuid = $differentUser->id . substr($real, strlen((string) $differentUser->id));
- /** @var \Pterodactyl\Models\User $subuser */
+ /** @var User $subuser */
$subuser = User::factory()->create(['uuid' => $uuid]);
Subuser::query()->forceCreate([
@@ -51,7 +51,7 @@ public function testCorrectSubuserIsDeletedFromServer()
// Try the same test, but this time with a UUID that if cast to an int (shouldn't) line up with
// anything in the database.
$uuid = '18180000' . substr(Uuid::uuid4()->toString(), 8);
- /** @var \Pterodactyl\Models\User $subuser */
+ /** @var User $subuser */
$subuser = User::factory()->create(['uuid' => $uuid]);
Subuser::query()->forceCreate([
diff --git a/tests/Integration/Api/Client/Server/Subuser/SubuserAuthorizationTest.php b/tests/Integration/Api/Client/Server/Subuser/SubuserAuthorizationTest.php
index c7935aa341..6d43df3b96 100644
--- a/tests/Integration/Api/Client/Server/Subuser/SubuserAuthorizationTest.php
+++ b/tests/Integration/Api/Client/Server/Subuser/SubuserAuthorizationTest.php
@@ -11,13 +11,12 @@ class SubuserAuthorizationTest extends ClientApiIntegrationTestCase
{
/**
* Test that mismatched subusers are not accessible to a server.
- *
- * @dataProvider methodDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('methodDataProvider')]
public function testUserCannotAccessResourceBelongingToOtherServers(string $method)
{
// Generic subuser, the specific resource we're trying to access.
- /** @var \Pterodactyl\Models\User $internal */
+ /** @var User $internal */
$internal = User::factory()->create();
// The API $user is the owner of $server1.
diff --git a/tests/Integration/Api/Client/Server/Subuser/UpdateSubuserTest.php b/tests/Integration/Api/Client/Server/Subuser/UpdateSubuserTest.php
index 5990b96188..58e48e2324 100644
--- a/tests/Integration/Api/Client/Server/Subuser/UpdateSubuserTest.php
+++ b/tests/Integration/Api/Client/Server/Subuser/UpdateSubuserTest.php
@@ -57,7 +57,7 @@ public function testPermissionsAreSavedToAccount()
{
[$user, $server] = $this->generateTestAccount();
- /** @var \Pterodactyl\Models\Subuser $subuser */
+ /** @var Subuser $subuser */
$subuser = Subuser::factory()
->for(User::factory()->create())
->for($server)
diff --git a/tests/Integration/Api/Client/TwoFactorControllerTest.php b/tests/Integration/Api/Client/TwoFactorControllerTest.php
index ec178bf8a9..4374c3455e 100644
--- a/tests/Integration/Api/Client/TwoFactorControllerTest.php
+++ b/tests/Integration/Api/Client/TwoFactorControllerTest.php
@@ -17,7 +17,7 @@ class TwoFactorControllerTest extends ClientApiIntegrationTestCase
*/
public function testTwoFactorImageDataIsReturned()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create(['use_totp' => false]);
$this->assertFalse($user->use_totp);
@@ -41,7 +41,7 @@ public function testTwoFactorImageDataIsReturned()
*/
public function testErrorIsReturnedWhenTwoFactorIsAlreadyEnabled()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create(['use_totp' => true]);
$response = $this->actingAs($user)->getJson('/api/client/account/two-factor');
@@ -56,7 +56,7 @@ public function testErrorIsReturnedWhenTwoFactorIsAlreadyEnabled()
*/
public function testValidationErrorIsReturnedIfInvalidDataIsPassedToEnabled2FA()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create(['use_totp' => false]);
$this->actingAs($user)
@@ -73,7 +73,7 @@ public function testValidationErrorIsReturnedIfInvalidDataIsPassedToEnabled2FA()
*/
public function testTwoFactorCanBeEnabledOnAccount()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create(['use_totp' => false]);
// Make the initial call to get the account setup for 2FA.
@@ -82,7 +82,7 @@ public function testTwoFactorCanBeEnabledOnAccount()
$user = $user->refresh();
$this->assertNotNull($user->totp_secret);
- /** @var \PragmaRX\Google2FA\Google2FA $service */
+ /** @var Google2FA $service */
$service = $this->app->make(Google2FA::class);
$secret = decrypt($user->totp_secret);
@@ -129,10 +129,10 @@ public function testTwoFactorCanBeDisabledOnAccount()
{
Carbon::setTestNow(Carbon::now());
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create(['use_totp' => true]);
- $response = $this->actingAs($user)->deleteJson('/api/client/account/two-factor', [
+ $response = $this->actingAs($user)->postJson('/api/client/account/two-factor/disable', [
'password' => 'invalid',
]);
@@ -140,7 +140,7 @@ public function testTwoFactorCanBeDisabledOnAccount()
$response->assertJsonPath('errors.0.code', 'BadRequestHttpException');
$response->assertJsonPath('errors.0.detail', '提供的密码无效。');
- $response = $this->actingAs($user)->deleteJson('/api/client/account/two-factor', [
+ $response = $this->actingAs($user)->postJson('/api/client/account/two-factor/disable', [
'password' => 'password',
]);
@@ -160,10 +160,10 @@ public function testNoErrorIsReturnedIfTwoFactorIsNotEnabled()
{
Carbon::setTestNow(Carbon::now());
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create(['use_totp' => false]);
- $response = $this->actingAs($user)->deleteJson('/api/client/account/two-factor', [
+ $response = $this->actingAs($user)->postJson('/api/client/account/two-factor/disable', [
'password' => 'password',
]);
@@ -196,7 +196,7 @@ public function testDisablingTwoFactorRequiresValidPassword()
$user = User::factory()->create(['use_totp' => true]);
$this->actingAs($user)
- ->deleteJson('/api/client/account/two-factor', [
+ ->postJson('/api/client/account/two-factor/disable', [
'password' => 'foo',
])
->assertStatus(Response::HTTP_BAD_REQUEST)
diff --git a/tests/Integration/Api/Remote/SftpAuthenticationControllerTest.php b/tests/Integration/Api/Remote/SftpAuthenticationControllerTest.php
index fc8f8fa831..7ac3d36cb3 100644
--- a/tests/Integration/Api/Remote/SftpAuthenticationControllerTest.php
+++ b/tests/Integration/Api/Remote/SftpAuthenticationControllerTest.php
@@ -2,12 +2,12 @@
namespace Pterodactyl\Tests\Integration\Api\Remote;
+use phpseclib3\Crypt\EC;
use Pterodactyl\Models\Node;
use Pterodactyl\Models\User;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\Permission;
use Pterodactyl\Models\UserSSHKey;
-use phpseclib3\Crypt\EC\PrivateKey;
use Pterodactyl\Tests\Integration\IntegrationTestCase;
class SftpAuthenticationControllerTest extends IntegrationTestCase
@@ -94,9 +94,8 @@ public function testPasswordIsValidatedCorrectly()
/**
* Test that providing an invalid key and/or invalid username triggers the throttle on
* the endpoint.
- *
- * @dataProvider authorizationTypeDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('authorizationTypeDataProvider')]
public function testUserIsThrottledIfInvalidCredentialsAreProvided()
{
for ($i = 0; $i <= 10; ++$i) {
@@ -119,7 +118,7 @@ public function testUserIsNotThrottledIfNoPublicKeyMatches()
$this->postJson('/api/remote/sftp/auth', [
'type' => 'public_key',
'username' => $this->getUsername(),
- 'password' => PrivateKey::createKey('Ed25519')->getPublicKey()->toString('OpenSSH'),
+ 'password' => EC::createKey('Ed25519')->getPublicKey()->toString('OpenSSH'),
])
->assertForbidden();
}
@@ -128,9 +127,8 @@ public function testUserIsNotThrottledIfNoPublicKeyMatches()
/**
* Test that a request is rejected if the credentials are valid but the username indicates
* a server on a different node.
- *
- * @dataProvider authorizationTypeDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('authorizationTypeDataProvider')]
public function testRequestIsRejectedIfServerBelongsToDifferentNode(string $type)
{
$node2 = $this->createServerModel()->node;
@@ -165,9 +163,7 @@ public function testRequestIsDeniedIfUserLacksSftpPermission()
->assertJsonPath('errors.0.detail', '您无权访问此服务器的 SFTP。');
}
- /**
- * @dataProvider serverStateDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('serverStateDataProvider')]
public function testInvalidServerStateReturnsConflictError(string $status)
{
$this->server->update(['status' => $status]);
@@ -241,7 +237,7 @@ protected function getUsername(bool $long = false): string
/**
* Sets the authorization header for the rest of the test.
*/
- protected function setAuthorization(Node $node = null): void
+ protected function setAuthorization(?Node $node = null): void
{
$node = $node ?? $this->server->node;
diff --git a/tests/Integration/Http/Controllers/Admin/UserControllerTest.php b/tests/Integration/Http/Controllers/Admin/UserControllerTest.php
deleted file mode 100644
index 34cf9f938d..0000000000
--- a/tests/Integration/Http/Controllers/Admin/UserControllerTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-create(['username' => $unique . '_1']),
- User::factory()->create(['username' => $unique . '_2']),
- ];
-
- $servers = [
- $this->createServerModel(['owner_id' => $users[0]->id]),
- $this->createServerModel(['owner_id' => $users[0]->id]),
- $this->createServerModel(['owner_id' => $users[0]->id]),
- $this->createServerModel(['owner_id' => $users[1]->id]),
- ];
-
- Subuser::query()->forceCreate(['server_id' => $servers[0]->id, 'user_id' => $users[1]->id]);
- Subuser::query()->forceCreate(['server_id' => $servers[1]->id, 'user_id' => $users[1]->id]);
-
- /** @var \Pterodactyl\Http\Controllers\Admin\UserController $controller */
- $controller = $this->app->make(UserController::class);
-
- $request = Request::create('/admin/users?filter[username]=' . $unique);
- $this->app->instance(Request::class, $request);
-
- $data = $controller->index($request)->getData();
- $this->assertArrayHasKey('users', $data);
- $this->assertInstanceOf(LengthAwarePaginator::class, $data['users']);
-
- /** @var \Pterodactyl\Models\User[] $response */
- $response = $data['users']->items();
- $this->assertCount(2, $response);
- $this->assertInstanceOf(User::class, $response[0]);
- $this->assertSame(3, (int) $response[0]->servers_count);
- $this->assertSame(0, (int) $response[0]->subuser_of_count);
- $this->assertSame(1, (int) $response[1]->servers_count);
- $this->assertSame(2, (int) $response[1]->subuser_of_count);
- }
-}
diff --git a/tests/Integration/Jobs/Schedule/RunTaskJobTest.php b/tests/Integration/Jobs/Schedule/RunTaskJobTest.php
index dcf4ed69d7..6c086840cb 100644
--- a/tests/Integration/Jobs/Schedule/RunTaskJobTest.php
+++ b/tests/Integration/Jobs/Schedule/RunTaskJobTest.php
@@ -25,14 +25,14 @@ public function testInactiveJobIsNotRun()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create([
'server_id' => $server->id,
'is_processing' => true,
'last_run_at' => null,
'is_active' => false,
]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'is_queued' => true]);
$job = new RunTaskJob($task);
@@ -52,9 +52,9 @@ public function testJobWithInvalidActionThrowsException()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'action' => 'foobar']);
$job = new RunTaskJob($task);
@@ -64,21 +64,19 @@ public function testJobWithInvalidActionThrowsException()
Bus::dispatchSync($job);
}
- /**
- * @dataProvider isManualRunDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('isManualRunDataProvider')]
public function testJobIsExecuted(bool $isManualRun)
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create([
'server_id' => $server->id,
'is_active' => !$isManualRun,
'is_processing' => true,
'last_run_at' => null,
]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create([
'schedule_id' => $schedule->id,
'action' => Task::ACTION_POWER,
@@ -105,16 +103,14 @@ public function testJobIsExecuted(bool $isManualRun)
$this->assertTrue(CarbonImmutable::now()->isSameAs(\DateTimeInterface::ATOM, $schedule->last_run_at));
}
- /**
- * @dataProvider isManualRunDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('isManualRunDataProvider')]
public function testExceptionDuringRunIsHandledCorrectly(bool $continueOnFailure)
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create([
'schedule_id' => $schedule->id,
'action' => Task::ACTION_POWER,
diff --git a/tests/Integration/Services/Databases/DatabaseManagementServiceTest.php b/tests/Integration/Services/Databases/DatabaseManagementServiceTest.php
index b68a3521ea..7ccfb83380 100644
--- a/tests/Integration/Services/Databases/DatabaseManagementServiceTest.php
+++ b/tests/Integration/Services/Databases/DatabaseManagementServiceTest.php
@@ -69,9 +69,8 @@ public function testDatabaseCannotBeCreatedIfServerHasReachedLimit()
/**
* Test that a missing or invalid database name format causes an exception to be thrown.
- *
- * @dataProvider invalidDataDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('invalidDataDataProvider')]
public function testEmptyDatabaseNameOrInvalidNameTriggersAnException(array $data)
{
$server = $this->createServerModel();
diff --git a/tests/Integration/Services/Databases/DeployServerDatabaseServiceTest.php b/tests/Integration/Services/Databases/DeployServerDatabaseServiceTest.php
index eb8f4dbaa5..f9afd85643 100644
--- a/tests/Integration/Services/Databases/DeployServerDatabaseServiceTest.php
+++ b/tests/Integration/Services/Databases/DeployServerDatabaseServiceTest.php
@@ -41,9 +41,8 @@ protected function tearDown(): void
/**
* Test that an error is thrown if either the database name or the remote host are empty.
- *
- * @dataProvider invalidDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('invalidDataProvider')]
public function testErrorIsThrownIfDatabaseNameIsEmpty(array $data)
{
$server = $this->createServerModel();
diff --git a/tests/Integration/Services/Schedules/ProcessScheduleServiceTest.php b/tests/Integration/Services/Schedules/ProcessScheduleServiceTest.php
index eaed38a16d..29c91f4633 100644
--- a/tests/Integration/Services/Schedules/ProcessScheduleServiceTest.php
+++ b/tests/Integration/Services/Schedules/ProcessScheduleServiceTest.php
@@ -36,13 +36,13 @@ public function testErrorDuringScheduleDataUpdateDoesNotPersistChanges()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create([
'server_id' => $server->id,
'cron_minute' => 'hodor', // this will break the getNextRunDate() function.
]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'sequence_id' => 1]);
$this->expectException(\InvalidArgumentException::class);
@@ -55,19 +55,18 @@ public function testErrorDuringScheduleDataUpdateDoesNotPersistChanges()
/**
* Test that a job is dispatched as expected using the initial delay.
- *
- * @dataProvider dispatchNowDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dispatchNowDataProvider')]
public function testJobCanBeDispatchedWithExpectedInitialDelay(bool $now)
{
Bus::fake();
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'time_offset' => 10, 'sequence_id' => 1]);
$this->getService()->handle($schedule, $now);
@@ -96,10 +95,10 @@ public function testFirstSequenceTaskIsFound()
Bus::fake();
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task2 = Task::factory()->create(['schedule_id' => $schedule->id, 'sequence_id' => 4]);
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'sequence_id' => 2]);
$task3 = Task::factory()->create(['schedule_id' => $schedule->id, 'sequence_id' => 3]);
@@ -127,9 +126,9 @@ public function testTaskDispatchedNowIsResetProperlyIfErrorIsEncountered()
$this->swap(Dispatcher::class, $dispatcher = \Mockery::mock(Dispatcher::class));
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Schedule $schedule */
+ /** @var Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server->id, 'last_run_at' => null]);
- /** @var \Pterodactyl\Models\Task $task */
+ /** @var Task $task */
$task = Task::factory()->create(['schedule_id' => $schedule->id, 'sequence_id' => 1]);
$dispatcher->expects('dispatchNow')->andThrows(new \Exception('Test thrown exception'));
diff --git a/tests/Integration/Services/Servers/BuildModificationServiceTest.php b/tests/Integration/Services/Servers/BuildModificationServiceTest.php
index f63efee9ef..52d69685c2 100644
--- a/tests/Integration/Services/Servers/BuildModificationServiceTest.php
+++ b/tests/Integration/Services/Servers/BuildModificationServiceTest.php
@@ -168,7 +168,7 @@ public function testConnectionExceptionIsIgnoredWhenUpdatingServerSettings()
public function testNoExceptionIsThrownIfOnlyRemovingAllocation()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server->id]);
$this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
@@ -191,7 +191,7 @@ public function testNoExceptionIsThrownIfOnlyRemovingAllocation()
public function testAllocationInBothAddAndRemoveIsAdded()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create(['node_id' => $server->node_id]);
$this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
@@ -210,9 +210,9 @@ public function testAllocationInBothAddAndRemoveIsAdded()
public function testUsingSameAllocationIdMultipleTimesDoesNotError()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create(['node_id' => $server->node_id, 'server_id' => $server->id]);
- /** @var \Pterodactyl\Models\Allocation $allocation2 */
+ /** @var Allocation $allocation2 */
$allocation2 = Allocation::factory()->create(['node_id' => $server->node_id]);
$this->daemonServerRepository->expects('setServer->sync')->andReturnUndefined();
@@ -235,7 +235,7 @@ public function testUsingSameAllocationIdMultipleTimesDoesNotError()
public function testThatUpdatesAreRolledBackIfExceptionIsEncountered()
{
$server = $this->createServerModel();
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create(['node_id' => $server->node_id]);
$this->daemonServerRepository->expects('setServer->sync')->andThrows(new DisplayException('Test'));
diff --git a/tests/Integration/Services/Servers/ServerCreationServiceTest.php b/tests/Integration/Services/Servers/ServerCreationServiceTest.php
index ea2eed421c..dec8ddaa7d 100644
--- a/tests/Integration/Services/Servers/ServerCreationServiceTest.php
+++ b/tests/Integration/Services/Servers/ServerCreationServiceTest.php
@@ -54,13 +54,13 @@ public function setUp(): void
*/
public function testServerIsCreatedWithDeploymentObject()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\Location $location */
+ /** @var Location $location */
$location = Location::factory()->create();
- /** @var \Pterodactyl\Models\Node $node */
+ /** @var Node $node */
$node = Node::factory()->create([
'location_id' => $location->id,
]);
@@ -156,18 +156,18 @@ public function testServerIsCreatedWithDeploymentObject()
*/
public function testErrorEncounteredByWingsCausesServerToBeDeleted()
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
- /** @var \Pterodactyl\Models\Location $location */
+ /** @var Location $location */
$location = Location::factory()->create();
- /** @var \Pterodactyl\Models\Node $node */
+ /** @var Node $node */
$node = Node::factory()->create([
'location_id' => $location->id,
]);
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create([
'node_id' => $node->id,
]);
diff --git a/tests/Integration/Services/Servers/ServerDeletionServiceTest.php b/tests/Integration/Services/Servers/ServerDeletionServiceTest.php
index 676a60416b..1a1446467e 100644
--- a/tests/Integration/Services/Servers/ServerDeletionServiceTest.php
+++ b/tests/Integration/Services/Servers/ServerDeletionServiceTest.php
@@ -112,7 +112,7 @@ public function testExceptionWhileDeletingStopsProcess()
$server = $this->createServerModel();
$host = DatabaseHost::factory()->create();
- /** @var \Pterodactyl\Models\Database $db */
+ /** @var Database $db */
$db = Database::factory()->create(['database_host_id' => $host->id, 'server_id' => $server->id]);
$server->refresh();
@@ -137,7 +137,7 @@ public function testExceptionWhileDeletingDatabasesDoesNotAbortIfForceDeleted()
$server = $this->createServerModel();
$host = DatabaseHost::factory()->create();
- /** @var \Pterodactyl\Models\Database $db */
+ /** @var Database $db */
$db = Database::factory()->create(['database_host_id' => $host->id, 'server_id' => $server->id]);
$server->refresh();
diff --git a/tests/Integration/Services/Servers/StartupModificationServiceTest.php b/tests/Integration/Services/Servers/StartupModificationServiceTest.php
index 9394db449a..d9550deac0 100644
--- a/tests/Integration/Services/Servers/StartupModificationServiceTest.php
+++ b/tests/Integration/Services/Servers/StartupModificationServiceTest.php
@@ -37,7 +37,7 @@ public function testNonAdminCanModifyServerVariables()
} catch (\Exception $exception) {
$this->assertInstanceOf(ValidationException::class, $exception);
- /** @var \Illuminate\Validation\ValidationException $exception */
+ /** @var ValidationException $exception */
$errors = $exception->validator->errors()->toArray();
$this->assertCount(1, $errors);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5e131fa8bb..955f9dfaf7 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -8,8 +8,6 @@
abstract class TestCase extends BaseTestCase
{
- use CreatesApplication;
-
/**
* Setup tests.
*/
diff --git a/tests/Traits/Http/RequestMockHelpers.php b/tests/Traits/Http/RequestMockHelpers.php
index aa3607e51a..54cc0bd078 100644
--- a/tests/Traits/Http/RequestMockHelpers.php
+++ b/tests/Traits/Http/RequestMockHelpers.php
@@ -27,7 +27,7 @@ public function setRequestMockClass(string $class): void
/**
* Configure the user model that the request mock should return with.
*/
- public function setRequestUserModel(User $user = null): void
+ public function setRequestUserModel(?User $user = null): void
{
$this->request->shouldReceive('user')->andReturn($user);
}
@@ -37,7 +37,7 @@ public function setRequestUserModel(User $user = null): void
*/
public function generateRequestUserModel(array $args = []): User
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->make($args);
$this->setRequestUserModel($user);
@@ -79,7 +79,7 @@ protected function buildRequestMock(): void
*
* @deprecated
*/
- protected function setRequestUser(User $user = null): User
+ protected function setRequestUser(?User $user = null): User
{
$user = $user instanceof User ? $user : User::factory()->make();
$this->request->shouldReceive('user')->withNoArgs()->andReturn($user);
diff --git a/tests/Traits/Integration/CreatesTestModels.php b/tests/Traits/Integration/CreatesTestModels.php
index 62245d72b9..a90de9f6cb 100644
--- a/tests/Traits/Integration/CreatesTestModels.php
+++ b/tests/Traits/Integration/CreatesTestModels.php
@@ -27,25 +27,25 @@ public function createServerModel(array $attributes = []): Server
}
if (!isset($attributes['owner_id'])) {
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
$attributes['owner_id'] = $user->id;
}
if (!isset($attributes['node_id'])) {
if (!isset($attributes['location_id'])) {
- /** @var \Pterodactyl\Models\Location $location */
+ /** @var Location $location */
$location = Location::factory()->create();
$attributes['location_id'] = $location->id;
}
- /** @var \Pterodactyl\Models\Node $node */
+ /** @var Node $node */
$node = Node::factory()->create(['location_id' => $attributes['location_id']]);
$attributes['node_id'] = $node->id;
}
if (!isset($attributes['allocation_id'])) {
- /** @var \Pterodactyl\Models\Allocation $allocation */
+ /** @var Allocation $allocation */
$allocation = Allocation::factory()->create(['node_id' => $attributes['node_id']]);
$attributes['allocation_id'] = $allocation->id;
}
@@ -65,7 +65,7 @@ public function createServerModel(array $attributes = []): Server
unset($attributes['user_id'], $attributes['location_id']);
- /** @var \Pterodactyl\Models\Server $server */
+ /** @var Server $server */
$server = Server::factory()->create($attributes);
Allocation::query()->where('id', $server->allocation_id)->update(['server_id' => $server->id]);
@@ -85,7 +85,7 @@ public function createServerModel(array $attributes = []): Server
*/
public function generateTestAccount(array $permissions = []): array
{
- /** @var \Pterodactyl\Models\User $user */
+ /** @var User $user */
$user = User::factory()->create();
if (empty($permissions)) {
@@ -113,7 +113,7 @@ protected function cloneEggAndVariables(Egg $egg): Egg
$model->uuid = Uuid::uuid4()->toString();
$model->push();
- /** @var \Pterodactyl\Models\Egg $model */
+ /** @var Egg $model */
$model = $model->fresh();
foreach ($egg->variables as $variable) {
@@ -129,7 +129,7 @@ protected function cloneEggAndVariables(Egg $egg): Egg
*/
private function getBungeecordEgg(): Egg
{
- /** @var \Pterodactyl\Models\Egg $egg */
+ /** @var Egg $egg */
$egg = Egg::query()->where('author', 'support@pterodactyl.io')->where('name', 'Bungeecord')->firstOrFail();
return $egg;
diff --git a/tests/Unit/Helpers/EnvironmentWriterTraitTest.php b/tests/Unit/Helpers/EnvironmentWriterTraitTest.php
index 0680da0dbb..588bb8e980 100644
--- a/tests/Unit/Helpers/EnvironmentWriterTraitTest.php
+++ b/tests/Unit/Helpers/EnvironmentWriterTraitTest.php
@@ -7,9 +7,7 @@
class EnvironmentWriterTraitTest extends TestCase
{
- /**
- * @dataProvider variableDataProvider
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('variableDataProvider')]
public function testVariableIsEscapedProperly($input, $expected)
{
$output = (new FooClass())->escapeEnvironmentValue($input);
diff --git a/tests/Unit/Helpers/IsDigitTest.php b/tests/Unit/Helpers/IsDigitTest.php
index af19c732e9..273de64aee 100644
--- a/tests/Unit/Helpers/IsDigitTest.php
+++ b/tests/Unit/Helpers/IsDigitTest.php
@@ -8,9 +8,8 @@ class IsDigitTest extends TestCase
{
/**
* Test the is_digit helper.
- *
- * @dataProvider helperDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('helperDataProvider')]
public function testHelper($value, $response)
{
$this->assertSame($response, is_digit($value));
diff --git a/tests/Unit/Http/Middleware/Api/Daemon/DaemonAuthenticateTest.php b/tests/Unit/Http/Middleware/Api/Daemon/DaemonAuthenticateTest.php
index 84562f6c93..f3ff026c3f 100644
--- a/tests/Unit/Http/Middleware/Api/Daemon/DaemonAuthenticateTest.php
+++ b/tests/Unit/Http/Middleware/Api/Daemon/DaemonAuthenticateTest.php
@@ -64,9 +64,8 @@ public function testResponseShouldFailIfNoTokenIsProvided()
/**
* Test that passing in an invalid node daemon secret will result in a bad request
* exception being returned.
- *
- * @dataProvider badTokenDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('badTokenDataProvider')]
public function testResponseShouldFailIfTokenFormatIsIncorrect(string $token)
{
$this->expectException(BadRequestHttpException::class);
@@ -85,7 +84,7 @@ public function testResponseShouldFailIfTokenIsNotValid()
{
$this->expectException(AccessDeniedHttpException::class);
- /** @var \Pterodactyl\Models\Node $model */
+ /** @var Node $model */
$model = Node::factory()->make();
$this->request->expects('route->getName')->withNoArgs()->andReturn('random.route');
@@ -118,7 +117,7 @@ public function testResponseShouldFailIfNodeIsNotFound()
*/
public function testSuccessfulMiddlewareProcess()
{
- /** @var \Pterodactyl\Models\Node $model */
+ /** @var Node $model */
$model = Node::factory()->make();
$this->request->expects('route->getName')->withNoArgs()->andReturn('random.route');
diff --git a/tests/Unit/Rules/UsernameTest.php b/tests/Unit/Rules/UsernameTest.php
index 003e3e8ddf..f01589e959 100644
--- a/tests/Unit/Rules/UsernameTest.php
+++ b/tests/Unit/Rules/UsernameTest.php
@@ -17,9 +17,8 @@ public function testRuleIsStringable()
/**
* Test valid usernames.
- *
- * @dataProvider validUsernameDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('validUsernameDataProvider')]
public function testValidUsernames(string $username)
{
$this->assertTrue((new Username())->passes('test', $username), 'Assert username is valid.');
@@ -27,9 +26,8 @@ public function testValidUsernames(string $username)
/**
* Test invalid usernames return false.
- *
- * @dataProvider invalidUsernameDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('invalidUsernameDataProvider')]
public function testInvalidUsernames(string $username)
{
$this->assertFalse((new Username())->passes('test', $username), 'Assert username is not valid.');
diff --git a/tests/Unit/Services/Acl/Api/AdminAclTest.php b/tests/Unit/Services/Acl/Api/AdminAclTest.php
index 3f89659a2d..b135bd92a0 100644
--- a/tests/Unit/Services/Acl/Api/AdminAclTest.php
+++ b/tests/Unit/Services/Acl/Api/AdminAclTest.php
@@ -10,9 +10,8 @@ class AdminAclTest extends TestCase
{
/**
* Test that permissions return the expects values.
- *
- * @dataProvider permissionsDataProvider
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('permissionsDataProvider')]
public function testPermissions(int $permission, int $check, bool $outcome)
{
$this->assertSame($outcome, AdminAcl::can($permission, $check));