docs: updates changelog

Add container registration for Kernel self

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [v2.8.0 (2023-06-19)](https://github.com/pestphp/pest/compare/v2.7.0...v2.8.0)
+
+### Added
+- Support for `globs` in `uses` ([#829](https://github.com/pestphp/pest/pull/829))
+
 ## [v2.7.0 (2023-06-15)](https://github.com/pestphp/pest/compare/v2.6.3...v2.7.0)
 
 ### Added

composer.json

@@ -22,7 +22,7 @@
         "nunomaduro/collision": "^7.6.0",
         "nunomaduro/termwind": "^1.15.1",
         "pestphp/pest-plugin": "^2.0.1",
-        "pestphp/pest-plugin-arch": "^2.2.0",
+        "pestphp/pest-plugin-arch": "^2.2.1",
         "phpunit/phpunit": "^10.2.2"
     },
     "conflict": {

src/Kernel.php

@@ -67,10 +67,14 @@ final class Kernel
 
         CallsBoot::execute();
 
-        return new self(
+        $kernel = new self(
             new Application(),
             $output,
         );
+
+        Container::getInstance()->add(self::class, $kernel);
+
+        return $kernel;
     }
 
     /**

src/PendingCalls/UsesCall.php

@@ -84,8 +84,10 @@ final class UsesCall
         }, $targets);
 
         $this->targets = array_reduce($targets, function (array $accumulator, string $target): array {
-            if (is_dir($target) || file_exists($target)) {
+            if (($matches = glob($target)) !== false) {
-                $accumulator[] = (string) realpath($target);
+                foreach ($matches as $file) {
+                    $accumulator[] = (string) realpath($file);
+                }
             }
 
             return $accumulator;

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '2.7.0';
+    return '2.8.0';
 }
 
 function testDirectory(string $file = ''): string

src/Plugins/Init.php

@@ -60,13 +60,13 @@ final class Init implements HandlesArguments
 
         $this->init();
 
-        return array_values($arguments);
+        exit(0);
     }
 
     /**
      * Initializes the tests directory.
      */
-    private function init(): void
+    public function init(): void
     {
         $testsBaseDir = "{$this->testSuite->rootPath}/tests";
 
@@ -112,8 +112,6 @@ final class Init implements HandlesArguments
         View::render('components.new-line');
 
         (new Thanks($this->input, $this->output))();
-
-        exit(0);
     }
 
     /**

src/Support/Exporter.php

@@ -77,6 +77,12 @@ final class Exporter
      */
     public function shortenedExport(mixed $value): string
     {
-        return (string) preg_replace(['#\.{3}#', '#\\\n\s*#'], ['…'], $this->exporter->shortenedExport($value));
+        $map = [
+            '#\.{3}#' => '…',
+            '#\\\n\s*#' => '',
+            '# Object \(…\)#' => '',
+        ];
+
+        return (string) preg_replace(array_keys($map), array_values($map), $this->exporter->shortenedExport($value));
     }
 }

tests/.snapshots/Failure.php.inc

@@ -1,7 +1,7 @@
 ##teamcity[testSuiteStarted name='Tests/tests/Failure' locationHint='file://tests/.tests/Failure.php' flowId='1234']
 ##teamcity[testCount count='8' flowId='1234']
 ##teamcity[testStarted name='it can fail with comparison' locationHint='pest_qn://tests/.tests/Failure.php::it can fail with comparison' flowId='1234']
-##teamcity[testFailed name='it can fail with comparison' message='Failed asserting that true matches expected false.' details='at src/Mixins/Expectation.php:343|nat src/Support/ExpectationPipeline.php:75|nat src/Support/ExpectationPipeline.php:79|nat src/Expectation.php:300|nat tests/.tests/Failure.php:6|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:86' type='comparisonFailure' actual='true' expected='false' flowId='1234']
+##teamcity[testFailed name='it can fail with comparison' message='Failed asserting that true matches expected false.' details='at src/Mixins/Expectation.php:343|nat src/Support/ExpectationPipeline.php:75|nat src/Support/ExpectationPipeline.php:79|nat src/Expectation.php:300|nat tests/.tests/Failure.php:6|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:90' type='comparisonFailure' actual='true' expected='false' flowId='1234']
 ##teamcity[testFinished name='it can fail with comparison' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it can be ignored because of no assertions' locationHint='pest_qn://tests/.tests/Failure.php::it can be ignored because of no assertions' flowId='1234']
 ##teamcity[testIgnored name='it can be ignored because of no assertions' message='This test did not perform any assertions' details='' flowId='1234']
@@ -10,10 +10,10 @@
 ##teamcity[testIgnored name='it can be ignored because it is skipped' message='This test was ignored.' details='' flowId='1234']
 ##teamcity[testFinished name='it can be ignored because it is skipped' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it can fail' locationHint='pest_qn://tests/.tests/Failure.php::it can fail' flowId='1234']
-##teamcity[testFailed name='it can fail' message='oh noo' details='at tests/.tests/Failure.php:18|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:86' flowId='1234']
+##teamcity[testFailed name='it can fail' message='oh noo' details='at tests/.tests/Failure.php:18|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:90' flowId='1234']
 ##teamcity[testFinished name='it can fail' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it throws exception' locationHint='pest_qn://tests/.tests/Failure.php::it throws exception' flowId='1234']
-##teamcity[testFailed name='it throws exception' message='Exception: test error' details='at tests/.tests/Failure.php:22|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:86' flowId='1234']
+##teamcity[testFailed name='it throws exception' message='Exception: test error' details='at tests/.tests/Failure.php:22|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:90' flowId='1234']
 ##teamcity[testFinished name='it throws exception' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it is not done yet' locationHint='pest_qn://tests/.tests/Failure.php::it is not done yet' flowId='1234']
 ##teamcity[testIgnored name='it is not done yet' message='This test was ignored.' details='' flowId='1234']

tests/.snapshots/help-command.txt

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 2.7.0.  
+  Pest Testing Framework 2.8.0.  
 
   USAGE: pest <file> [options]  
 

tests/.snapshots/success.txt

@@ -80,7 +80,7 @@
   ✓ named datasets with dataset "one"
   ✓ named datasets with dataset "two"
   ✓ named datasets did the job right
-  ✓ lazy named datasets with (Bar Object (…))
+  ✓ lazy named datasets with (Bar)
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #1
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #2
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), false)
@@ -134,24 +134,24 @@
   ✓ eager registered wrapped datasets with Generator functions did the job right
   ✓ eager registered wrapped datasets with Generator functions display description with dataset "taylor"
   ✓ eager registered wrapped datasets with Generator functions display description with dataset "james"
-  ✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #1
+  ✓ it can resolve a dataset after the test case is available with (Closure) #1
-  ✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #2
+  ✓ it can resolve a dataset after the test case is available with (Closure) #2
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #1
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #1
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #2
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #2
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #3
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #3
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #4
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #4
-  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (…)) #1
+  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure) #1
-  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (…)) #2
+  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure) #2
-  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (…)) #1
+  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure) #1
-  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (…)) #2
+  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure) #2
-  ✓ it resolves a potential bound dataset logically with ('foo', Closure Object (…))
+  ✓ it resolves a potential bound dataset logically with ('foo', Closure)
-  ✓ it resolves a potential bound dataset logically even when the closure comes first with (Closure Object (…), 'bar')
+  ✓ it resolves a potential bound dataset logically even when the closure comes first with (Closure, 'bar')
-  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure Object (…)) #1
+  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure) #1
-  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure Object (…)) #2
+  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure) #2
-  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure Object (…)) #1
+  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure) #1
-  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure Object (…)) #2
+  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure) #2
-  ✓ it can correctly resolve a bound dataset that returns an array with (Closure Object (…))
+  ✓ it can correctly resolve a bound dataset that returns an array with (Closure)
-  ✓ it can correctly resolve a bound dataset that returns an array but wants to be spread with (Closure Object (…))
+  ✓ it can correctly resolve a bound dataset that returns an array but wants to be spread with (Closure)
   ↓ forbids to define tests in Datasets dirs and Datasets.php files
 
    PASS  Tests\Features\Depends
@@ -586,7 +586,7 @@
   ✓ it passes with ('Fortaleza')
   ✓ it passes with ('Sollefteå')
   ✓ it passes with ('Ιεράπετρα')
-  ✓ it passes with (stdClass Object (…))
+  ✓ it passes with (stdClass)
   ✓ it passes with array
   ✓ it passes with *not*
   ✓ it properly fails with *not*
@@ -866,6 +866,12 @@
   ✓ custom traits can be used
   ✓ trait applied in this file
 
+   PASS  Tests\PHPUnit\GlobPatternTests\SubFolder\InnerFolder\UsesPerDirectoryAsPattern
+  ✓ closure was bound to CustomTestCase
+
+   PASS  Tests\PHPUnit\GlobPatternTests\SubFolder2\UsesPerFileAsPattern
+  ✓ closure was bound to CustomTestCase
+
    PASS  Tests\Playground
   ✓ basic
 
@@ -1038,10 +1044,6 @@
   ✓ todo
   ✓ todo in parallel
 
-   PASS  Tests\Visual\UnexpectedOutput
-  ✓ unexpected output with ([''])
-  ✓ unexpected output with (['--parallel'])
-
    PASS  Tests\Visual\Version
   ✓ visual snapshot of help command output
 

tests/.snapshots/unexpected-output-parallel.txt

@@ -1,23 +0,0 @@
-
-  .this is unexpected output!
-  ────────────────────────────────────────────────────────────────────────────  
-   RISKY  Tests\Fixtures\UnexpectedOutput > output                              
-  This test printed output: this is unexpected output
-
-  at src/Support/StateGenerator.php:58
-     54▕             foreach ($riskyEvents as $riskyEvent) {
-     55▕                 $state->add(TestResult::fromPestParallelTestCase(
-     56▕                     $riskyEvent->test(),
-     57▕                     TestResult::RISKY,
-  ➜  58▕                     ThrowableBuilder::from(new TestOutcome($riskyEvent->message()))
-     59▕                 ));
-     60▕             }
-     61▕         }
-     62▕
-
-  1   src/Support/StateGenerator.php:58
-      +5 vendor frames 
-  7   src/Plugins/Actions/CallsHandleArguments.php:29
-
-
-  Tests:    1 risky, 1 passed (2 assertions)

tests/.snapshots/unexpected-output.txt

@@ -1,20 +0,0 @@
-this is unexpected output
-   WARN  Tests\Fixtures\UnexpectedOutput
-  ! output → This test printed output: this is unexpected output
-  ────────────────────────────────────────────────────────────────────────────  
-   RISKY  Tests\Fixtures\UnexpectedOutput > output                              
-  This test printed output: this is unexpected output
-
-  at src/Kernel.php:86
-     82▕     {
-     83▕         $args = CallsHandleArguments::execute($args);
-     84▕ 
-     85▕         try {
-  ➜  86▕             $this->application->run($args);
-     87▕         } catch (NoDirtyTestsFound) {
-     88▕             $this->output->writeln([
-     89▕                 '',
-     90▕                 '   INFO  No tests found.',
-
-
-  Tests:    1 risky (1 assertions)

tests/.snapshots/version-command.txt

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 2.7.0.  
+  Pest Testing Framework 2.8.0.  
 

tests/PHPUnit/GlobPatternTests/SubFolder/InnerFolder/UsesPerDirectoryAsPattern.php

@@ -0,0 +1,5 @@
+<?php
+
+test('closure was bound to CustomTestCase', function () {
+    $this->assertCustomTrue();
+});

tests/PHPUnit/GlobPatternTests/SubFolder2/UsesPerFileAsPattern.php

@@ -0,0 +1,5 @@
+<?php
+
+test('closure was bound to CustomTestCase', function () {
+    $this->assertCustomTrue();
+});

tests/Pest.php

@@ -1,9 +1,16 @@
 <?php
 
+use Tests\CustomTestCase\CustomTestCase;
 use Tests\CustomTestCaseInSubFolders\SubFolder\SubFolder\CustomTestCaseInSubFolder;
 
 uses(CustomTestCaseInSubFolder::class)->in('PHPUnit/CustomTestCaseInSubFolders/SubFolder/SubFolder');
 
+// test case for all the directories inside PHPUnit/GlobPatternTests/SubFolder/
+uses(CustomTestCase::class)->in('PHPUnit/GlobPatternTests/SubFolder/*/');
+
+// test case for all the files that end with AsPattern.php inside PHPUnit/GlobPatternTests/SubFolder2/
+uses(CustomTestCase::class)->in('PHPUnit/GlobPatternTests/SubFolder2/*AsPattern.php');
+
 uses()->group('integration')->in('Visual');
 
 // NOTE: global test value container to be mutated and checked across files, as needed

tests/Visual/Parallel.php

@@ -18,7 +18,7 @@ $run = function () {
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 8 todos, 15 skipped, 705 passed (1718 assertions)')
+        ->toContain('Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 8 todos, 15 skipped, 707 passed (1720 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();
 

tests/Visual/UnexpectedOutput.php

@@ -1,43 +0,0 @@
-<?php
-
-test('unexpected output', function (array $arguments) {
-    $snapshot = __DIR__.'/../.snapshots/unexpected-output.txt';
-
-    if (in_array('--parallel', $arguments)) {
-        $snapshot = __DIR__.'/../.snapshots/unexpected-output-parallel.txt';
-    }
-
-    $output = function () use ($arguments) {
-        $process = (new Symfony\Component\Process\Process(
-            array_merge(['php', 'bin/pest', 'tests/Fixtures/UnexpectedOutput.php'], $arguments),
-            null,
-            ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true', 'COLLISION_TEST' => true]
-        ));
-
-        $process->run();
-
-        return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
-    };
-
-    if (getenv('REBUILD_SNAPSHOTS')) {
-        $outputContent = explode("\n", $output());
-        array_pop($outputContent);
-        array_pop($outputContent);
-        array_pop($outputContent);
-
-        if (in_array('--parallel', $arguments)) {
-            array_pop($outputContent);
-            array_pop($outputContent);
-        }
-
-        file_put_contents($snapshot, implode("\n", $outputContent));
-
-        $this->markTestSkipped('Snapshot rebuilt.');
-    }
-
-    expect($output())
-        ->toContain(file_get_contents($snapshot));
-})->with([
-    [['']],
-    [['--parallel']],
-])->skipOnWindows();