From 0256825d53c30e6d23541694f83f91bf2eb53caf Mon Sep 17 00:00:00 2001 From: MK Date: Mon, 7 Aug 2023 23:03:39 -0400 Subject: [PATCH 1/4] allow build command to work without pcntl --- src/Commands/BuildCommand.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Commands/BuildCommand.php b/src/Commands/BuildCommand.php index b1e9caf4..b2ceab9a 100644 --- a/src/Commands/BuildCommand.php +++ b/src/Commands/BuildCommand.php @@ -72,13 +72,17 @@ public function run(InputInterface $input, OutputInterface $output): int /** @return array */ public function getSubscribedSignals(): array { - return [\SIGINT]; + if (defined('SIGINT')) { + return [\SIGINT]; + } + + return []; } /** {@inheritdoc} */ public function handleSignal(int $signal): int|false { - if ($signal === \SIGINT) { + if (defined('SIGINT') && $signal === \SIGINT) { if (self::$config !== null) { $this->clear(); } From b7750187af66864a3efadc03cf09ab8f6e896067 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Fri, 11 Aug 2023 12:49:57 +0100 Subject: [PATCH 2/4] chore: bump dependencies --- composer.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index c3b140eb..736be987 100755 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": "^8.1", "ext-json": "*", - "dragonmantank/cron-expression": "^3.3.2", + "dragonmantank/cron-expression": "^3.3.3", "illuminate/cache": "^10.13.5", "illuminate/collections": "^10.13.5", "illuminate/config": "^10.13.5", @@ -35,22 +35,22 @@ "illuminate/testing": "^10.13.5", "laravel-zero/foundation": "^10.12", "league/flysystem": "^3.15.1", - "nunomaduro/collision": "^6.4.0|^7.2.0", - "nunomaduro/laravel-console-summary": "^1.9.1", + "nunomaduro/collision": "^6.4.0|^7.8.1", + "nunomaduro/laravel-console-summary": "^1.10.0", "nunomaduro/laravel-console-task": "^1.8", "nunomaduro/laravel-desktop-notifier": "^2.7", "psr/log": "^1.1|^2.0|^3.0", - "ramsey/uuid": "^4.7.3", - "symfony/console": "^6.3", - "symfony/error-handler": "^6.3", - "symfony/event-dispatcher": "^6.3", - "symfony/finder": "^6.3.0", - "symfony/process": "^6.3.0", - "symfony/var-dumper": "^6.3.0", + "ramsey/uuid": "^4.7.4", + "symfony/console": "^6.3.2", + "symfony/error-handler": "^6.3.2", + "symfony/event-dispatcher": "^6.3.2", + "symfony/finder": "^6.3.3", + "symfony/process": "^6.3.2", + "symfony/var-dumper": "^6.3.3", "vlucas/phpdotenv": "^5.5" }, "require-dev": { - "guzzlehttp/guzzle": "^7.5", + "guzzlehttp/guzzle": "^7.7", "illuminate/bus": "^10.13.5", "illuminate/database": "^10.13.5", "illuminate/http": "^10.13.5", @@ -60,13 +60,13 @@ "illuminate/view": "^10.13.5", "laminas/laminas-text": "^2.10", "laravel-zero/phar-updater": "^1.3", - "laravel/pint": "^1.10.3", + "laravel/pint": "^1.10.6", "nunomaduro/laravel-console-dusk": "^1.11", "nunomaduro/laravel-console-menu": "^3.4", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.8.1", - "pestphp/pest-plugin-laravel": "^2.0", - "phpstan/phpstan": "^1.10.20" + "pestphp/pest": "^2.13.0", + "pestphp/pest-plugin-laravel": "^2.2", + "phpstan/phpstan": "^1.10.28" }, "autoload": { "psr-4": { From 3050bf88a054623fd4fda386335819afc7dc2717 Mon Sep 17 00:00:00 2001 From: Owen Voke Date: Fri, 25 Aug 2023 09:14:05 +0100 Subject: [PATCH 3/4] chore(deps-dev): update Pint to 1.11.x --- composer.json | 2 +- src/Bootstrap/BaseLoadConfiguration.php | 5 +++-- src/Bootstrap/LoadEnvironmentVariables.php | 3 ++- src/Bootstrap/RegisterProviders.php | 3 ++- src/Commands/Command.php | 3 ++- src/Commands/MakeCommand.php | 1 + src/Commands/RenameCommand.php | 1 + src/Commands/TestMakeCommand.php | 1 + src/Components/ConsoleDusk/Provider.php | 3 ++- src/Components/Database/Migrator.php | 3 ++- src/Components/Database/Provider.php | 7 ++++--- src/Components/Log/Provider.php | 3 ++- src/Components/Logo/Provider.php | 3 ++- src/Components/Menu/Provider.php | 3 ++- src/Components/Pest/Provider.php | 3 ++- src/Components/Queue/Provider.php | 3 ++- src/Components/Redis/Provider.php | 3 ++- src/Components/Updater/Provider.php | 3 ++- src/Components/View/Provider.php | 3 ++- src/Kernel.php | 11 ++++++----- src/ProviderRepository.php | 3 ++- src/Providers/Build/Build.php | 3 ++- src/Providers/Composer/Composer.php | 3 ++- 23 files changed, 49 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index 736be987..950564af 100755 --- a/composer.json +++ b/composer.json @@ -60,7 +60,7 @@ "illuminate/view": "^10.13.5", "laminas/laminas-text": "^2.10", "laravel-zero/phar-updater": "^1.3", - "laravel/pint": "^1.10.6", + "laravel/pint": "^1.11", "nunomaduro/laravel-console-dusk": "^1.11", "nunomaduro/laravel-console-menu": "^3.4", "nunomaduro/termwind": "^1.15.1", diff --git a/src/Bootstrap/BaseLoadConfiguration.php b/src/Bootstrap/BaseLoadConfiguration.php index e9a85acb..80fe914e 100644 --- a/src/Bootstrap/BaseLoadConfiguration.php +++ b/src/Bootstrap/BaseLoadConfiguration.php @@ -13,12 +13,13 @@ namespace LaravelZero\Framework\Bootstrap; -use function basename; use Illuminate\Contracts\Foundation\Application as ApplicationContract; use Illuminate\Foundation\Bootstrap\LoadConfiguration; -use function ksort; use Symfony\Component\Finder\Finder; +use function basename; +use function ksort; + /** * @internal */ diff --git a/src/Bootstrap/LoadEnvironmentVariables.php b/src/Bootstrap/LoadEnvironmentVariables.php index be0f9147..cb696d58 100644 --- a/src/Bootstrap/LoadEnvironmentVariables.php +++ b/src/Bootstrap/LoadEnvironmentVariables.php @@ -13,12 +13,13 @@ namespace LaravelZero\Framework\Bootstrap; -use function class_exists; use Dotenv\Dotenv; use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables as BaseLoadEnvironmentVariables; use LaravelZero\Framework\Application; use LaravelZero\Framework\Contracts\BoostrapperContract; +use function class_exists; + /** * @internal */ diff --git a/src/Bootstrap/RegisterProviders.php b/src/Bootstrap/RegisterProviders.php index e25fb42f..88e940bb 100644 --- a/src/Bootstrap/RegisterProviders.php +++ b/src/Bootstrap/RegisterProviders.php @@ -13,7 +13,6 @@ namespace LaravelZero\Framework\Bootstrap; -use function collect; use Illuminate\Foundation\Bootstrap\RegisterProviders as BaseRegisterProviders; use LaravelZero\Framework\Application; use LaravelZero\Framework\Components; @@ -26,6 +25,8 @@ use NunoMaduro\LaravelConsoleTask\LaravelConsoleTaskServiceProvider; use NunoMaduro\LaravelDesktopNotifier\LaravelDesktopNotifierServiceProvider; +use function collect; + /** * @internal */ diff --git a/src/Commands/Command.php b/src/Commands/Command.php index 476ea871..6b6a8f80 100644 --- a/src/Commands/Command.php +++ b/src/Commands/Command.php @@ -13,11 +13,12 @@ namespace LaravelZero\Framework\Commands; -use function func_get_args; use Illuminate\Console\Command as BaseCommand; use Illuminate\Console\Scheduling\Schedule; use LaravelZero\Framework\Application; use LaravelZero\Framework\Providers\CommandRecorder\CommandRecorderRepository; + +use function func_get_args; use function str_repeat; use function strlen; diff --git a/src/Commands/MakeCommand.php b/src/Commands/MakeCommand.php index 5864c63b..d35800a0 100644 --- a/src/Commands/MakeCommand.php +++ b/src/Commands/MakeCommand.php @@ -14,6 +14,7 @@ namespace LaravelZero\Framework\Commands; use Illuminate\Foundation\Console\ConsoleMakeCommand; + use function ucfirst; final class MakeCommand extends ConsoleMakeCommand diff --git a/src/Commands/RenameCommand.php b/src/Commands/RenameCommand.php index 95d46820..927d73c1 100644 --- a/src/Commands/RenameCommand.php +++ b/src/Commands/RenameCommand.php @@ -15,6 +15,7 @@ use Illuminate\Support\Facades\File; use Illuminate\Support\Str; + use function sprintf; final class RenameCommand extends Command diff --git a/src/Commands/TestMakeCommand.php b/src/Commands/TestMakeCommand.php index 07e02d2d..f68514d8 100644 --- a/src/Commands/TestMakeCommand.php +++ b/src/Commands/TestMakeCommand.php @@ -14,6 +14,7 @@ namespace LaravelZero\Framework\Commands; use Illuminate\Foundation\Console\TestMakeCommand as BaseTestMakeCommand; + use function ucfirst; final class TestMakeCommand extends BaseTestMakeCommand diff --git a/src/Components/ConsoleDusk/Provider.php b/src/Components/ConsoleDusk/Provider.php index 5476319d..23c68bfa 100644 --- a/src/Components/ConsoleDusk/Provider.php +++ b/src/Components/ConsoleDusk/Provider.php @@ -13,9 +13,10 @@ namespace LaravelZero\Framework\Components\ConsoleDusk; -use function class_exists; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** * @internal */ diff --git a/src/Components/Database/Migrator.php b/src/Components/Database/Migrator.php index 7e5d41f9..50111109 100644 --- a/src/Components/Database/Migrator.php +++ b/src/Components/Database/Migrator.php @@ -13,12 +13,13 @@ namespace LaravelZero\Framework\Components\Database; -use function collect; use Illuminate\Database\Migrations\Migrator as BaseMigrator; use Illuminate\Support\Str; use SplFileInfo; use Symfony\Component\Finder\Finder; +use function collect; + /** * @codeCoverageIgnore * diff --git a/src/Components/Database/Provider.php b/src/Components/Database/Provider.php index 968c84f3..25497725 100644 --- a/src/Components/Database/Provider.php +++ b/src/Components/Database/Provider.php @@ -13,8 +13,6 @@ namespace LaravelZero\Framework\Components\Database; -use function class_exists; -use function collect; use Illuminate\Contracts\Config\Repository; use Illuminate\Database\ConnectionResolverInterface; use Illuminate\Database\Console\Factories\FactoryMakeCommand; @@ -36,10 +34,13 @@ use Illuminate\Foundation\Console\ModelMakeCommand; use Illuminate\Foundation\Providers\ComposerServiceProvider; use Illuminate\Support\Facades\File; -use function is_array; use LaravelZero\Framework\Components\AbstractComponentProvider; use SplFileInfo; +use function class_exists; +use function collect; +use function is_array; + /** * @internal */ diff --git a/src/Components/Log/Provider.php b/src/Components/Log/Provider.php index 88868a7c..9ad56293 100644 --- a/src/Components/Log/Provider.php +++ b/src/Components/Log/Provider.php @@ -13,10 +13,11 @@ namespace LaravelZero\Framework\Components\Log; -use function class_exists; use Illuminate\Contracts\Config\Repository; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** * @internal */ diff --git a/src/Components/Logo/Provider.php b/src/Components/Logo/Provider.php index cb66dce2..4b7e465f 100644 --- a/src/Components/Logo/Provider.php +++ b/src/Components/Logo/Provider.php @@ -13,10 +13,11 @@ namespace LaravelZero\Framework\Components\Logo; -use function class_exists; use Illuminate\Console\Application as Artisan; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** * @internal */ diff --git a/src/Components/Menu/Provider.php b/src/Components/Menu/Provider.php index 8a833365..78486073 100644 --- a/src/Components/Menu/Provider.php +++ b/src/Components/Menu/Provider.php @@ -13,9 +13,10 @@ namespace LaravelZero\Framework\Components\Menu; -use function class_exists; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** * @internal */ diff --git a/src/Components/Pest/Provider.php b/src/Components/Pest/Provider.php index 0b5988a4..f07d880f 100644 --- a/src/Components/Pest/Provider.php +++ b/src/Components/Pest/Provider.php @@ -13,10 +13,11 @@ namespace LaravelZero\Framework\Components\Pest; -use function class_exists; use LaravelZero\Framework\Components\AbstractComponentProvider; use Pest\Laravel\PestServiceProvider; +use function class_exists; + /** @internal */ final class Provider extends AbstractComponentProvider { diff --git a/src/Components/Queue/Provider.php b/src/Components/Queue/Provider.php index fcd5e995..5c660310 100644 --- a/src/Components/Queue/Provider.php +++ b/src/Components/Queue/Provider.php @@ -13,10 +13,11 @@ namespace LaravelZero\Framework\Components\Queue; -use function class_exists; use Illuminate\Contracts\Config\Repository; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** * @internal */ diff --git a/src/Components/Redis/Provider.php b/src/Components/Redis/Provider.php index 4552fafe..45060bf8 100644 --- a/src/Components/Redis/Provider.php +++ b/src/Components/Redis/Provider.php @@ -13,10 +13,11 @@ namespace LaravelZero\Framework\Components\Redis; -use function class_exists; use Illuminate\Redis\RedisServiceProvider; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** @internal */ final class Provider extends AbstractComponentProvider { diff --git a/src/Components/Updater/Provider.php b/src/Components/Updater/Provider.php index 32072cd9..22cbace0 100644 --- a/src/Components/Updater/Provider.php +++ b/src/Components/Updater/Provider.php @@ -13,13 +13,14 @@ namespace LaravelZero\Framework\Components\Updater; -use function class_exists; use Humbug\SelfUpdate\Updater as PharUpdater; use LaravelZero\Framework\Components\AbstractComponentProvider; use LaravelZero\Framework\Components\Updater\Strategy\GithubStrategy; use LaravelZero\Framework\Components\Updater\Strategy\StrategyInterface; use LaravelZero\Framework\Providers\Build\Build; +use function class_exists; + /** * @internal */ diff --git a/src/Components/View/Provider.php b/src/Components/View/Provider.php index a37591af..8fc18382 100644 --- a/src/Components/View/Provider.php +++ b/src/Components/View/Provider.php @@ -13,9 +13,10 @@ namespace LaravelZero\Framework\Components\View; -use function class_exists; use LaravelZero\Framework\Components\AbstractComponentProvider; +use function class_exists; + /** * @internal */ diff --git a/src/Kernel.php b/src/Kernel.php index 7f6bc692..258b71e8 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -13,19 +13,20 @@ namespace LaravelZero\Framework; -use function collect; -use function define; -use function defined; -use function get_class; use Illuminate\Console\Application as Artisan; use Illuminate\Foundation\Console\Kernel as BaseKernel; -use function in_array; use LaravelZero\Framework\Providers\CommandRecorder\CommandRecorderRepository; use NunoMaduro\Collision\Adapters\Laravel\Commands\TestCommand; use ReflectionClass; use Symfony\Component\Console\Exception\CommandNotFoundException; use Symfony\Component\Console\Output\OutputInterface; +use function collect; +use function define; +use function defined; +use function get_class; +use function in_array; + class Kernel extends BaseKernel { /** diff --git a/src/ProviderRepository.php b/src/ProviderRepository.php index 8d3b0e50..8d40607a 100644 --- a/src/ProviderRepository.php +++ b/src/ProviderRepository.php @@ -13,9 +13,10 @@ namespace LaravelZero\Framework; -use function array_merge; use Illuminate\Foundation\ProviderRepository as BaseProviderRepository; +use function array_merge; + /** * @internal */ diff --git a/src/Providers/Build/Build.php b/src/Providers/Build/Build.php index 0921ea12..23678a27 100644 --- a/src/Providers/Build/Build.php +++ b/src/Providers/Build/Build.php @@ -13,9 +13,10 @@ namespace LaravelZero\Framework\Providers\Build; -use function dirname; use Phar; +use function dirname; + /** * @internal */ diff --git a/src/Providers/Composer/Composer.php b/src/Providers/Composer/Composer.php index a37fff47..b641c958 100644 --- a/src/Providers/Composer/Composer.php +++ b/src/Providers/Composer/Composer.php @@ -13,13 +13,14 @@ namespace LaravelZero\Framework\Providers\Composer; -use function collect; use Illuminate\Contracts\Foundation\Application; use LaravelZero\Framework\Contracts\Providers\ComposerContract; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\Process; use Throwable; +use function collect; + /** * @codeCoverageIgnore * From 7d04a0f9da330bb4fbc0e10ed0f5bd3056e981ba Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 29 Aug 2023 17:08:16 +0100 Subject: [PATCH 4/4] Fixes loading environment variables --- src/Bootstrap/LoadEnvironmentVariables.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Bootstrap/LoadEnvironmentVariables.php b/src/Bootstrap/LoadEnvironmentVariables.php index cb696d58..5fd29aab 100644 --- a/src/Bootstrap/LoadEnvironmentVariables.php +++ b/src/Bootstrap/LoadEnvironmentVariables.php @@ -31,7 +31,11 @@ final class LoadEnvironmentVariables implements BoostrapperContract public function bootstrap(Application $app): void { if (class_exists(Dotenv::class)) { - $app->make(BaseLoadEnvironmentVariables::class)->bootstrap($app); + + if (file_exists($app->environmentFilePath())) { + $app->make(BaseLoadEnvironmentVariables::class)->bootstrap($app); + } + $app->make(BuildLoadEnvironmentVariables::class)->bootstrap($app); } }