docs: updates changelog

chore: update PHPUnit config stubs

CHANGELOG.md

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.3.4 (2020-09-15)](https://github.com/pestphp/pest/compare/v0.3.3...v0.3.4)
+### Added
+- `toMatchObject` expectation ([4e184b2](https://github.com/pestphp/pest/commit/4e184b2f906c318a5e9cd38fe693cdab5c48d8a2))
+
+## [v0.3.3 (2020-09-13)](https://github.com/pestphp/pest/compare/v0.3.2...v0.3.3)
+### Added
+- `toHaveKeys` expectation ([204f343](https://github.com/pestphp/pest/commit/204f343831adc17bb3734553c24fac92d02f27c7))
+
+## [v0.3.2 (2020-09-12)](https://github.com/pestphp/pest/compare/v0.3.1...v0.3.2)
+### Added
+- Support to PHPUnit 9.3.9, and 9.3.10 ([1318bf9](https://github.com/pestphp/pest/commit/97f98569bc86e8b87f8cde963fe7b4bf5399623b))
+
+## [v0.3.1 (2020-08-29)](https://github.com/pestphp/pest/compare/v0.3.0...v0.3.1)
+### Added
+- Support to PHPUnit 9.3.8 ([#174](https://github.com/pestphp/pest/pull/174))
+
 ## [v0.3.0 (2020-08-27)](https://github.com/pestphp/pest/compare/v0.2.3...v0.3.0)
 ### Added
 - Expectation API (TODO)

README.md

@@ -1,7 +1,7 @@
 <p align="center">
     <img src="https://raw.githubusercontent.com/pestphp/art/master/readme.png" width="600" alt="PEST">
     <p align="center">
-        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/workflow/status/pestphp/pest/Continuous Integration/master"></a>
+        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/workflow/status/pestphp/pest/Tests/master"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Latest Version" src="https://img.shields.io/packagist/v/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="License" src="https://img.shields.io/packagist/l/pestphp/pest"></a>
@@ -15,4 +15,12 @@
 - Follow us on Twitter: **[@pestphp »](https://twitter.com/pestphp)**
 - Join us on the Discord Server: **[discord.gg/bMAJv82 »](https://discord.gg/bMAJv82)**
 
+## Pest Sponsors
+
+We would like to extend our thanks to the following sponsors for funding Pest development. If you are interested in becoming a sponsor, please visit the Nuno Maduro's [Sponsors page](https://github.com/sponsors/nunomaduro).
+
+### Premium Sponsors
+
+- **[Scout APM](https://github.com/scoutapp)**
+
 Pest was created by **[Nuno Maduro](https://twitter.com/enunomaduro)** under the **[Sponsorware license](https://github.com/sponsorware/docs)**. It got open-sourced and is now licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

composer.json

@@ -22,7 +22,7 @@
         "pestphp/pest-plugin": "^0.3",
         "pestphp/pest-plugin-coverage": "^0.3",
         "pestphp/pest-plugin-init": "^0.3",
-        "phpunit/phpunit": "9.3.7"
+        "phpunit/phpunit": "9.3.7 || 9.3.8 || 9.3.9 || 9.3.10"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -22,3 +22,12 @@ parameters:
         - "#has parameter \\$closure with default value.#"
         - "#has parameter \\$description with default value.#"
         - "#Method Pest\\\\Support\\\\Reflection::getParameterClassName\\(\\) has a nullable return type declaration.#"
+        -
+            message: '#Call to an undefined method PHPUnit\\Framework\\Test::getName\(\)#'
+            path: src/TeamCity.php
+        -
+            message: '#invalid typehint type Pest\\Concerns\\TestCase#'
+            path: src/TeamCity.php
+        -
+            message: '#is not subtype of native type PHPUnit\\Framework\\Test#'
+            path: src/TeamCity.php

phpunit.xml

@@ -8,8 +8,8 @@
             <directory suffix=".php">./tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
-        <include processUncoveredFiles="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./src</directory>
         </include>
     </coverage>

rector.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Core\Configuration\Option;
+use Rector\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -27,5 +28,8 @@ return static function (ContainerConfigurator $containerConfigurator): void {
         SetList::SOLID,
     ]);
 
-    $parameters->set(Option::PATHS, [__DIR__.'/src', __DIR__.'/tests']);
+    $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/tests']);
+    $parameters->set(Option::EXCLUDE_RECTORS, [
+       StaticCallOnNonStaticToInstanceCallRector::class,
+    ]);
 };

src/Actions/AddsDefaults.php

@@ -5,12 +5,16 @@ declare(strict_types=1);
 namespace Pest\Actions;
 
 use NunoMaduro\Collision\Adapters\Phpunit\Printer;
+use Pest\TeamCity;
+use PHPUnit\TextUI\DefaultResultPrinter;
 
 /**
  * @internal
  */
 final class AddsDefaults
 {
+    private const PRINTER = 'printer';
+
     /**
      * Adds default arguments to the given `arguments` array.
      *
@@ -20,8 +24,12 @@ final class AddsDefaults
      */
     public static function to(array $arguments): array
     {
-        if (!array_key_exists('printer', $arguments)) {
-            $arguments['printer'] = new Printer(null, $arguments['verbose'] ?? false, $arguments['colors'] ?? 'always');
+        if (!array_key_exists(self::PRINTER, $arguments)) {
+            $arguments[self::PRINTER] = new Printer(null, $arguments['verbose'] ?? false, $arguments['colors'] ?? DefaultResultPrinter::COLOR_ALWAYS);
+        }
+
+        if ($arguments[self::PRINTER] === \PHPUnit\Util\Log\TeamCity::class) {
+            $arguments[self::PRINTER] = new TeamCity($arguments['verbose'] ?? false, $arguments['colors'] ?? DefaultResultPrinter::COLOR_ALWAYS);
         }
 
         return $arguments;

src/Concerns/TestCase.php

@@ -65,6 +65,11 @@ trait TestCase
         return $this->__description;
     }
 
+    public static function __getFileName(): string
+    {
+        return self::$__filename;
+    }
+
     /**
      * This method is called before the first test of this test class is run.
      */

src/Expectation.php

@@ -170,11 +170,20 @@ final class Expectation
 
     /**
      * Asserts that the value contains the property $name.
+     *
+     * @param mixed $value
      */
-    public function toHaveProperty(string $name): Expectation
+    public function toHaveProperty(string $name, $value = null): Expectation
     {
+        $this->toBeObject();
+
         Assert::assertTrue(property_exists($this->value, $name));
 
+        if (func_num_args() > 1) {
+            /* @phpstan-ignore-next-line */
+            Assert::assertEquals($value, $this->value->{$name});
+        }
+
         return $this;
     }
 
@@ -376,14 +385,30 @@ final class Expectation
 
     /**
      * Asserts that the value array has the provided $key.
+     *
+     * @param string|int $key
      */
-    public function toHaveKey(string $key): Expectation
+    public function toHaveKey($key): Expectation
     {
         Assert::assertArrayHasKey($key, $this->value);
 
         return $this;
     }
 
+    /**
+     * Asserts that the value array has the provided $keys.
+     *
+     * @param array<int, int|string> $keys
+     */
+    public function toHaveKeys(array $keys): Expectation
+    {
+        foreach ($keys as $key) {
+            $this->toHaveKey($key);
+        }
+
+        return $this;
+    }
+
     /**
      * Asserts that the value is a directory.
      */
@@ -444,6 +469,21 @@ final class Expectation
         return $this;
     }
 
+    /**
+     * Asserts that the value object matches a subset
+     * of the properties of an given object.
+     *
+     * @param array<string, mixed>|object $object
+     */
+    public function toMatchObject($object): Expectation
+    {
+        foreach ((array) $object as $property => $value) {
+            $this->toHaveProperty($property, $value);
+        }
+
+        return $this;
+    }
+
     /**
      * Dynamically calls methods on the class without any arguments.
      *

src/OppositeExpectation.php

@@ -27,6 +27,26 @@ final class OppositeExpectation
         $this->original = $original;
     }
 
+    /**
+     * Asserts that the value array not has the provided $keys.
+     *
+     * @param array<int, int|string> $keys
+     */
+    public function toHaveKeys(array $keys): Expectation
+    {
+        foreach ($keys as $key) {
+            try {
+                $this->original->toHaveKey($key);
+            } catch (ExpectationFailedException $e) {
+                continue;
+            }
+
+            $this->throwExpectationFailedExpection('toHaveKey', [$key]);
+        }
+
+        return $this->original;
+    }
+
     /**
      * Handle dynamic method calls into the original expectation.
      *

src/Pest.php

@@ -6,5 +6,5 @@ namespace Pest;
 
 function version(): string
 {
-    return '0.3.0';
+    return '0.3.1';
 }

src/TeamCity.php

@@ -0,0 +1,235 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest;
+
+use function getmypid;
+use Pest\Concerns\TestCase;
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestResult;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Framework\Warning;
+use PHPUnit\TextUI\DefaultResultPrinter;
+use function round;
+use function str_replace;
+use Throwable;
+
+final class TeamCity extends DefaultResultPrinter
+{
+    private const PROTOCOL            = 'pest_qn://';
+    private const NAME                = 'name';
+    private const LOCATION_HINT       = 'locationHint';
+    private const DURATION            = 'duration';
+    private const TEST_SUITE_STARTED  = 'testSuiteStarted';
+    private const TEST_SUITE_FINISHED = 'testSuiteFinished';
+    private const TEST_FAILED         = 'testFailed';
+
+    /** @var int */
+    private $flowId;
+
+    /** @var bool */
+    private $isSummaryTestCountPrinted = false;
+
+    /** @var \PHPUnit\Util\Log\TeamCity */
+    private $phpunitTeamCity;
+
+    public function __construct(bool $verbose, string $colors)
+    {
+        parent::__construct(null, $verbose, $colors, false, 80, false);
+        $this->phpunitTeamCity = new \PHPUnit\Util\Log\TeamCity(
+            null,
+            $verbose,
+            $colors,
+            false,
+            80,
+            false
+        );
+    }
+
+    public function printResult(TestResult $result): void
+    {
+        $this->printHeader($result);
+        $this->printFooter($result);
+    }
+
+    /** @phpstan-ignore-next-line */
+    public function startTestSuite(TestSuite $suite): void
+    {
+        $this->flowId = getmypid();
+
+        if (!$this->isSummaryTestCountPrinted) {
+            $this->printEvent(
+                'testCount',
+                ['count' => $suite->count()]
+            );
+            $this->isSummaryTestCountPrinted = true;
+        }
+
+        $suiteName = $suite->getName();
+
+        if (file_exists($suiteName) || !method_exists($suiteName, '__getFileName')) {
+            $this->printEvent(
+                self::TEST_SUITE_STARTED, [
+                self::NAME          => $suiteName,
+                self::LOCATION_HINT => self::PROTOCOL . $suiteName,
+            ]);
+
+            return;
+        }
+
+        $fileName = $suiteName::__getFileName();
+
+        $this->printEvent(
+            self::TEST_SUITE_STARTED, [
+            self::NAME          => substr($suiteName, 2),
+            self::LOCATION_HINT => self::PROTOCOL . $fileName,
+        ]);
+    }
+
+    /** @phpstan-ignore-next-line */
+    public function endTestSuite(TestSuite $suite): void
+    {
+        $suiteName = $suite->getName();
+
+        if (file_exists($suiteName) || !method_exists($suiteName, '__getFileName')) {
+            $this->printEvent(
+                self::TEST_SUITE_FINISHED, [
+                self::NAME          => $suiteName,
+                self::LOCATION_HINT => self::PROTOCOL . $suiteName,
+            ]);
+
+            return;
+        }
+
+        $this->printEvent(
+            self::TEST_SUITE_FINISHED, [
+            self::NAME         => substr($suiteName, 2),
+        ]);
+    }
+
+    /**
+     * @param Test|TestCase $test
+     */
+    public function startTest(Test $test): void
+    {
+        if (!TeamCity::isPestTest($test)) {
+            $this->phpunitTeamCity->startTest($test);
+
+            return;
+        }
+
+        $this->printEvent('testStarted', [
+            self::NAME          => $test->getName(),
+            /* @phpstan-ignore-next-line */
+            self::LOCATION_HINT => self::PROTOCOL . $test->toString(),
+        ]);
+    }
+
+    /**
+     * @param Test|TestCase $test
+     */
+    public function endTest(Test $test, float $time): void
+    {
+        if (!TeamCity::isPestTest($test)) {
+            $this->phpunitTeamCity->endTest($test, $time);
+
+            return;
+        }
+
+        $this->printEvent('testFinished', [
+            self::NAME     => $test->getName(),
+            self::DURATION => self::toMilliseconds($time),
+        ]);
+    }
+
+    /**
+     * @param Test|TestCase $test
+     */
+    public function addError(Test $test, Throwable $t, float $time): void
+    {
+        if (!TeamCity::isPestTest($test)) {
+            $this->phpunitTeamCity->addError($test, $t, $time);
+
+            return;
+        }
+
+        $this->printEvent(
+            self::TEST_FAILED, [
+            self::NAME     => $test->getName(),
+            'message'      => $t->getMessage(),
+            'details'      => $t->getTraceAsString(),
+            self::DURATION => self::toMilliseconds($time),
+        ]);
+    }
+
+    /**
+     * @phpstan-ignore-next-line
+     *
+     * @param Test|TestCase $test
+     */
+    public function addWarning(Test $test, Warning $e, float $time): void
+    {
+        if (!TeamCity::isPestTest($test)) {
+            $this->phpunitTeamCity->addWarning($test, $e, $time);
+
+            return;
+        }
+
+        $this->printEvent(
+            self::TEST_FAILED, [
+            self::NAME     => $test->getName(),
+            'message'      => $e->getMessage(),
+            'details'      => $e->getTraceAsString(),
+            self::DURATION => self::toMilliseconds($time),
+        ]);
+    }
+
+    public function addFailure(Test $test, AssertionFailedError $e, float $time): void
+    {
+        $this->phpunitTeamCity->addFailure($test, $e, $time);
+    }
+
+    protected function writeProgress(string $progress): void
+    {
+    }
+
+    /**
+     * @param array<string, string|int> $params
+     */
+    private function printEvent(string $eventName, array $params = []): void
+    {
+        $this->write("\n##teamcity[{$eventName}");
+
+        if ($this->flowId !== 0) {
+            $params['flowId'] = $this->flowId;
+        }
+
+        foreach ($params as $key => $value) {
+            $escapedValue = self::escapeValue((string) $value);
+            $this->write(" {$key}='{$escapedValue}'");
+        }
+
+        $this->write("]\n");
+    }
+
+    private static function escapeValue(string $text): string
+    {
+        return str_replace(
+            ['|', "'", "\n", "\r", ']', '['],
+            ['||', "|'", '|n', '|r', '|]', '|['],
+            $text
+        );
+    }
+
+    private static function toMilliseconds(float $time): int
+    {
+        return (int) round($time * 1000);
+    }
+
+    private static function isPestTest(Test $test): bool
+    {
+        return in_array(TestCase::class, class_uses($test), true);
+    }
+}

stubs/Laravel/phpunit.xml

@@ -12,10 +12,10 @@
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./app</directory>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

stubs/Lumen/phpunit.xml

@@ -9,9 +9,9 @@
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./app</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

tests/.snapshots/success.txt

@@ -180,11 +180,21 @@
    PASS  Tests\Expect\toHaveKey
   ✓ pass
   ✓ failures
+  ✓ not failures
+
+   PASS  Tests\Expect\toHaveKeys
+  ✓ pass
+  ✓ failures
   ✓ not failures
 
    PASS  Tests\Expect\toHaveProperty
   ✓ pass
   ✓ failures
+  ✓ not failures
+
+   PASS  Tests\Expect\toMatchObject
+  ✓ pass
+  ✓ failures
   ✓ not failures
 
    PASS  Tests\Features\AfterAll
@@ -353,5 +363,5 @@
   ✓ depends with defined arguments
   ✓ depends run test only once
 
-  Tests:  6 skipped, 208 passed
+  Tests:  6 skipped, 214 passed
   

tests/Expect/toHaveKeys.php

@@ -0,0 +1,15 @@
+<?php
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+test('pass', function () {
+    expect(['a' => 1, 'b', 'c' => 'world'])->toHaveKeys(['a', 'c']);
+});
+
+test('failures', function () {
+    expect(['a' => 1, 'b', 'c' => 'world'])->toHaveKeys(['a', 'd']);
+})->throws(ExpectationFailedException::class);
+
+test('not failures', function () {
+    expect(['a' => 1, 'hello' => 'world', 'c'])->not->toHaveKeys(['hello', 'c']);
+})->throws(ExpectationFailedException::class);

tests/Expect/toHaveProperty.php

@@ -2,11 +2,15 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 
-$obj      = new stdClass();
-$obj->foo = 'bar';
+$obj          = new stdClass();
+$obj->foo     = 'bar';
+$obj->fooNull = null;
 
 test('pass', function () use ($obj) {
     expect($obj)->toHaveProperty('foo');
+    expect($obj)->toHaveProperty('foo', 'bar');
+    expect($obj)->toHaveProperty('fooNull');
+    expect($obj)->toHaveProperty('fooNull', null);
 });
 
 test('failures', function () use ($obj) {

tests/Expect/toMatchObject.php

@@ -0,0 +1,31 @@
+<?php
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+beforeEach(function () {
+    $this->user = (object) [
+        'id'    => 1,
+        'name'  => 'Nuno',
+        'email' => 'enunomaduro@gmail.com',
+    ];
+});
+
+test('pass', function () {
+    expect($this->user)->toMatchObject([
+        'name'  => 'Nuno',
+        'email' => 'enunomaduro@gmail.com',
+    ]);
+});
+
+test('failures', function () {
+    expect($this->user)->toMatchObject([
+        'name'  => 'Not the same name',
+        'email' => 'enunomaduro@gmail.com',
+    ]);
+})->throws(ExpectationFailedException::class);
+
+test('not failures', function () {
+    expect($this->user)->not->toMatchObject([
+        'id' => 1,
+    ]);
+})->throws(ExpectationFailedException::class);