Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 17:12:30 +01:00
Code Issues Releases Wiki Activity

Laravel Sail (#4508)

Browse Source
This commit is contained in:
Matthew Penner 2022-10-31 11:38:56 -06:00 committed by GitHub
parent 846ff7644f
commit d466934103
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 116 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.ci
View File

@ -8,7 +8,7 @@ APP_ENVIRONMENT_ONLY=true
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_DATABASE=panel_test DB_DATABASE=testing
DB_USERNAME=root DB_USERNAME=root
DB_PASSWORD= DB_PASSWORD=

2
.github/workflows/ci.yaml vendored
View File

@ -24,7 +24,7 @@ jobs:
image: ${{ matrix.database }} image: ${{ matrix.database }}
env: env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: panel_test MYSQL_DATABASE: testing
ports: ports:
- 3306 - 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

0
bootstrap/cache/.gitignore vendored Executable file → Normal file
View File

3
bootstrap/tests.php
View File

@ -1,5 +1,6 @@
<?php <?php
use Illuminate\Support\Str;
use NunoMaduro\Collision\Provider; use NunoMaduro\Collision\Provider;
use Illuminate\Contracts\Console\Kernel; use Illuminate\Contracts\Console\Kernel;
use Symfony\Component\Console\Output\ConsoleOutput; use Symfony\Component\Console\Output\ConsoleOutput;
@ -23,7 +24,7 @@ $kernel->bootstrap();
$output = new ConsoleOutput(); $output = new ConsoleOutput();
$prefix = 'database.connections.' . config('database.default'); $prefix = 'database.connections.' . config('database.default');
if (config("$prefix.database") !== 'panel_test') { if (!Str::contains(config("$prefix.database"), 'test')) {
$output->writeln(PHP_EOL . '<error>Cannot run test process against non-testing database.</error>'); $output->writeln(PHP_EOL . '<error>Cannot run test process against non-testing database.</error>');
$output->writeln(PHP_EOL . '<error>Environment is currently pointed at: "' . config("$prefix.database") . '".</error>'); $output->writeln(PHP_EOL . '<error>Environment is currently pointed at: "' . config("$prefix.database") . '".</error>');
exit(1); exit(1);

3
composer.json
View File

@ -17,7 +17,7 @@
} }
], ],
"require": { "require": {
"php": "^8.0.2 || ^8.1", "php": "^8.0.2 || ^8.1 || ^8.2",
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-pdo": "*", "ext-pdo": "*",
@ -58,6 +58,7 @@
"fakerphp/faker": "~1.20", "fakerphp/faker": "~1.20",
"friendsofphp/php-cs-fixer": "~3.11", "friendsofphp/php-cs-fixer": "~3.11",
"itsgoingd/clockwork": "~5.1", "itsgoingd/clockwork": "~5.1",
"laravel/sail": "~1.16",
"mockery/mockery": "~1.5", "mockery/mockery": "~1.5",
"nunomaduro/collision": "~6.3", "nunomaduro/collision": "~6.3",
"php-mock/php-mock-phpunit": "~2.6", "php-mock/php-mock-phpunit": "~2.6",

158
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "80a0f1016b1ba9e0b31d6cfe0f27f8c1", "content-hash": "ae61e7d6e405e3a59c8a54f3eefa2c50",
"packages": [ "packages": [
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
@ -376,16 +376,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.4.5", "version": "3.4.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "a5a58773109c0abb13e658c8ccd92aeec8d07f9e" "reference": "3ce132f7c0b83d33b26ab6ed308e9e9260699bc4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/a5a58773109c0abb13e658c8ccd92aeec8d07f9e", "url": "https://api.github.com/repos/doctrine/dbal/zipball/3ce132f7c0b83d33b26ab6ed308e9e9260699bc4",
"reference": "a5a58773109c0abb13e658c8ccd92aeec8d07f9e", "reference": "3ce132f7c0b83d33b26ab6ed308e9e9260699bc4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -400,14 +400,14 @@
"require-dev": { "require-dev": {
"doctrine/coding-standard": "10.0.0", "doctrine/coding-standard": "10.0.0",
"jetbrains/phpstorm-stubs": "2022.2", "jetbrains/phpstorm-stubs": "2022.2",
"phpstan/phpstan": "1.8.3", "phpstan/phpstan": "1.8.10",
"phpstan/phpstan-strict-rules": "^1.3", "phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "9.5.24", "phpunit/phpunit": "9.5.25",
"psalm/plugin-phpunit": "0.17.0", "psalm/plugin-phpunit": "0.17.0",
"squizlabs/php_codesniffer": "3.7.1", "squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.4|^6.0", "symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4|^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0",
"vimeo/psalm": "4.27.0" "vimeo/psalm": "4.29.0"
}, },
"suggest": { "suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files." "symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -467,7 +467,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.4.5" "source": "https://github.com/doctrine/dbal/tree/3.4.6"
}, },
"funding": [ "funding": [
{ {
@ -483,7 +483,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-09-23T17:48:57+00:00" "time": "2022-10-21T14:38:43+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -622,23 +622,23 @@
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
"version": "2.0.5", "version": "2.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/inflector.git", "url": "https://github.com/doctrine/inflector.git",
"reference": "ade2b3bbfb776f27f0558e26eed43b5d9fe1b392" "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/ade2b3bbfb776f27f0558e26eed43b5d9fe1b392", "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
"reference": "ade2b3bbfb776f27f0558e26eed43b5d9fe1b392", "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2 || ^8.0" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^9", "doctrine/coding-standard": "^10",
"phpstan/phpstan": "^1.8", "phpstan/phpstan": "^1.8",
"phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.3", "phpstan/phpstan-strict-rules": "^1.3",
@ -693,7 +693,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/inflector/issues", "issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/2.0.5" "source": "https://github.com/doctrine/inflector/tree/2.0.6"
}, },
"funding": [ "funding": [
{ {
@ -709,7 +709,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-09-07T09:01:28+00:00" "time": "2022-10-20T09:10:12+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
@ -1263,16 +1263,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.4.1", "version": "2.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379" "reference": "3148458748274be1546f8f2809a6c09fe66f44aa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379", "url": "https://api.github.com/repos/guzzle/psr7/zipball/3148458748274be1546f8f2809a6c09fe66f44aa",
"reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379", "reference": "3148458748274be1546f8f2809a6c09fe66f44aa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1362,7 +1362,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.1" "source": "https://github.com/guzzle/psr7/tree/2.4.2"
}, },
"funding": [ "funding": [
{ {
@ -1378,7 +1378,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-08-28T14:45:39+00:00" "time": "2022-10-25T13:49:28+00:00"
}, },
{ {
"name": "hashids/hashids", "name": "hashids/hashids",
@ -1513,16 +1513,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v9.36.3", "version": "v9.37.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "80ba0561b3682b96743e1c152fde0698bbdb2412" "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/80ba0561b3682b96743e1c152fde0698bbdb2412", "url": "https://api.github.com/repos/laravel/framework/zipball/0c9675abf6d966e834b2ebeca3319f524e07a330",
"reference": "80ba0561b3682b96743e1c152fde0698bbdb2412", "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1534,7 +1534,7 @@
"fruitcake/php-cors": "^1.2", "fruitcake/php-cors": "^1.2",
"laravel/serializable-closure": "^1.2.2", "laravel/serializable-closure": "^1.2.2",
"league/commonmark": "^2.2", "league/commonmark": "^2.2",
"league/flysystem": "^3.0.16", "league/flysystem": "^3.8.0",
"monolog/monolog": "^2.0", "monolog/monolog": "^2.0",
"nesbot/carbon": "^2.62.1", "nesbot/carbon": "^2.62.1",
"nunomaduro/termwind": "^1.13", "nunomaduro/termwind": "^1.13",
@ -1695,7 +1695,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2022-10-19T13:23:53+00:00" "time": "2022-10-25T15:43:46+00:00"
}, },
{ {
"name": "laravel/helpers", "name": "laravel/helpers",
@ -2332,16 +2332,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "3.9.0", "version": "3.10.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "60f3760352fe08e918bc3b1acae4e91af092ebe1" "reference": "b9bd194b016114d6ff6765c09d40c7d427e4e3f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/60f3760352fe08e918bc3b1acae4e91af092ebe1", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b9bd194b016114d6ff6765c09d40c7d427e4e3f6",
"reference": "60f3760352fe08e918bc3b1acae4e91af092ebe1", "reference": "b9bd194b016114d6ff6765c09d40c7d427e4e3f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2357,7 +2357,7 @@
}, },
"require-dev": { "require-dev": {
"async-aws/s3": "^1.5", "async-aws/s3": "^1.5",
"async-aws/simple-s3": "^1.0", "async-aws/simple-s3": "^1.1",
"aws/aws-sdk-php": "^3.198.1", "aws/aws-sdk-php": "^3.198.1",
"composer/semver": "^3.0", "composer/semver": "^3.0",
"ext-fileinfo": "*", "ext-fileinfo": "*",
@ -2403,7 +2403,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/flysystem/issues", "issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.9.0" "source": "https://github.com/thephpleague/flysystem/tree/3.10.2"
}, },
"funding": [ "funding": [
{ {
@ -2419,7 +2419,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-18T21:02:43+00:00" "time": "2022-10-25T07:01:47+00:00"
}, },
{ {
"name": "league/flysystem-aws-s3-v3", "name": "league/flysystem-aws-s3-v3",
@ -3476,16 +3476,16 @@
}, },
{ {
"name": "phpseclib/phpseclib", "name": "phpseclib/phpseclib",
"version": "3.0.16", "version": "3.0.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpseclib/phpseclib.git", "url": "https://github.com/phpseclib/phpseclib.git",
"reference": "7181378909ed8890be4db53d289faac5b77f8b05" "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7181378909ed8890be4db53d289faac5b77f8b05", "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761",
"reference": "7181378909ed8890be4db53d289faac5b77f8b05", "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3566,7 +3566,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpseclib/phpseclib/issues", "issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.16" "source": "https://github.com/phpseclib/phpseclib/tree/3.0.17"
}, },
"funding": [ "funding": [
{ {
@ -3582,7 +3582,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-09-05T18:03:08+00:00" "time": "2022-10-24T10:51:50+00:00"
}, },
{ {
"name": "pragmarx/google2fa", "name": "pragmarx/google2fa",
@ -8725,6 +8725,66 @@
], ],
"time": "2022-10-19T21:46:50+00:00" "time": "2022-10-19T21:46:50+00:00"
}, },
{
"name": "laravel/sail",
"version": "v1.16.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "7d1ed5f856ec8b9708712e3fc0708fcabe114659"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/7d1ed5f856ec8b9708712e3fc0708fcabe114659",
"reference": "7d1ed5f856ec8b9708712e3fc0708fcabe114659",
"shasum": ""
},
"require": {
"illuminate/console": "^8.0|^9.0",
"illuminate/contracts": "^8.0|^9.0",
"illuminate/support": "^8.0|^9.0",
"php": "^7.3|^8.0"
},
"bin": [
"bin/sail"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
},
"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": "2022-09-28T13:13:22+00:00"
},
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
"version": "1.5.1", "version": "1.5.1",
@ -10954,16 +11014,16 @@
}, },
{ {
"name": "spatie/laravel-ignition", "name": "spatie/laravel-ignition",
"version": "1.5.2", "version": "1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/laravel-ignition.git", "url": "https://github.com/spatie/laravel-ignition.git",
"reference": "f2336fc79d99aab5cf27fa4aebe5e9c9ecf3808a" "reference": "c21309ebf6657e0c38083afac8af9baa12885676"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/f2336fc79d99aab5cf27fa4aebe5e9c9ecf3808a", "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/c21309ebf6657e0c38083afac8af9baa12885676",
"reference": "f2336fc79d99aab5cf27fa4aebe5e9c9ecf3808a", "reference": "c21309ebf6657e0c38083afac8af9baa12885676",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11040,7 +11100,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-10-14T12:24:21+00:00" "time": "2022-10-25T08:38:04+00:00"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
@ -11291,7 +11351,7 @@
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^8.0.2 || ^8.1", "php": "^8.0.2 || ^8.1 || ^8.2",
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-pdo": "*", "ext-pdo": "*",

2
phpunit.xml
View File

@ -22,7 +22,7 @@
<php> <php>
<env name="APP_ENV" value="testing" /> <env name="APP_ENV" value="testing" />
<env name="BCRYPT_ROUNDS" value="4" /> <env name="BCRYPT_ROUNDS" value="4" />
<env name="DB_DATABASE" value="panel_test" /> <env name="DB_DATABASE" value="testing" />
<env name="CACHE_DRIVER" value="array" /> <env name="CACHE_DRIVER" value="array" />
<env name="SESSION_DRIVER" value="array" /> <env name="SESSION_DRIVER" value="array" />
<env name="QUEUE_CONNECTION" value="sync" /> <env name="QUEUE_CONNECTION" value="sync" />