Merge branch '4.x' into fix/sibling-describe-blocks

src/Support/Backtrace.php

@@ -11,12 +11,9 @@ use Pest\Exceptions\ShouldNotHappen;
  */
 final class Backtrace
 {
-    /**
-     * @var string
-     */
-    private const FILE = 'file';
+    private const string FILE = 'file';
 
-    private const BACKTRACE_OPTIONS = DEBUG_BACKTRACE_IGNORE_ARGS;
+    private const int BACKTRACE_OPTIONS = DEBUG_BACKTRACE_IGNORE_ARGS;
 
     /**
      * Returns the current test file.

src/Support/Closure.php

@@ -15,7 +15,6 @@ final class Closure
     /**
      * Binds the given closure to the given "this".
      *
-     *
      * @throws ShouldNotHappen
      */
     public static function bind(?BaseClosure $closure, ?object $newThis, object|string|null $newScope = 'static'): BaseClosure
@@ -24,6 +23,7 @@ final class Closure
             throw ShouldNotHappen::fromMessage('Could not bind null closure.');
         }
 
+        // @phpstan-ignore-next-line
         $closure = BaseClosure::bind($closure, $newThis, $newScope);
 
         if (! $closure instanceof \Closure) {

src/Support/Coverage.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Pest\Support;
 
 use Pest\Exceptions\ShouldNotHappen;
-use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Node\Directory;
 use SebastianBergmann\CodeCoverage\Node\File;
 use SebastianBergmann\Environment\Runtime;
@@ -74,7 +73,7 @@ final class Coverage
      * Reports the code coverage report to the
      * console and returns the result in float.
      */
-    public static function report(OutputInterface $output): float
+    public static function report(OutputInterface $output, bool $compact = false): float
     {
         if (! file_exists($reportPath = self::getPath())) {
             if (self::usingXdebug()) {
@@ -88,10 +87,20 @@ final class Coverage
             throw ShouldNotHappen::fromMessage(sprintf('Coverage not found in path: %s.', $reportPath));
         }
 
-        /** @var CodeCoverage $codeCoverage */
-        $codeCoverage = require $reportPath;
+        $handle = fopen($reportPath, 'r');
+        $code = '';
+        while (is_resource($handle) && ! feof($handle)) {
+            $code .= fread($handle, 8192);
+        }
+
+        if (is_resource($handle)) {
+            fclose($handle);
+        }
+
         unlink($reportPath);
 
+        $codeCoverage = eval(substr($code, 5));
+
         $totalCoverage = $codeCoverage->getReport()->percentageOfExecutedLines();
 
         /** @var Directory<File|Directory> $report */
@@ -113,6 +122,10 @@ final class Coverage
                 ? '100.0'
                 : number_format($file->percentageOfExecutedLines()->asFloat(), 1, '.', '');
 
+            if ($percentage === '100.0' && $compact) {
+                continue;
+            }
+
             $uncoveredLines = '';
 
             $percentageOfExecutedLinesAsString = $file->percentageOfExecutedLines()->asString();

src/Support/DatasetInfo.php

@@ -11,9 +11,9 @@ use function Pest\testDirectory;
  */
 final class DatasetInfo
 {
-    public const DATASETS_DIR_NAME = 'Datasets';
+    public const string DATASETS_DIR_NAME = 'Datasets';
 
-    public const DATASETS_FILE_NAME = 'Datasets.php';
+    public const string DATASETS_FILE_NAME = 'Datasets.php';
 
     public static function isInsideADatasetsDirectory(string $file): bool
     {

src/Support/ExceptionTrace.php

@@ -13,7 +13,7 @@ use Throwable;
  */
 final class ExceptionTrace
 {
-    private const UNDEFINED_METHOD = 'Call to undefined method P\\';
+    private const string UNDEFINED_METHOD = 'Call to undefined method P\\';
 
     /**
      * Ensures the given closure reports the good execution context.

src/Support/Exporter.php

@@ -15,7 +15,7 @@ final readonly class Exporter
     /**
      * The maximum number of items in an array to export.
      */
-    private const MAX_ARRAY_ITEMS = 3;
+    private const int MAX_ARRAY_ITEMS = 3;
 
     /**
      * Creates a new Exporter instance.
@@ -66,6 +66,7 @@ final readonly class Exporter
 
             $result[] = $context->contains($data[$key]) !== false
                 ? '*RECURSION*'
+                // @phpstan-ignore-next-line
                 : sprintf('[%s]', $this->shortenedRecursiveExport($data[$key], $context));
         }
 

src/Support/HigherOrderMessage.php

@@ -13,7 +13,7 @@ use Throwable;
  */
 final class HigherOrderMessage
 {
-    public const UNDEFINED_METHOD = 'Method %s does not exist';
+    public const string UNDEFINED_METHOD = 'Method %s does not exist';
 
     /**
      * An optional condition that will determine if the message will be executed.
@@ -50,14 +50,13 @@ final class HigherOrderMessage
         }
 
         if ($this->hasHigherOrderCallable()) {
-            /* @phpstan-ignore-next-line */
             return (new HigherOrderCallables($target))->{$this->name}(...$this->arguments);
         }
 
         try {
             return is_array($this->arguments)
                 ? Reflection::call($target, $this->name, $this->arguments)
-                : $target->{$this->name}; /* @phpstan-ignore-line */
+                : $target->{$this->name};
         } catch (Throwable $throwable) {
             Reflection::setPropertyValue($throwable, 'file', $this->filename);
             Reflection::setPropertyValue($throwable, 'line', $this->line);
@@ -65,7 +64,6 @@ final class HigherOrderMessage
             if ($throwable->getMessage() === $this->getUndefinedMethodMessage($target, $this->name)) {
                 /** @var ReflectionClass<TValue> $reflection */
                 $reflection = new ReflectionClass($target);
-                /* @phpstan-ignore-next-line */
                 $reflection = $reflection->getParentClass() ?: $reflection;
                 Reflection::setPropertyValue($throwable, 'message', sprintf('Call to undefined method %s::%s()', $reflection->getName(), $this->name));
             }
@@ -96,10 +94,6 @@ final class HigherOrderMessage
 
     private function getUndefinedMethodMessage(object $target, string $methodName): string
     {
-        if (\PHP_MAJOR_VERSION >= 8) {
-            return sprintf(self::UNDEFINED_METHOD, sprintf('%s::%s()', $target::class, $methodName));
-        }
-
-        return sprintf(self::UNDEFINED_METHOD, $methodName);
+        return sprintf(self::UNDEFINED_METHOD, sprintf('%s::%s()', $target::class, $methodName));
     }
 }

src/Support/HigherOrderMessageCollection.php

@@ -40,7 +40,6 @@ final class HigherOrderMessageCollection
     public function chain(object $target): void
     {
         foreach ($this->messages as $message) {
-            // @phpstan-ignore-next-line
             $target = $message->call($target) ?? $target;
         }
     }

src/Support/HigherOrderTapProxy.php

@@ -26,7 +26,7 @@ final class HigherOrderTapProxy
      */
     public function __set(string $property, mixed $value): void
     {
-        $this->target->{$property} = $value; // @phpstan-ignore-line
+        $this->target->{$property} = $value;
     }
 
     /**
@@ -37,7 +37,7 @@ final class HigherOrderTapProxy
     public function __get(string $property)
     {
         if (property_exists($this->target, $property)) {
-            return $this->target->{$property}; // @phpstan-ignore-line
+            return $this->target->{$property};
         }
 
         $className = (new ReflectionClass($this->target))->getName();

src/Support/Shell.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Support;
+
+use Illuminate\Support\Env;
+use Laravel\Tinker\ClassAliasAutoloader;
+use Pest\TestSuite;
+use Psy\Configuration;
+use Psy\Shell as PsyShell;
+use Psy\VersionUpdater\Checker;
+
+/**
+ * @internal
+ */
+final class Shell
+{
+    /**
+     * Creates a new interactive shell.
+     */
+    public static function open(): void
+    {
+        $config = new Configuration;
+
+        $config->setUpdateCheck(Checker::NEVER);
+
+        $config->getPresenter()->addCasters(self::casters());
+
+        $shell = new PsyShell($config);
+
+        $loader = self::tinkered($shell);
+
+        try {
+            $shell->run();
+        } finally {
+            $loader?->unregister(); // @phpstan-ignore-line
+        }
+    }
+
+    /**
+     * Returns the casters for the Psy Shell.
+     *
+     * @return array<string, callable>
+     */
+    private static function casters(): array
+    {
+        $casters = [
+            'Illuminate\Support\Collection' => 'Laravel\Tinker\TinkerCaster::castCollection',
+            'Illuminate\Support\HtmlString' => 'Laravel\Tinker\TinkerCaster::castHtmlString',
+            'Illuminate\Support\Stringable' => 'Laravel\Tinker\TinkerCaster::castStringable',
+        ];
+
+        if (class_exists('Illuminate\Database\Eloquent\Model')) {
+            $casters['Illuminate\Database\Eloquent\Model'] = 'Laravel\Tinker\TinkerCaster::castModel';
+        }
+
+        if (class_exists('Illuminate\Process\ProcessResult')) {
+            $casters['Illuminate\Process\ProcessResult'] = 'Laravel\Tinker\TinkerCaster::castProcessResult';
+        }
+
+        if (class_exists('Illuminate\Foundation\Application')) {
+            $casters['Illuminate\Foundation\Application'] = 'Laravel\Tinker\TinkerCaster::castApplication';
+        }
+
+        if (function_exists('app') === false) {
+            return $casters; // @phpstan-ignore-line
+        }
+
+        $config = app()->make('config');
+
+        return array_merge($casters, (array) $config->get('tinker.casters', []));
+    }
+
+    /**
+     * Tinkers the current shell, if the Tinker package is available.
+     */
+    private static function tinkered(PsyShell $shell): ?object
+    {
+        if (function_exists('app') === false
+            || ! class_exists(Env::class)
+            || ! class_exists(ClassAliasAutoloader::class)
+        ) {
+            return null;
+        }
+
+        $path = Env::get('COMPOSER_VENDOR_DIR', app()->basePath().DIRECTORY_SEPARATOR.'vendor');
+
+        $path .= '/composer/autoload_classmap.php';
+
+        if (! file_exists($path)) {
+            $path = TestSuite::getInstance()->rootPath.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'composer'.DIRECTORY_SEPARATOR.'autoload_classmap.php';
+        }
+
+        $config = app()->make('config');
+
+        return ClassAliasAutoloader::register(
+            $shell, $path, $config->get('tinker.alias', []), $config->get('tinker.dont_alias', [])
+        );
+    }
+}

src/Support/Str.php

@@ -13,12 +13,9 @@ final class Str
      * Pool of alpha-numeric characters for generating (unsafe) random strings
      * from.
      */
-    private const POOL = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    private const string POOL = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-    /**
-     * @var string
-     */
-    private const PREFIX = '__pest_evaluable_';
+    private const string PREFIX = '__pest_evaluable_';
 
     /**
      * Create a (unsecure & non-cryptographically safe) random alpha-numeric
@@ -120,4 +117,14 @@ final class Str
     {
         return (bool) filter_var($value, FILTER_VALIDATE_URL);
     }
+
+    /**
+     * Converts the given `$target` to a URL-friendly "slug".
+     */
+    public static function slugify(string $target): string
+    {
+        $target = preg_replace('/[^a-zA-Z0-9]+/', '-', $target);
+
+        return strtolower(trim((string) $target, '-'));
+    }
 }