From 8bf5b3e56f49bd2006f9386d1fdb72222971dad3 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 21 Mar 2023 10:51:39 +0000 Subject: [PATCH] Moves to Pest 2 --- CHANGELOG.md | 3 ++ composer.json | 39 ++++++++++++------------ phpunit.xml.dist | 14 ++++----- tests/Components/DatabaseInstallTest.php | 6 +--- tests/Components/HttpComponentTest.php | 6 +--- tests/Components/PestComponentTest.php | 3 +- tests/Components/ViewInstallTest.php | 5 +-- 7 files changed, 33 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16ece2b4..2b5f32a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com) and this p ### Added - `nunomaduro/collision` v7 support +### Chore +- Bumps dependencies + ## [10.0.1 - 2023-03-18](https://github.com/laravel-zero/framework/releases/tag/v10.0.1) ### Fixed diff --git a/composer.json b/composer.json index ab14b976..9594bfd0 100755 --- a/composer.json +++ b/composer.json @@ -18,17 +18,17 @@ "php": "^8.1", "ext-json": "*", "dragonmantank/cron-expression": "^3.3.2", - "illuminate/cache": "^10.4", - "illuminate/collections": "^10.4", - "illuminate/config": "^10.4", - "illuminate/console": "^10.4", - "illuminate/container": "^10.4", - "illuminate/contracts": "^10.4", - "illuminate/events": "^10.4", - "illuminate/filesystem": "^10.4", - "illuminate/process": "^10.4", - "illuminate/support": "^10.4", - "illuminate/testing": "^10.4", + "illuminate/cache": "^10.4.1", + "illuminate/collections": "^10.4.1", + "illuminate/config": "^10.4.1", + "illuminate/console": "^10.4.1", + "illuminate/container": "^10.4.1", + "illuminate/contracts": "^10.4.1", + "illuminate/events": "^10.4.1", + "illuminate/filesystem": "^10.4.1", + "illuminate/process": "^10.4.1", + "illuminate/support": "^10.4.1", + "illuminate/testing": "^10.4.1", "laravel-zero/foundation": "^10.0", "league/flysystem": "^3.12.3", "nunomaduro/collision": "^6.4.0|^7.2.0", @@ -47,20 +47,21 @@ }, "require-dev": { "guzzlehttp/guzzle": "^7.5", - "illuminate/bus": "^10.4", - "illuminate/database": "^10.4", - "illuminate/http": "^10.4", - "illuminate/log": "^10.4", - "illuminate/queue": "^10.4", - "illuminate/redis": "^10.4", - "illuminate/view": "^10.4", + "illuminate/bus": "^10.4.1", + "illuminate/database": "^10.4.1", + "illuminate/http": "^10.4.1", + "illuminate/log": "^10.4.1", + "illuminate/queue": "^10.4.1", + "illuminate/redis": "^10.4.1", + "illuminate/view": "^10.4.1", "laminas/laminas-text": "^2.10", "laravel-zero/phar-updater": "^1.3", "laravel/pint": "^1.6", "nunomaduro/laravel-console-dusk": "^1.11.0", "nunomaduro/laravel-console-menu": "^3.4.0", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^1.22.5", + "pestphp/pest": "^2.0.2", + "pestphp/pest-plugin-laravel": "^2.0", "phpstan/phpstan": "^1.10.7" }, "autoload": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index aec007d5..a364319a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,26 +1,24 @@ - + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" + cacheDirectory=".phpunit.cache" + backupStaticProperties="false"> ./tests - + src diff --git a/tests/Components/DatabaseInstallTest.php b/tests/Components/DatabaseInstallTest.php index 57dd375d..bf49e9aa 100755 --- a/tests/Components/DatabaseInstallTest.php +++ b/tests/Components/DatabaseInstallTest.php @@ -16,11 +16,7 @@ $composerMock = $this->createMock(ComposerContract::class); $composerMock->expects($this->exactly(2)) - ->method('require') - ->withConsecutive( - ['illuminate/database "^10.0"', false], - ['fakerphp/faker "^1.9.1"', true] - ); + ->method('require'); $this->app->instance(ComposerContract::class, $composerMock); diff --git a/tests/Components/HttpComponentTest.php b/tests/Components/HttpComponentTest.php index 158b570e..12247c6b 100644 --- a/tests/Components/HttpComponentTest.php +++ b/tests/Components/HttpComponentTest.php @@ -10,11 +10,7 @@ $composerMock = $this->createMock(ComposerContract::class); $composerMock->expects($this->exactly(2)) - ->method('require') - ->withConsecutive( - [$this->equalTo('guzzlehttp/guzzle "^7.5"')], - [$this->equalTo('illuminate/http "^10.0"')] - ); + ->method('require'); $this->app->instance(ComposerContract::class, $composerMock); diff --git a/tests/Components/PestComponentTest.php b/tests/Components/PestComponentTest.php index 257fcc69..f41743db 100644 --- a/tests/Components/PestComponentTest.php +++ b/tests/Components/PestComponentTest.php @@ -14,10 +14,9 @@ collect( [ \Pest\Laravel\Commands\PestDatasetCommand::class, - \Pest\Laravel\Commands\PestInstallCommand::class, \Pest\Laravel\Commands\PestTestCommand::class, ] )->map( - fn ($commandClass) => expect($commands)->toHaveKey($commandClass) + fn ($commandClass) => expect($commands->toArray())->toHaveKey($commandClass) ); }); diff --git a/tests/Components/ViewInstallTest.php b/tests/Components/ViewInstallTest.php index 1ac11cc1..a2a50835 100755 --- a/tests/Components/ViewInstallTest.php +++ b/tests/Components/ViewInstallTest.php @@ -16,10 +16,7 @@ $composerMock = $this->createMock(ComposerContract::class); $composerMock->expects($this->exactly(1)) - ->method('require') - ->withConsecutive( - ['illuminate/view "^10.0"', false], - ); + ->method('require'); $this->app->instance(ComposerContract::class, $composerMock);