From 492f797dd5e85baf0ca517291917d545725a8a4d Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Thu, 17 Aug 2023 11:24:16 +0100 Subject: [PATCH] chore: style changes --- .../Runner/Filter/NameFilterIterator.php | 7 ++++--- .../Runner/ResultCache/DefaultResultCache.php | 12 ++++++----- overrides/Runner/TestSuiteLoader.php | 11 +++++----- overrides/TextUI/TestSuiteFilterProcessor.php | 3 ++- src/Bootstrappers/BootFiles.php | 3 ++- src/Expectations/EachExpectation.php | 3 ++- src/Plugins/Help.php | 3 ++- src/Plugins/Parallel.php | 3 ++- .../Parallel/Paratest/ResultPrinter.php | 19 +++++++++--------- .../Parallel/Paratest/WrapperRunner.php | 20 ++++++++++--------- .../Parallel/Support/CompactPrinter.php | 3 ++- src/Plugins/Version.php | 1 + src/Repositories/DatasetsRepository.php | 3 ++- src/Support/Coverage.php | 1 + src/Support/View.php | 3 ++- .../PHPUnit/CustomTestCase/CustomTestCase.php | 3 ++- tests/PHPUnit/CustomTestCase/ExecutedTest.php | 3 ++- tests/PHPUnit/CustomTestCase/ParentTest.php | 3 ++- 18 files changed, 62 insertions(+), 42 deletions(-) diff --git a/overrides/Runner/Filter/NameFilterIterator.php b/overrides/Runner/Filter/NameFilterIterator.php index 391c3ed5..8b740c3f 100644 --- a/overrides/Runner/Filter/NameFilterIterator.php +++ b/overrides/Runner/Filter/NameFilterIterator.php @@ -34,17 +34,18 @@ namespace PHPUnit\Runner\Filter; -use function end; use Exception; -use function implode; use Pest\Contracts\HasPrintableTestCaseName; use PHPUnit\Framework\SelfDescribing; use PHPUnit\Framework\Test; use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestSuite; -use function preg_match; use RecursiveFilterIterator; use RecursiveIterator; + +use function end; +use function implode; +use function preg_match; use function sprintf; use function str_replace; diff --git a/overrides/Runner/ResultCache/DefaultResultCache.php b/overrides/Runner/ResultCache/DefaultResultCache.php index 40134011..c64602c0 100644 --- a/overrides/Runner/ResultCache/DefaultResultCache.php +++ b/overrides/Runner/ResultCache/DefaultResultCache.php @@ -45,9 +45,15 @@ declare(strict_types=1); namespace PHPUnit\Runner\ResultCache; +use const DIRECTORY_SEPARATOR; + +use PHPUnit\Framework\TestStatus\TestStatus; +use PHPUnit\Runner\DirectoryCannotBeCreatedException; +use PHPUnit\Runner\Exception; +use PHPUnit\Util\Filesystem; + use function array_keys; use function assert; -use const DIRECTORY_SEPARATOR; use function dirname; use function file_get_contents; use function file_put_contents; @@ -57,10 +63,6 @@ use function is_file; use function json_decode; use function json_encode; use function Pest\version; -use PHPUnit\Framework\TestStatus\TestStatus; -use PHPUnit\Runner\DirectoryCannotBeCreatedException; -use PHPUnit\Runner\Exception; -use PHPUnit\Util\Filesystem; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit diff --git a/overrides/Runner/TestSuiteLoader.php b/overrides/Runner/TestSuiteLoader.php index b6a5e754..9c1a0935 100644 --- a/overrides/Runner/TestSuiteLoader.php +++ b/overrides/Runner/TestSuiteLoader.php @@ -36,18 +36,19 @@ declare(strict_types=1); namespace PHPUnit\Runner; -use function array_diff; -use function array_values; -use function basename; -use function class_exists; use Exception; -use function get_declared_classes; use Pest\Contracts\HasPrintableTestCaseName; use Pest\TestCases\IgnorableTestCase; use Pest\TestSuite; use PHPUnit\Framework\TestCase; use ReflectionClass; use ReflectionException; + +use function array_diff; +use function array_values; +use function basename; +use function class_exists; +use function get_declared_classes; use function substr; /** diff --git a/overrides/TextUI/TestSuiteFilterProcessor.php b/overrides/TextUI/TestSuiteFilterProcessor.php index 31ce5fe6..f4473289 100644 --- a/overrides/TextUI/TestSuiteFilterProcessor.php +++ b/overrides/TextUI/TestSuiteFilterProcessor.php @@ -45,7 +45,6 @@ declare(strict_types=1); namespace PHPUnit\TextUI; -use function array_map; use Pest\Plugins\Only; use PHPUnit\Event; use PHPUnit\Framework\TestSuite; @@ -53,6 +52,8 @@ use PHPUnit\Runner\Filter\Factory; use PHPUnit\TextUI\Configuration\Configuration; use PHPUnit\TextUI\Configuration\FilterNotConfiguredException; +use function array_map; + /** * @internal This class is not covered by the backward compatibility promise for PHPUnit */ diff --git a/src/Bootstrappers/BootFiles.php b/src/Bootstrappers/BootFiles.php index 3add2a70..411fd007 100644 --- a/src/Bootstrappers/BootFiles.php +++ b/src/Bootstrappers/BootFiles.php @@ -7,12 +7,13 @@ namespace Pest\Bootstrappers; use Pest\Contracts\Bootstrapper; use Pest\Support\DatasetInfo; use Pest\Support\Str; -use function Pest\testDirectory; use Pest\TestSuite; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; use SebastianBergmann\FileIterator\Facade as PhpUnitFileIterator; +use function Pest\testDirectory; + /** * @internal */ diff --git a/src/Expectations/EachExpectation.php b/src/Expectations/EachExpectation.php index 56cd937b..e5df6e9c 100644 --- a/src/Expectations/EachExpectation.php +++ b/src/Expectations/EachExpectation.php @@ -4,9 +4,10 @@ declare(strict_types=1); namespace Pest\Expectations; -use function expect; use Pest\Expectation; +use function expect; + /** * @internal * diff --git a/src/Plugins/Help.php b/src/Plugins/Help.php index b0643461..c8e4d32f 100644 --- a/src/Plugins/Help.php +++ b/src/Plugins/Help.php @@ -6,10 +6,11 @@ namespace Pest\Plugins; use Pest\Contracts\Plugins\HandlesArguments; use Pest\Support\View; -use function Pest\version; use PHPUnit\TextUI\Help as PHPUnitHelp; use Symfony\Component\Console\Output\OutputInterface; +use function Pest\version; + /** * @internal */ diff --git a/src/Plugins/Parallel.php b/src/Plugins/Parallel.php index 3354b743..fd643471 100644 --- a/src/Plugins/Parallel.php +++ b/src/Plugins/Parallel.php @@ -13,11 +13,12 @@ use Pest\Plugins\Parallel\Paratest\CleanConsoleOutput; use Pest\Support\Arr; use Pest\Support\Container; use Pest\TestSuite; -use function Pest\version; use Stringable; use Symfony\Component\Console\Application; use Symfony\Component\Console\Input\ArgvInput; +use function Pest\version; + final class Parallel implements HandlesArguments { use HandleArguments; diff --git a/src/Plugins/Parallel/Paratest/ResultPrinter.php b/src/Plugins/Parallel/Paratest/ResultPrinter.php index f9d96ca2..1e9cc245 100644 --- a/src/Plugins/Parallel/Paratest/ResultPrinter.php +++ b/src/Plugins/Parallel/Paratest/ResultPrinter.php @@ -4,6 +4,16 @@ declare(strict_types=1); namespace Pest\Plugins\Parallel\Paratest; +use ParaTest\Options; +use Pest\Plugins\Parallel\Support\CompactPrinter; +use Pest\Support\StateGenerator; +use PHPUnit\TestRunner\TestResult\TestResult; +use PHPUnit\TextUI\Output\Printer; +use SebastianBergmann\Timer\Duration; +use SplFileInfo; +use Symfony\Component\Console\Formatter\OutputFormatter; +use Symfony\Component\Console\Output\OutputInterface; + use function assert; use function fclose; use function feof; @@ -12,16 +22,7 @@ use function fread; use function fseek; use function ftell; use function fwrite; -use ParaTest\Options; -use Pest\Plugins\Parallel\Support\CompactPrinter; -use Pest\Support\StateGenerator; -use PHPUnit\TestRunner\TestResult\TestResult; -use PHPUnit\TextUI\Output\Printer; -use SebastianBergmann\Timer\Duration; -use SplFileInfo; use function strlen; -use Symfony\Component\Console\Formatter\OutputFormatter; -use Symfony\Component\Console\Output\OutputInterface; /** * @internal diff --git a/src/Plugins/Parallel/Paratest/WrapperRunner.php b/src/Plugins/Parallel/Paratest/WrapperRunner.php index 248c1bc5..8b75bc4c 100644 --- a/src/Plugins/Parallel/Paratest/WrapperRunner.php +++ b/src/Plugins/Parallel/Paratest/WrapperRunner.php @@ -4,15 +4,8 @@ declare(strict_types=1); namespace Pest\Plugins\Parallel\Paratest; -use function array_merge; -use function array_merge_recursive; -use function array_shift; -use function assert; -use function count; use const DIRECTORY_SEPARATOR; -use function dirname; -use function file_get_contents; -use function max; + use NunoMaduro\Collision\Adapters\Phpunit\Support\ResultReflection; use ParaTest\Coverage\CoverageMerger; use ParaTest\JUnit\LogMerger; @@ -30,11 +23,20 @@ use PHPUnit\TestRunner\TestResult\Facade as TestResultFacade; use PHPUnit\TestRunner\TestResult\TestResult; use PHPUnit\TextUI\Configuration\CodeCoverageFilterRegistry; use PHPUnit\Util\ExcludeList; -use function realpath; use SebastianBergmann\Timer\Timer; use SplFileInfo; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\PhpExecutableFinder; + +use function array_merge; +use function array_merge_recursive; +use function array_shift; +use function assert; +use function count; +use function dirname; +use function file_get_contents; +use function max; +use function realpath; use function unlink; use function unserialize; use function usleep; diff --git a/src/Plugins/Parallel/Support/CompactPrinter.php b/src/Plugins/Parallel/Support/CompactPrinter.php index d3175214..25226b10 100644 --- a/src/Plugins/Parallel/Support/CompactPrinter.php +++ b/src/Plugins/Parallel/Support/CompactPrinter.php @@ -16,8 +16,9 @@ use PHPUnit\TestRunner\TestResult\TestResult as PHPUnitTestResult; use SebastianBergmann\Timer\Duration; use Symfony\Component\Console\Output\ConsoleOutput; use Symfony\Component\Console\Output\OutputInterface; -use function Termwind\render; use Termwind\Terminal; + +use function Termwind\render; use function Termwind\terminal; /** diff --git a/src/Plugins/Version.php b/src/Plugins/Version.php index 8422cb0d..3740f263 100644 --- a/src/Plugins/Version.php +++ b/src/Plugins/Version.php @@ -6,6 +6,7 @@ namespace Pest\Plugins; use Pest\Contracts\Plugins\HandlesArguments; use Pest\Support\View; + use function Pest\version; /** diff --git a/src/Repositories/DatasetsRepository.php b/src/Repositories/DatasetsRepository.php index a43f1a84..1c296fc9 100644 --- a/src/Repositories/DatasetsRepository.php +++ b/src/Repositories/DatasetsRepository.php @@ -10,9 +10,10 @@ use Pest\Exceptions\DatasetAlreadyExists; use Pest\Exceptions\DatasetDoesNotExist; use Pest\Exceptions\ShouldNotHappen; use Pest\Support\Exporter; -use function sprintf; use Traversable; +use function sprintf; + /** * @internal */ diff --git a/src/Support/Coverage.php b/src/Support/Coverage.php index eccff9d3..e0794522 100644 --- a/src/Support/Coverage.php +++ b/src/Support/Coverage.php @@ -10,6 +10,7 @@ use SebastianBergmann\CodeCoverage\Node\Directory; use SebastianBergmann\CodeCoverage\Node\File; use SebastianBergmann\Environment\Runtime; use Symfony\Component\Console\Output\OutputInterface; + use function Termwind\render; use function Termwind\renderUsing; use function Termwind\terminal; diff --git a/src/Support/View.php b/src/Support/View.php index 9d5823a8..a73fd83a 100644 --- a/src/Support/View.php +++ b/src/Support/View.php @@ -5,9 +5,10 @@ declare(strict_types=1); namespace Pest\Support; use Symfony\Component\Console\Output\OutputInterface; +use Termwind\Termwind; + use function Termwind\render; use function Termwind\renderUsing; -use Termwind\Termwind; /** * @internal diff --git a/tests/PHPUnit/CustomTestCase/CustomTestCase.php b/tests/PHPUnit/CustomTestCase/CustomTestCase.php index 8a71327b..8a7a07a4 100644 --- a/tests/PHPUnit/CustomTestCase/CustomTestCase.php +++ b/tests/PHPUnit/CustomTestCase/CustomTestCase.php @@ -4,9 +4,10 @@ declare(strict_types=1); namespace Tests\CustomTestCase; -use function PHPUnit\Framework\assertTrue; use PHPUnit\Framework\TestCase; +use function PHPUnit\Framework\assertTrue; + abstract class CustomTestCase extends TestCase { public function assertCustomTrue() diff --git a/tests/PHPUnit/CustomTestCase/ExecutedTest.php b/tests/PHPUnit/CustomTestCase/ExecutedTest.php index 71a32980..29aed3cc 100644 --- a/tests/PHPUnit/CustomTestCase/ExecutedTest.php +++ b/tests/PHPUnit/CustomTestCase/ExecutedTest.php @@ -4,9 +4,10 @@ declare(strict_types=1); namespace Tests\CustomTestCase; -use function PHPUnit\Framework\assertTrue; use PHPUnit\Framework\TestCase; +use function PHPUnit\Framework\assertTrue; + class ExecutedTest extends TestCase { public static $executed = false; diff --git a/tests/PHPUnit/CustomTestCase/ParentTest.php b/tests/PHPUnit/CustomTestCase/ParentTest.php index 44d0d452..6ef967d4 100644 --- a/tests/PHPUnit/CustomTestCase/ParentTest.php +++ b/tests/PHPUnit/CustomTestCase/ParentTest.php @@ -4,9 +4,10 @@ declare(strict_types=1); namespace Tests\CustomTestCase; -use function PHPUnit\Framework\assertTrue; use PHPUnit\Framework\TestCase; +use function PHPUnit\Framework\assertTrue; + class ParentTest extends TestCase { private function getEntity(): bool