docs: updates changelog

.editorconfig

@@ -14,5 +14,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml}]
+[*.yml]
 indent_size = 2

.github/workflows/changelog.yml

@@ -39,8 +39,6 @@ jobs:
           ---
           ${{ steps.package.outputs.content }}
 
-          ----
-
           Next section: [Upgrade Guide →](/docs/upgrade-guide)
         write-mode: overwrite
     - name: Copy CHANGELOG to website repository

.github/workflows/formats.yml

@@ -0,0 +1,46 @@
+name: Formats
+
+on: ['push', 'pull_request']
+
+jobs:
+  ci:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [7.4]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: Formats P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.composer/cache/files
+        key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: dom, mbstring, zip
+        tools: prestissimo
+        coverage: pcov
+
+    - name: Install Composer dependencies
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
+
+    - name: Coding Style Checks
+      run: |
+           vendor/bin/rector process src --dry-run
+           vendor/bin/php-cs-fixer fix -v --dry-run
+
+    - name: Type Checks
+      run: vendor/bin/phpstan analyse --ansi

.github/workflows/static.yml

@@ -1,54 +0,0 @@
-name: Static Analysis
-
-on: ['push', 'pull_request']
-
-jobs:
-  cs:
-    runs-on: ubuntu-latest
-
-    name: Code Style
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
-        tools: composer:v2
-        coverage: none
-
-    - name: Install Dependencies
-      run: composer update --no-interaction --no-progress
-
-    - name: Run Rector
-      run: vendor/bin/rector process src --dry-run
-
-    - name: Run PHP-CS-Fixer
-      run: vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-  phpstan:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dependency-version: [prefer-lowest, prefer-stable]
-
-    name: PHPStan ${{ matrix.dependency-version }}
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
-        tools: composer:v2
-        coverage: none
-
-    - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress
-
-    - name: Run PHPStan
-      run: vendor/bin/phpstan analyse --no-progress

.github/workflows/tests.yml

@@ -6,39 +6,43 @@ jobs:
   ci:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ['7.3', '7.4', '8.0']
+        php: [7.3, 7.4]
         dependency-version: [prefer-lowest, prefer-stable]
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+    name: Tests P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
 
     steps:
+
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.composer/cache/files
+        key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        tools: composer:v2
+        extensions: dom, mbstring, zip
         coverage: none
 
-    - name: Setup Problem Matches
+    - name: Install Composer dependencies
-      run: |
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
-        echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-        echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-    - name: Install PHP 7 dependencies
-      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress
-      if: "matrix.php < 8"
-
-    - name: Install PHP 8 dependencies
-      run: composer update --${{ matrix.dependency-version }} --ignore-platform-req=php --no-interaction --no-progress
-      if: "matrix.php >= 8"
 
     - name: Unit Tests
       run: php bin/pest --colors=always --exclude-group=integration
 
     - name: Integration Tests
       run: php bin/pest --colors=always --group=integration
+
+    - name: Setup problem matchers for PHP
+      run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+    - name: Setup problem matchers for Pest
+      run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

.php_cs

@@ -3,6 +3,7 @@
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'tests')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'bin')
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'compiled')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'scripts')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'stubs')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'src')

CHANGELOG.md

@@ -6,18 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [v0.3.1 (2020-08-29)](https://github.com/pestphp/pest/compare/v0.3.0...v0.3.1)
+## [v0.2.4 (2020-08-06)](https://github.com/pestphp/pest/compare/v0.2.3...v0.2.4)
-### Added
+### Changed
-- Support to PHPUnit 9.3.8 ([#174](https://github.com/pestphp/pest/pull/174))
+- uses `"phpunit/phpunit": "~9.2.0"` as dependency ([d0eb2f1](https://github.com/pestphp/pest/commit/d0eb2f15cd44b558ebb47002a7ff5b7af6fbbc07))
-
-## [v0.3.0 (2020-08-27)](https://github.com/pestphp/pest/compare/v0.2.3...v0.3.0)
-### Added
-- Expectation API (TODO)
-- PHPUnit 9.3 and PHP 8 support ([#128](https://github.com/pestphp/pest/pull/128))
-- Fowards `$this` calls to globals ([#169](https://github.com/pestphp/pest/pull/169))
-
-### Fixed
-- don't decorate output if --colors=never is set ([36b879f](https://github.com/pestphp/pest/commit/36b879f97d7b187c87a94eb60af5b7d3b7253d56))
 
 ## [v0.2.3 (2020-07-01)](https://github.com/pestphp/pest/compare/v0.2.2...v0.2.3)
 ### Added

bin/pest

@@ -6,7 +6,6 @@ use Pest\Actions\ValidatesEnvironment;
 use Pest\Console\Command;
 use Pest\Support\Container;
 use Pest\TestSuite;
-use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -28,9 +27,7 @@ use Symfony\Component\Console\Output\OutputInterface;
     $rootPath = getcwd();
 
     $testSuite = TestSuite::getInstance($rootPath);
-
+    $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, true);
-    $isDecorated = (new ArgvInput())->getParameterOption('--colors', 'always') !== 'never';
-    $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, $isDecorated);
 
     $container = Container::getInstance();
     $container->add(TestSuite::class, $testSuite);

composer.json

@@ -17,12 +17,13 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.3",
-        "nunomaduro/collision": "^5.0",
+        "nunomaduro/collision": "^5.0.0-BETA3",
-        "pestphp/pest-plugin": "^0.3",
+        "pestphp/pest-plugin": "^0.2",
-        "pestphp/pest-plugin-coverage": "^0.3",
+        "pestphp/pest-plugin-coverage": "^0.2",
-        "pestphp/pest-plugin-init": "^0.3",
+        "pestphp/pest-plugin-init": "^0.2",
-        "phpunit/phpunit": "9.3.7 || 9.3.8"
+        "phpunit/phpunit": "~9.2.0",
+        "sebastian/environment": "^5.1"
     },
     "autoload": {
         "psr-4": {
@@ -30,7 +31,8 @@
         },
         "files": [
             "src/globals.php",
-            "src/Pest.php"
+            "src/Pest.php",
+            "compiled/globals.php"
         ]
     },
     "autoload-dev": {
@@ -42,10 +44,16 @@
         ]
     },
     "require-dev": {
+        "ergebnis/phpstan-rules": "^0.15.0",
+        "friendsofphp/php-cs-fixer": "^2.16.3",
         "illuminate/console": "^7.16.1",
         "illuminate/support": "^7.16.1",
-        "mockery/mockery": "^1.4.1",
+        "mockery/mockery": "^1.4.0",
-        "pestphp/pest-dev-tools": "dev-master"
+        "phpstan/phpstan": "^0.12.30",
+        "phpstan/phpstan-strict-rules": "^0.12.2",
+        "rector/rector": "^0.7.37",
+        "symfony/var-dumper": "^5.1.2",
+        "thecodingmachine/phpstan-strict-rules": "^0.12.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -57,6 +65,7 @@
         "bin/pest"
     ],
     "scripts": {
+        "compile": "@php ./scripts/compile.php",
         "lint": "rector process src && php-cs-fixer fix -v",
         "test:lint": "php-cs-fixer fix -v --dry-run && rector process src --dry-run",
         "test:types": "phpstan analyse --ansi --memory-limit=0",
@@ -72,7 +81,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.4.x-dev"
+            "dev-master": "0.2.x-dev"
         },
         "pest": {
             "plugins": [

phpstan.neon

@@ -21,4 +21,3 @@ parameters:
         - "# with null as default value#"
         - "#has parameter \\$closure with default value.#"
         - "#has parameter \\$description with default value.#"
-        - "#Method Pest\\\\Support\\\\Reflection::getParameterClassName\\(\\) has a nullable return type declaration.#"

phpunit.xml

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

rector.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Rector\Core\Configuration\Option;
-use Rector\Set\ValueObject\SetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $parameters = $containerConfigurator->parameters();
-
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-
-    $parameters->set(Option::SETS, [
-        SetList::ACTION_INJECTION_TO_CONSTRUCTOR_INJECTION,
-        SetList::ARRAY_STR_FUNCTIONS_TO_STATIC_CALL,
-        SetList::CODE_QUALITY,
-        SetList::PHP_53,
-        SetList::PHP_54,
-        SetList::PHP_56,
-        SetList::PHP_70,
-        SetList::PHP_71,
-        SetList::PHP_72,
-        SetList::PHP_73,
-        SetList::PHPSTAN,
-        SetList::PHPUNIT_CODE_QUALITY,
-        SetList::SOLID,
-    ]);
-
-    $parameters->set(Option::PATHS, [__DIR__.'/src', __DIR__.'/tests']);
-};

rector.yaml

@@ -0,0 +1,16 @@
+# rector.yaml
+parameters:
+    sets:
+        - 'action-injection-to-constructor-injection'
+        - 'array-str-functions-to-static-call'
+        - 'celebrity'
+        - 'doctrine'
+        - 'phpstan'
+        - 'phpunit-code-quality'
+        - 'solid'
+        - 'early-return'
+        - 'doctrine-code-quality'
+        - 'code-quality'
+        - 'php71'
+        - 'php72'
+        - 'php73'

src/Actions/ValidatesConfiguration.php

@@ -6,7 +6,8 @@ namespace Pest\Actions;
 
 use Pest\Exceptions\AttributeNotSupportedYet;
 use Pest\Exceptions\FileOrFolderNotFound;
-use PHPUnit\TextUI\XmlConfiguration\Loader;
+use PHPUnit\TextUI\Configuration\Configuration;
+use PHPUnit\TextUI\Configuration\Registry;
 
 /**
  * @internal
@@ -29,7 +30,9 @@ final class ValidatesConfiguration
             throw new FileOrFolderNotFound('phpunit.xml');
         }
 
-        $configuration = (new Loader())->load($arguments[self::CONFIGURATION_KEY])->phpunit();
+        $configuration = Registry::getInstance()
+            ->get($arguments[self::CONFIGURATION_KEY])
+            ->phpunit();
 
         if ($configuration->processIsolation()) {
             throw new AttributeNotSupportedYet('processIsolation', 'true');

src/Concerns/TestCase.php

@@ -5,11 +5,9 @@ declare(strict_types=1);
 namespace Pest\Concerns;
 
 use Closure;
-use Pest\Expectation;
 use Pest\Support\ExceptionTrace;
 use Pest\TestSuite;
 use PHPUnit\Util\Test;
-use Throwable;
 
 /**
  * To avoid inheritance conflicts, all the fields related
@@ -89,16 +87,6 @@ trait TestCase
         parent::tearDownAfterClass();
     }
 
-    /**
-     * Creates a new expectation.
-     *
-     * @param mixed $value
-     */
-    public function expect($value): Expectation
-    {
-        return new Expectation($value);
-    }
-
     /**
      * Gets executed before the test.
      */
@@ -144,7 +132,7 @@ trait TestCase
      *
      * @return mixed
      *
-     * @throws Throwable
+     * @throws \Throwable
      */
     public function __test()
     {
@@ -154,7 +142,7 @@ trait TestCase
     /**
      * @return mixed
      *
-     * @throws Throwable
+     * @throws \Throwable
      */
     private function __callClosure(Closure $closure, array $arguments)
     {

src/Expectation.php

@@ -1,457 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use PHPUnit\Framework\Assert;
-
-/**
- * @internal
- *
- * @property Expectation $not Creates the opposite expectation.
- */
-final class Expectation
-{
-    /**
-     * The expectation value.
-     *
-     * @readonly
-     *
-     * @var mixed
-     */
-    public $value;
-
-    /**
-     * Creates a new expectation.
-     *
-     * @param mixed $value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Creates a new expectation.
-     *
-     * @param mixed $value
-     */
-    public function and($value): Expectation
-    {
-        return new self($value);
-    }
-
-    /**
-     * Creates the opposite expectation for the value.
-     */
-    public function not(): OppositeExpectation
-    {
-        return new OppositeExpectation($this);
-    }
-
-    /**
-     * Asserts that two variables have the same type and
-     * value. Used on objects, it asserts that two
-     * variables reference the same object.
-     *
-     * @param mixed $expected
-     */
-    public function toBe($expected): Expectation
-    {
-        Assert::assertSame($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is empty.
-     */
-    public function toBeEmpty(): Expectation
-    {
-        Assert::assertEmpty($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is true.
-     */
-    public function toBeTrue(): Expectation
-    {
-        Assert::assertTrue($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is false.
-     */
-    public function toBeFalse(): Expectation
-    {
-        Assert::assertFalse($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is greater than $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeGreaterThan($expected): Expectation
-    {
-        Assert::assertGreaterThan($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is greater than or equal to $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeGreaterThanOrEqual($expected): Expectation
-    {
-        Assert::assertGreaterThanOrEqual($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is less than or equal to $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeLessThan($expected): Expectation
-    {
-        Assert::assertLessThan($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is less than $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeLessThanOrEqual($expected): Expectation
-    {
-        Assert::assertLessThanOrEqual($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that $needle is an element of the value.
-     *
-     * @param mixed $needle
-     */
-    public function toContain($needle): Expectation
-    {
-        if (is_string($this->value)) {
-            Assert::assertStringContainsString($needle, $this->value);
-        } else {
-            Assert::assertContains($needle, $this->value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that $count matches the number of elements of the value.
-     */
-    public function toHaveCount(int $count): Expectation
-    {
-        Assert::assertCount($count, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value contains the property $name.
-     */
-    public function toHaveProperty(string $name): Expectation
-    {
-        Assert::assertTrue(property_exists($this->value, $name));
-
-        return $this;
-    }
-
-    /**
-     * Asserts that two variables have the same value.
-     *
-     * @param mixed $expected
-     */
-    public function toEqual($expected): Expectation
-    {
-        Assert::assertEquals($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that two variables have the same value.
-     * The contents of $expected and the $this->value are
-     * canonicalized before they are compared. For instance, when the two
-     * variables $expected and $this->value are arrays, then these arrays
-     * are sorted before they are compared. When $expected and $this->value
-     * are objects, each object is converted to an array containing all
-     * private, protected and public attributes.
-     *
-     * @param mixed $expected
-     */
-    public function toEqualCanonicalizing($expected): Expectation
-    {
-        Assert::assertEqualsCanonicalizing($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the absolute difference between the value and $expected
-     * is lower than $delta.
-     *
-     * @param mixed $expected
-     */
-    public function toEqualWithDelta($expected, float $delta): Expectation
-    {
-        Assert::assertEqualsWithDelta($expected, $this->value, $delta);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is infinite.
-     */
-    public function toBeInfinite(): Expectation
-    {
-        Assert::assertInfinite($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is an instance of $class.
-     *
-     * @param string $class
-     */
-    public function toBeInstanceOf($class): Expectation
-    {
-        /* @phpstan-ignore-next-line */
-        Assert::assertInstanceOf($class, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is an array.
-     */
-    public function toBeArray(): Expectation
-    {
-        Assert::assertIsArray($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type bool.
-     */
-    public function toBeBool(): Expectation
-    {
-        Assert::assertIsBool($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type callable.
-     */
-    public function toBeCallable(): Expectation
-    {
-        Assert::assertIsCallable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type float.
-     */
-    public function toBeFloat(): Expectation
-    {
-        Assert::assertIsFloat($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type int.
-     */
-    public function toBeInt(): Expectation
-    {
-        Assert::assertIsInt($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type iterable.
-     */
-    public function toBeIterable(): Expectation
-    {
-        Assert::assertIsIterable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type numeric.
-     */
-    public function toBeNumeric(): Expectation
-    {
-        Assert::assertIsNumeric($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type object.
-     */
-    public function toBeObject(): Expectation
-    {
-        Assert::assertIsObject($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type resource.
-     */
-    public function toBeResource(): Expectation
-    {
-        Assert::assertIsResource($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type scalar.
-     */
-    public function toBeScalar(): Expectation
-    {
-        Assert::assertIsScalar($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type string.
-     */
-    public function toBeString(): Expectation
-    {
-        Assert::assertIsString($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is NAN.
-     */
-    public function toBeNan(): Expectation
-    {
-        Assert::assertNan($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is null.
-     */
-    public function toBeNull(): Expectation
-    {
-        Assert::assertNull($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value array has the provided $key.
-     */
-    public function toHaveKey(string $key): Expectation
-    {
-        Assert::assertArrayHasKey($key, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a directory.
-     */
-    public function toBeDirectory(): Expectation
-    {
-        Assert::assertDirectoryExists($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a directory and is readable.
-     */
-    public function toBeReadableDirectory(): Expectation
-    {
-        Assert::assertDirectoryIsReadable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a directory and is writable.
-     */
-    public function toBeWritableDirectory(): Expectation
-    {
-        Assert::assertDirectoryIsWritable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a file.
-     */
-    public function toBeFile(): Expectation
-    {
-        Assert::assertFileExists($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a file and is readable.
-     */
-    public function toBeReadableFile(): Expectation
-    {
-        Assert::assertFileIsReadable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a file and is writable.
-     */
-    public function toBeWritableFile(): Expectation
-    {
-        Assert::assertFileIsWritable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Dynamically calls methods on the class without any arguments.
-     *
-     * @return Expectation
-     */
-    public function __get(string $name)
-    {
-        /* @phpstan-ignore-next-line */
-        return $this->{$name}();
-    }
-}

src/Factories/TestCaseFactory.php

@@ -157,15 +157,8 @@ final class TestCaseFactory
     }
 
     /**
-     * Makes a fully qualified class name from the current filename.
+     * Makes a fully qualified class name
-     */
+     * from the given filename.
-    public function getClassName(): string
-    {
-        return $this->makeClassFromFilename($this->filename);
-    }
-
-    /**
-     * Makes a fully qualified class name from the given filename.
      */
     public function makeClassFromFilename(string $filename): string
     {

src/Laravel/Commands/PestDatasetCommand.php

@@ -61,8 +61,7 @@ final class PestDatasetCommand extends Command
         $element  = Str::singular($name);
         $contents = str_replace('{dataset_element}', $element, $contents);
         File::put($target, str_replace('{dataset_name}', $name, $contents));
-        $message = sprintf('`%s` created successfully.', $relativePath);
 
-        $this->output->success($message);
+        $this->output->success(sprintf('`%s` created successfully.', $relativePath));
     }
 }

src/Laravel/Commands/PestInstallCommand.php

@@ -6,7 +6,6 @@ namespace Pest\Laravel\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
-use Pest\Console\Thanks;
 use Pest\Exceptions\InvalidConsoleArgument;
 use Pest\Support\Str;
 
@@ -61,9 +60,7 @@ final class PestInstallCommand extends Command
         $this->output->success('`tests/Pest.php` created successfully.');
         $this->output->success('`tests/Helpers.php` created successfully.');
 
-        if (!(bool) $this->option('no-interaction')) {
+        (new \Pest\Console\Thanks($this->output))();
-            (new Thanks($this->output))();
-        }
     }
 
     /**

src/Laravel/Commands/PestTestCommand.php

@@ -64,8 +64,7 @@ final class PestTestCommand extends Command
         $name = Str::endsWith($name, 'test') ? mb_substr($name, 0, -4) : $name;
 
         File::put($target, str_replace('{name}', $name, $contents));
-        $message = sprintf('`%s` created successfully.', $relativePath);
 
-        $this->output->success($message);
+        $this->output->success(sprintf('`%s` created successfully.', $relativePath));
     }
 }

src/OppositeExpectation.php

@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use PHPUnit\Framework\ExpectationFailedException;
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * @internal
- *
- * @mixin Expectation
- */
-final class OppositeExpectation
-{
-    /**
-     * @var Expectation
-     */
-    private $original;
-
-    /**
-     * Creates a new opposite expectation.
-     */
-    public function __construct(Expectation $original)
-    {
-        $this->original = $original;
-    }
-
-    /**
-     * Handle dynamic method calls into the original expectation.
-     *
-     * @param array<int, mixed> $arguments
-     */
-    public function __call(string $name, array $arguments): Expectation
-    {
-        try {
-            /* @phpstan-ignore-next-line */
-            $this->original->{$name}(...$arguments);
-        } catch (ExpectationFailedException $e) {
-            return $this->original;
-        }
-
-        // @phpstan-ignore-next-line
-        $this->throwExpectationFailedExpection($name, $arguments);
-    }
-
-    /**
-     * Handle dynamic properties gets into the original expectation.
-     */
-    public function __get(string $name): Expectation
-    {
-        try {
-            /* @phpstan-ignore-next-line */
-            $this->original->{$name};
-        } catch (ExpectationFailedException $e) {
-            return $this->original;
-        }
-
-        // @phpstan-ignore-next-line
-        $this->throwExpectationFailedExpection($name);
-    }
-
-    /**
-     * Creates a new expectation failed exception
-     * with a nice readable message.
-     *
-     * @param array<int, mixed> $arguments
-     */
-    private function throwExpectationFailedExpection(string $name, array $arguments = []): void
-    {
-        $exporter = new Exporter();
-
-        $toString = function ($argument) use ($exporter): string {
-            return $exporter->shortenedExport($argument);
-        };
-
-        throw new ExpectationFailedException(sprintf('Expecting %s not %s %s.', $toString($this->original->value), strtolower((string) preg_replace('/(?<!\ )[A-Z]/', ' $0', $name)), implode(' ', array_map(function ($argument) use ($toString): string { return $toString($argument); }, $arguments))));
-    }
-}

src/PendingObjects/TestCall.php

@@ -9,12 +9,9 @@ use Pest\Factories\TestCaseFactory;
 use Pest\Support\Backtrace;
 use Pest\Support\NullClosure;
 use Pest\TestSuite;
-use PHPUnit\Framework\ExecutionOrderDependency;
 use SebastianBergmann\Exporter\Exporter;
 
 /**
- * @method \Pest\Expectation expect(mixed $value)
- *
  * @internal
  */
 final class TestCall
@@ -92,12 +89,6 @@ final class TestCall
      */
     public function depends(string ...$tests): TestCall
     {
-        $className = $this->testCaseFactory->getClassName();
-
-        $tests = array_map(function (string $test) use ($className): ExecutionOrderDependency {
-            return ExecutionOrderDependency::createFromDependsAnnotation($className, $test);
-        }, $tests);
-
         $this->testCaseFactory
             ->factoryProxies
             ->add(Backtrace::file(), Backtrace::line(), 'setDependencies', [$tests]);

src/Pest.php

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

src/Repositories/TestRepository.php

@@ -11,7 +11,6 @@ use Pest\Exceptions\TestCaseClassOrTraitNotFound;
 use Pest\Factories\TestCaseFactory;
 use Pest\Support\Str;
 use Pest\TestSuite;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
@@ -53,7 +52,7 @@ final class TestRepository
                 if ((!is_dir($path) && $filename === $path) || (is_dir($path) && $startsWith($filename, $path))) {
                     foreach ($classOrTraits as $class) {
                         if (class_exists($class)) {
-                            if ($testCase->class !== TestCase::class) {
+                            if ($testCase->class !== \PHPUnit\Framework\TestCase::class) {
                                 throw new TestCaseAlreadyInUse($testCase->class, $class, $filename);
                             }
                             $testCase->class = $class;

src/Support/Container.php

@@ -75,15 +75,14 @@ final class Container
             if ($constructor !== null) {
                 $params = array_map(
                     function (ReflectionParameter $param) use ($id) {
-                        $candidate = Reflection::getParameterClassName($param);
+                        $candidate = null;
 
-                        if ($candidate === null) {
+                        if ($param->getType() !== null && $param->getType()->isBuiltin()) {
-                            $type = $param->getType();
+                            $candidate = $param->getName();
-                            if ($type !== null && $type->isBuiltin()) {
+                        } elseif ($param->getClass() !== null) {
-                                $candidate = $param->getName();
+                            $candidate = $param->getClass()->getName();
-                            } else {
+                        } else {
-                                throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));
+                            throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));
-                            }
                         }
 
                         return $this->get($candidate);

src/Support/ExceptionTrace.php

@@ -20,7 +20,7 @@ final class ExceptionTrace
      *
      * @return mixed
      *
-     * @throws Throwable
+     * @throws \Throwable
      */
     public static function ensure(Closure $closure)
     {

src/Support/HigherOrderMessage.php

@@ -76,8 +76,8 @@ final class HigherOrderMessage
             Reflection::setPropertyValue($throwable, 'file', $this->filename);
             Reflection::setPropertyValue($throwable, 'line', $this->line);
 
-            if ($throwable->getMessage() === self::getUndefinedMethodMessage($target, $this->methodName)) {
+            if ($throwable->getMessage() === sprintf(self::UNDEFINED_METHOD, $this->methodName)) {
-                /** @var ReflectionClass $reflection */
+                /** @var \ReflectionClass $reflection */
                 $reflection = new ReflectionClass($target);
                 /* @phpstan-ignore-next-line */
                 $reflection = $reflection->getParentClass() ?: $reflection;
@@ -87,13 +87,4 @@ final class HigherOrderMessage
             throw $throwable;
         }
     }
-
-    private static function getUndefinedMethodMessage(object $target, string $methodName): string
-    {
-        if (\PHP_MAJOR_VERSION >= 8) {
-            return sprintf(sprintf(self::UNDEFINED_METHOD, sprintf('%s::%s()', get_class($target), $methodName)));
-        }
-
-        return sprintf(self::UNDEFINED_METHOD, $methodName);
-    }
 }

src/Support/HigherOrderTapProxy.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Pest\Support;
 
 use ReflectionClass;
-use Throwable;
 
 /**
  * @internal
@@ -52,12 +51,12 @@ final class HigherOrderTapProxy
         try {
             // @phpstan-ignore-next-line
             return $this->target->{$property};
-        } catch (Throwable $throwable) {
+        } catch (\Throwable $throwable) {
             Reflection::setPropertyValue($throwable, 'file', Backtrace::file());
             Reflection::setPropertyValue($throwable, 'line', Backtrace::line());
 
             if (Str::startsWith($message = $throwable->getMessage(), self::UNDEFINED_PROPERTY)) {
-                /** @var ReflectionClass $reflection */
+                /** @var \ReflectionClass $reflection */
                 $reflection = (new ReflectionClass($this->target))->getParentClass();
                 Reflection::setPropertyValue($throwable, 'message', sprintf('Undefined property %s::$%s', $reflection->getName(), $property));
             }

src/Support/Reflection.php

@@ -6,12 +6,9 @@ namespace Pest\Support;
 
 use Closure;
 use Pest\Exceptions\ShouldNotHappen;
-use Pest\TestSuite;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
-use ReflectionNamedType;
-use ReflectionParameter;
 use ReflectionProperty;
 
 /**
@@ -41,12 +38,6 @@ final class Reflection
                 return $object->__call($method, $args);
             }
 
-            if (is_callable($method)) {
-                return Closure::fromCallable($method)->bindTo(
-                    TestSuite::getInstance()->test
-                )(...$args);
-            }
-
             throw $exception;
         }
     }
@@ -126,32 +117,4 @@ final class Reflection
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($object, $value);
     }
-
-    /**
-     * Get the class name of the given parameter's type, if possible.
-     *
-     * @see https://github.com/laravel/framework/blob/v6.18.25/src/Illuminate/Support/Reflector.php
-     */
-    public static function getParameterClassName(ReflectionParameter $parameter): ?string
-    {
-        $type = $parameter->getType();
-
-        if (!$type instanceof ReflectionNamedType || $type->isBuiltin()) {
-            return null;
-        }
-
-        $name = $type->getName();
-
-        if (($class = $parameter->getDeclaringClass()) instanceof ReflectionClass) {
-            if ($name === 'self') {
-                return $class->getName();
-            }
-
-            if ($name === 'parent' && ($parent = $class->getParentClass()) instanceof ReflectionClass) {
-                return $parent->getName();
-            }
-        }
-
-        return $name;
-    }
 }

src/TestSuite.php

@@ -10,7 +10,6 @@ use Pest\Repositories\AfterEachRepository;
 use Pest\Repositories\BeforeAllRepository;
 use Pest\Repositories\BeforeEachRepository;
 use Pest\Repositories\TestRepository;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
@@ -20,7 +19,7 @@ final class TestSuite
     /**
      * Holds the current test case.
      *
-     * @var TestCase|null
+     * @var \PHPUnit\Framework\TestCase|null
      */
     public $test;
 

src/globals.php

@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Pest\Datasets;
-use Pest\Expectation;
 use Pest\PendingObjects\AfterEachCall;
 use Pest\PendingObjects\BeforeEachCall;
 use Pest\PendingObjects\TestCall;
@@ -44,8 +43,8 @@ function dataset(string $name, $dataset): void
 }
 
 /**
- * The uses function binds the given
+ * The uses function adds the binds the
- * arguments to test closures.
+ * given arguments to test closures.
  */
 function uses(string ...$classAndTraits): UsesCall
 {
@@ -105,15 +104,3 @@ function afterAll(Closure $closure = null): void
 {
     TestSuite::getInstance()->afterAll->set($closure);
 }
-
-/**
- * Creates a new expectation.
- *
- * @param mixed $value the Value
- *
- * @return Expectation
- */
-function expect($value)
-{
-    return test()->expect($value);
-}

tests/.snapshots/success.txt

@@ -2,191 +2,6 @@
    PASS  Tests\CustomTestCase\ExecutedTest
   ✓ that gets executed
 
-   PASS  Tests\Expect\not
-  ✓ not property calls
-
-   PASS  Tests\Expect\toBe
-  ✓ expect true → toBeTrue  → and false → toBeFalse 
-  ✓ strict comparisons
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeArray
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeBool
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeCallable
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeDirectory
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeEmpty
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeFalse
-  ✓ strict comparisons
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeFile
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeFloat
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeGreatherThan
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeGreatherThanOrEqual
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeInfinite
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeInstanceOf
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeInt
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeIterable
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeLessThan
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeLessThanOrEqual
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeNAN
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeNull
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeNumeric
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeObject
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeReadableDirectory
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeReadableFile
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeResource
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeScalar
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeString
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeTrue
-  ✓ strict comparisons
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeWritableDirectory
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toBeWritableFile
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toContain
-  ✓ passes strings
-  ✓ passes arrays
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toEqual
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toEqualCanonicalizing
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toEqualWithDelta
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toHaveCount
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toHaveKey
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Expect\toHaveProperty
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
    PASS  Tests\Features\AfterAll
   ✓ deletes file after all
 
@@ -234,6 +49,14 @@
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #3
   ✓ it creates unique test case names - count
 
+   PASS  Tests\Features\Depends
+  ✓ first
+  ✓ second
+  ✓ depends
+  ✓ depends with ...params
+  ✓ depends with defined arguments
+  ✓ depends run test only once
+
    PASS  Tests\Features\Exceptions
   ✓ it gives access the the underlying expectException
   ✓ it catch exceptions
@@ -244,7 +67,6 @@
   ✓ it throws error if property do not exist
   ✓ it allows to call underlying protected/private methods
   ✓ it throws error if method do not exist
-  ✓ it can forward unexpected calls to any global function
 
    PASS  Tests\Features\HigherOrderTests
   ✓ it proxies calls to object
@@ -261,8 +83,8 @@
   ✓ it has bar
 
    PASS  Tests\Features\PendingHigherOrderTests
-  ✓ get 'foo' → get 'bar' → expect true → toBeTrue 
+  ✓ get 'foo' → get 'bar' → assertTrue true
-  ✓ get 'foo' → expect true → toBeTrue 
+  ✓ get 'foo' → assertTrue true
 
    WARN  Tests\Features\Skip
   ✓ it do not skips
@@ -345,13 +167,5 @@
    WARN  Tests\Visual\Success
   - visual snapshot of test suite on success
 
-   PASS  Tests\Features\Depends
+  Tests:  6 skipped, 96 passed
-  ✓ first
+  Time:   3.43s
-  ✓ second
-  ✓ depends
-  ✓ depends with ...params
-  ✓ depends with defined arguments
-  ✓ depends run test only once
-
-  Tests:  6 skipped, 208 passed
-  

tests/Autoload.php

@@ -8,7 +8,7 @@ trait PluginTrait
 {
     public function assertPluginTraitGotRegistered(): void
     {
-        $this->assertTrue(true);
+        assertTrue(true);
     }
 }
 
@@ -16,14 +16,9 @@ trait SecondPluginTrait
 {
     public function assertSecondPluginTraitGotRegistered(): void
     {
-        $this->assertTrue(true);
+        assertTrue(true);
     }
 }
 
 Pest\Plugin::uses(PluginTrait::class);
 Pest\Plugin::uses(SecondPluginTrait::class);
-
-function _assertThat()
-{
-    expect(true)->toBeTrue();
-}

tests/Expect/not.php

@@ -1,10 +0,0 @@
-<?php
-
-test('not property calls', function () {
-    expect(true)
-        ->toBeTrue()
-        ->not()->toBeFalse()
-        ->not->toBeFalse
-        ->and(false)
-        ->toBeFalse();
-});

tests/Expect/toBe.php

@@ -1,20 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-expect(true)->toBeTrue()->and(false)->toBeFalse();
-
-test('strict comparisons', function () {
-    $nuno = new stdClass();
-    $dries = new stdClass();
-
-    expect($nuno)->toBe($nuno)->not->toBe($dries);
-});
-
-test('failures', function () {
-    expect(1)->toBe(2);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(1)->not->toBe(1);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeArray.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect([1, 2, 3])->toBeArray();
-    expect('1, 2, 3')->not->toBeArray();
-});
-
-test('failures', function () {
-    expect(null)->toBeArray();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(['a', 'b', 'c'])->not->toBeArray();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeBool.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(true)->toBeBool();
-    expect(0)->not->toBeBool();
-});
-
-test('failures', function () {
-    expect(null)->toBeBool();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(false)->not->toBeBool();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeCallable.php

@@ -1,18 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(function () {})->toBeCallable();
-    expect(null)->not->toBeCallable();
-});
-
-test('failures', function () {
-    $hello = 5;
-
-    expect($hello)->toBeCallable();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(function () { return 42; })->not->toBeCallable();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeDirectory.php

@@ -1,17 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    $temp = sys_get_temp_dir();
-
-    expect($temp)->toBeDirectory();
-});
-
-test('failures', function () {
-    expect('/random/path/whatever')->toBeDirectory();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect('.')->not->toBeDirectory();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeEmpty.php

@@ -1,18 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect([])->toBeEmpty();
-    expect(null)->toBeEmpty();
-});
-
-test('failures', function () {
-    expect([1, 2])->toBeEmpty();
-    expect(' ')->toBeEmpty();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect([])->not->toBeEmpty();
-    expect(null)->not->toBeEmpty();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeFalse.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('strict comparisons', function () {
-    expect(false)->toBeFalse();
-});
-
-test('failures', function () {
-    expect('')->toBeFalse();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(false)->not->toBe(false);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeFile.php

@@ -1,23 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-beforeEach(function () {
-    touch($this->tempFile = sys_get_temp_dir() . '/fake.file');
-});
-
-afterEach(function () {
-    unlink($this->tempFile);
-});
-
-test('pass', function () {
-    expect($this->tempFile)->toBeFile();
-});
-
-test('failures', function () {
-    expect('/random/path/whatever.file')->toBeFile();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect($this->tempFile)->not->toBeFile();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeFloat.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(1.0)->toBeFloat();
-    expect(1)->not->toBeFloat();
-});
-
-test('failures', function () {
-    expect(42)->toBeFloat();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(log(3))->not->toBeFloat();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeGreatherThan.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('passes', function () {
-    expect(42)->toBeGreaterThan(41);
-    expect(4)->toBeGreaterThan(3.9);
-});
-
-test('failures', function () {
-    expect(4)->toBeGreaterThan(4);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(5)->not->toBeGreaterThan(4);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeGreatherThanOrEqual.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('passes', function () {
-    expect(42)->toBeGreaterThanOrEqual(41);
-    expect(4)->toBeGreaterThanOrEqual(4);
-});
-
-test('failures', function () {
-    expect(4)->toBeGreaterThanOrEqual(4.1);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(5)->not->toBeGreaterThanOrEqual(5);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeInfinite.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(log(0))->toBeInfinite();
-    expect(log(1))->not->toBeInfinite();
-});
-
-test('failures', function () {
-    expect(asin(2))->toBeInfinite();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(INF)->not->toBeInfinite();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeInstanceOf.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(new Exception())->toBeInstanceOf(Exception::class);
-    expect(new Exception())->not->toBeInstanceOf(RuntimeException::class);
-});
-
-test('failures', function () {
-    expect(new Exception())->toBeInstanceOf(RuntimeException::class);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(new Exception())->not->toBeInstanceOf(Exception::class);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeInt.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(42)->toBeInt();
-    expect(42.0)->not->toBeInt();
-});
-
-test('failures', function () {
-    expect(42.0)->toBeInt();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(6 * 7)->not->toBeInt();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeIterable.php

@@ -1,23 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect([])->toBeIterable();
-    expect(null)->not->toBeIterable();
-});
-
-test('failures', function () {
-    expect(42)->toBeIterable();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    function gen(): iterable
-    {
-        yield 1;
-        yield 2;
-        yield 3;
-    }
-
-    expect(gen())->not->toBeIterable();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeLessThan.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('passes', function () {
-    expect(41)->toBeLessThan(42);
-    expect(4)->toBeLessThan(5);
-});
-
-test('failures', function () {
-    expect(4)->toBeLessThan(4);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(5)->not->toBeLessThan(6);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeLessThanOrEqual.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('passes', function () {
-    expect(41)->toBeLessThanOrEqual(42);
-    expect(4)->toBeLessThanOrEqual(4);
-});
-
-test('failures', function () {
-    expect(4)->toBeLessThanOrEqual(3.9);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(5)->not->toBeLessThanOrEqual(5);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeNAN.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(asin(2))->toBeNan();
-    expect(log(0))->not->toBeNan();
-});
-
-test('failures', function () {
-    expect(1)->toBeNan();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(acos(1.5))->not->toBeNan();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeNull.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(null)->toBeNull();
-    expect('')->not->toBeNull();
-});
-
-test('failures', function () {
-    expect('hello')->toBeNull();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(null)->not->toBeNull();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeNumeric.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(42)->toBeNumeric();
-    expect('A')->not->toBeNumeric();
-});
-
-test('failures', function () {
-    expect(null)->toBeNumeric();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(6 * 7)->not->toBeNumeric();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeObject.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect((object) ['a' => 1])->toBeObject();
-    expect(['a' => 1])->not->toBeObject();
-});
-
-test('failures', function () {
-    expect(null)->toBeObject();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect((object) 'ciao')->not->toBeObject();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeReadableDirectory.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(sys_get_temp_dir())->toBeReadableDirectory();
-});
-
-test('failures', function () {
-    expect('/random/path/whatever')->toBeReadableDirectory();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(sys_get_temp_dir())->not->toBeReadableDirectory();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeReadableFile.php

@@ -1,23 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-beforeEach(function () {
-    touch($this->tempFile = sys_get_temp_dir() . '/fake.file');
-});
-
-afterEach(function () {
-    unlink($this->tempFile);
-});
-
-test('pass', function () {
-    expect($this->tempFile)->toBeReadableFile();
-});
-
-test('failures', function () {
-    expect('/random/path/whatever.file')->toBeReadableFile();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect($this->tempFile)->not->toBeReadableFile();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeResource.php

@@ -1,22 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-$resource = tmpfile();
-
-afterAll(function () use ($resource) {
-    fclose($resource);
-});
-
-test('pass', function () use ($resource) {
-    expect($resource)->toBeResource();
-    expect(null)->not->toBeResource();
-});
-
-test('failures', function () {
-    expect(null)->toBeResource();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () use ($resource) {
-    expect($resource)->not->toBeResource();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeScalar.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(1.1)->toBeScalar();
-});
-
-test('failures', function () {
-    expect(null)->toBeScalar();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(42)->not->toBeScalar();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeString.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect('1.1')->toBeString();
-    expect(1.1)->not->toBeString();
-});
-
-test('failures', function () {
-    expect(null)->toBeString();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect('42')->not->toBeString();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeTrue.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('strict comparisons', function () {
-    expect(true)->toBeTrue();
-});
-
-test('failures', function () {
-    expect('')->toBeTrue();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(false)->not->toBe(false);
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeWritableDirectory.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(sys_get_temp_dir())->toBeWritableDirectory();
-});
-
-test('failures', function () {
-    expect('/random/path/whatever')->toBeWritableDirectory();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(sys_get_temp_dir())->not->toBeWritableDirectory();
-})->throws(ExpectationFailedException::class);

tests/Expect/toBeWritableFile.php

@@ -1,23 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-beforeEach(function () {
-    touch($this->tempFile = sys_get_temp_dir() . '/fake.file');
-});
-
-afterEach(function () {
-    unlink($this->tempFile);
-});
-
-test('pass', function () {
-    expect($this->tempFile)->toBeWritableFile();
-});
-
-test('failures', function () {
-    expect('/random/path/whatever.file')->toBeWritableFile();
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect($this->tempFile)->not->toBeWritableFile();
-})->throws(ExpectationFailedException::class);

tests/Expect/toContain.php

@@ -1,19 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('passes strings', function () {
-    expect([1, 2, 42])->toContain(42);
-});
-
-test('passes arrays', function () {
-    expect('Nuno')->toContain('Nu');
-});
-
-test('failures', function () {
-    expect([1, 2, 42])->toContain(3);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect([1, 2, 42])->not->toContain(42);
-})->throws(ExpectationFailedException::class);

tests/Expect/toEqual.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect('00123')->toEqual(123);
-});
-
-test('failures', function () {
-    expect(['a', 'b', 'c'])->toEqual(['a', 'b']);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect('042')->not->toEqual(42);
-})->throws(ExpectationFailedException::class);

tests/Expect/toEqualCanonicalizing.php

@@ -1,16 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect([1, 2, 3])->toEqualCanonicalizing([3, 1, 2]);
-    expect(['g', 'a', 'z'])->not->toEqualCanonicalizing(['a', 'z']);
-});
-
-test('failures', function () {
-    expect([3, 2, 1])->toEqualCanonicalizing([1, 2]);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(['a', 'b', 'c'])->not->toEqualCanonicalizing(['b', 'a', 'c']);
-})->throws(ExpectationFailedException::class);

tests/Expect/toEqualWithDelta.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect(1.0)->toEqualWithDelta(1.3, .4);
-});
-
-test('failures', function () {
-    expect(1.0)->toEqualWithDelta(1.5, .1);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect(1.0)->not->toEqualWithDelta(1.6, .7);
-})->throws(ExpectationFailedException::class);

tests/Expect/toHaveCount.php

@@ -1,15 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-test('pass', function () {
-    expect([1, 2, 3])->toHaveCount(3);
-});
-
-test('failures', function () {
-    expect([1, 2, 3])->toHaveCount(4);
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () {
-    expect([1, 2, 3])->not->toHaveCount(3);
-})->throws(ExpectationFailedException::class);

tests/Expect/toHaveKey.php

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

tests/Expect/toHaveProperty.php

@@ -1,18 +0,0 @@
-<?php
-
-use PHPUnit\Framework\ExpectationFailedException;
-
-$obj      = new stdClass();
-$obj->foo = 'bar';
-
-test('pass', function () use ($obj) {
-    expect($obj)->toHaveProperty('foo');
-});
-
-test('failures', function () use ($obj) {
-    expect($obj)->toHaveProperty('bar');
-})->throws(ExpectationFailedException::class);
-
-test('not failures', function () use ($obj) {
-    expect($obj)->not->toHaveProperty('foo');
-})->throws(ExpectationFailedException::class);

tests/Features/AfterAll.php

@@ -8,8 +8,8 @@ afterAll(function () use ($file) {
 
 test('deletes file after all', function () use ($file) {
     file_put_contents($file, 'foo');
-    $this->assertFileExists($file);
+    assertFileExists($file);
     register_shutdown_function(function () use ($file) {
-        $this->assertFileNotExists($file);
+        assertFileNotExists($file);
     });
 });

tests/Features/AfterEach.php

@@ -11,10 +11,10 @@ afterEach(function () use ($state) {
 });
 
 it('does not get executed before the test', function () {
-    expect($this->state)->not->toHaveProperty('bar');
+    assertFalse(property_exists($this->state, 'bar'));
 });
 
 it('gets executed after the test', function () {
-    expect($this->state)->toHaveProperty('bar');
+    assertTrue(property_exists($this->state, 'bar'));
-    expect($this->state->bar)->toBe(2);
+    assertEquals(2, $this->state->bar);
 });

tests/Features/BeforeAll.php

@@ -8,11 +8,11 @@ beforeAll(function () use ($foo) {
 });
 
 it('gets executed before tests', function () use ($foo) {
-    expect($foo->bar)->toBe(1);
+    assertEquals($foo->bar, 1);
 
     $foo->bar = 'changed';
 });
 
 it('do not get executed before each test', function () use ($foo) {
-    expect($foo->bar)->toBe('changed');
+    assertEquals($foo->bar, 'changed');
 });

tests/Features/BeforeEach.php

@@ -5,11 +5,11 @@ beforeEach(function () {
 });
 
 it('gets executed before each test', function () {
-    expect($this->bar)->toBe(2);
+    assertEquals($this->bar, 2);
 
     $this->bar = 'changed';
 });
 
 it('gets executed before each test once again', function () {
-    expect($this->bar)->toBe(2);
+    assertEquals($this->bar, 2);
 });

tests/Features/Datasets.php

@@ -23,13 +23,13 @@ it('sets closures', function () {
         yield [1];
     });
 
-    expect(iterator_to_array(Datasets::get('foo')()))->toBe([[1]]);
+    assertEquals([[1]], iterator_to_array(Datasets::get('foo')()));
 });
 
 it('sets arrays', function () {
     Datasets::set('bar', [[2]]);
 
-    expect(Datasets::get('bar'))->toBe([[2]]);
+    assertEquals([[2]], Datasets::get('bar'));
 });
 
 it('gets bound to test case object', function () {
@@ -37,7 +37,7 @@ it('gets bound to test case object', function () {
 })->with([['a'], ['b']]);
 
 test('it truncates the description', function () {
-    expect(true)->toBe(true);
+    assertTrue(true);
     // it gets tested by the integration test
 })->with([str_repeat('Fooo', 10000000)]);
 
@@ -48,51 +48,51 @@ $datasets = [[1], [2]];
 
 test('lazy datasets', function ($text) use ($state, $datasets) {
     $state->text .= $text;
-    expect(in_array([$text], $datasets))->toBe(true);
+    assertTrue(in_array([$text], $datasets));
 })->with($datasets);
 
 test('lazy datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('12');
+    assertEquals('12', $state->text);
 });
 
 $state->text = '';
 
 test('eager datasets', function ($text) use ($state, $datasets) {
     $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with(function () use ($datasets) {
     return $datasets;
 });
 
 test('eager datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('1212');
+    assertEquals('1212', $state->text);
 });
 
 test('lazy registered datasets', function ($text) use ($state, $datasets) {
     $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with('numbers.array');
 
 test('lazy registered datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('121212');
+    assertEquals('121212', $state->text);
 });
 
 test('eager registered datasets', function ($text) use ($state, $datasets) {
     $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with('numbers.closure');
 
 test('eager registered datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('12121212');
+    assertEquals('12121212', $state->text);
 });
 
 test('eager wrapped registered datasets', function ($text) use ($state, $datasets) {
     $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with('numbers.closure.wrapped');
 
 test('eager registered wrapped datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('1212121212');
+    assertEquals('1212121212', $state->text);
 });
 
 class Bar
@@ -105,13 +105,13 @@ $namedDatasets = [
 ];
 
 test('lazy named datasets', function ($text) use ($state, $datasets) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
 })->with($namedDatasets);
 
 $counter = 0;
 
 it('creates unique test case names', function (string $name, Plugin $plugin, bool $bool) use (&$counter) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
     $counter++;
 })->with([
     ['Name 1', new Plugin(), true],
@@ -123,5 +123,5 @@ it('creates unique test case names', function (string $name, Plugin $plugin, boo
 ]);
 
 it('creates unique test case names - count', function () use (&$counter) {
-    expect($counter)->toBe(6);
+    assertEquals(6, $counter);
 });

tests/Features/Depends.php

@@ -3,32 +3,38 @@
 $runCounter = 0;
 
 test('first', function () use (&$runCounter) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
     $runCounter++;
 
     return 'first';
 });
 
 test('second', function () use (&$runCounter) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
     $runCounter++;
 
     return 'second';
 });
 
 test('depends', function () {
-    expect(func_get_args())->toBe(['first', 'second']);
+    assertEquals(
+        ['first', 'second'],
+        func_get_args()
+    );
 })->depends('first', 'second');
 
 test('depends with ...params', function (string ...$params) {
-    expect(func_get_args())->toBe($params);
+    assertEquals(
+        ['first', 'second'],
+        $params
+    );
 })->depends('first', 'second');
 
 test('depends with defined arguments', function (string $first, string $second) {
-    expect($first)->toBe('first');
+    assertEquals('first', $first);
-    expect($second)->toBe('second');
+    assertEquals('second', $second);
 })->depends('first', 'second');
 
 test('depends run test only once', function () use (&$runCounter) {
-    expect($runCounter)->toBe(2);
+    assertEquals(2, $runCounter);
 })->depends('first', 'second');

tests/Features/Helpers.php

@@ -7,7 +7,7 @@ function addUser()
 
 it('can set/get properties on $this', function () {
     addUser();
-    expect($this->user)->toBe('nuno');
+    assertEquals('nuno', $this->user);
 });
 
 it('throws error if property do not exist', function () {
@@ -27,18 +27,17 @@ function mockUser()
     $mock = test()->createMock(User::class);
 
     $mock->method('getName')
-        ->willReturn('maduro');
+         ->willReturn('maduro');
 
     return $mock;
 }
 
 it('allows to call underlying protected/private methods', function () {
     $user = mockUser();
-    expect($user->getName())->toBe('maduro');
+
+    assertEquals('maduro', $user->getName());
 });
 
 it('throws error if method do not exist', function () {
     test()->name();
 })->throws(\ReflectionException::class, 'Call to undefined method PHPUnit\Framework\TestCase::name()');
-
-it('can forward unexpected calls to any global function')->_assertThat();

tests/Features/It.php

@@ -1,7 +1,7 @@
 <?php
 
 it('is a test', function () {
-    $this->assertArrayHasKey('key', ['key' => 'foo']);
+    assertArrayHasKey('key', ['key' => 'foo']);
 });
 
-it('is a higher order message test')->expect(true)->toBeTrue();
+it('is a higher order message test')->assertTrue(true);

tests/Features/Macro.php

@@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase;
 uses(Macroable::class);
 
 beforeEach()->macro('bar', function () {
-    expect($this)->toBeInstanceOf(TestCase::class);
+    assertInstanceOf(TestCase::class, $this);
 });
 
 it('can call chained macro method')->bar();

tests/Features/PendingHigherOrderTests.php

@@ -1,12 +1,11 @@
 <?php
 
-use Pest\PendingObjects\TestCall;
 use PHPUnit\Framework\TestCase;
 
 uses(Gettable::class);
 
 /**
- * @return TestCase|TestCall|Gettable
+ * @return TestCase|Gettable
  */
 function get(string $route)
 {
@@ -16,15 +15,15 @@ function get(string $route)
 trait Gettable
 {
     /**
-     * @return TestCase|TestCall|Gettable
+     * @return TestCase|Gettable
      */
     public function get(string $route)
     {
-        expect($route)->not->toBeEmpty();
+        assertNotEmpty($route);
 
         return $this;
     }
 }
 
-get('foo')->get('bar')->expect(true)->toBeTrue();
+get('foo')->get('bar')->assertTrue(true);
-get('foo')->expect(true)->toBeTrue();
+get('foo')->assertTrue(true);

tests/Features/Test.php

@@ -1,7 +1,7 @@
 <?php
 
 test('a test', function () {
-    $this->assertArrayHasKey('key', ['key' => 'foo']);
+    assertArrayHasKey('key', ['key' => 'foo']);
 });
 
-test('higher order message test')->expect(true)->toBeTrue();
+test('higher order message test')->assertTrue(true);

tests/Features/TestCycle.php

@@ -1,7 +1,5 @@
 <?php
 
-use function PHPUnit\Framework\assertFalse;
-
 $foo             = new stdClass();
 $foo->beforeAll  = false;
 $foo->beforeEach = false;

tests/PHPUnit/CustomTestCaseInSubFolders/SubFolder/SubFolder/CustomTestCaseInSubFolder.php

@@ -10,6 +10,6 @@ class CustomTestCaseInSubFolder extends TestCase
 {
     public function assertCustomInSubFolderTrue()
     {
-        $this->assertTrue(true);
+        assertTrue(true);
     }
 }

tests/PHPUnit/CustomTestCaseInSubFolders/SubFolder2/UsesPerFile.php

@@ -12,7 +12,7 @@ class MyCustomClass extends PHPUnit\Framework\TestCase
 {
     public function assertTrueIsTrue()
     {
-        $this->assertTrue(true);
+        assertTrue(true);
     }
 }
 

tests/Playground.php

@@ -1,5 +1,5 @@
 <?php
 
 test('basic', function () {
-    expect(true)->toBeTrue();
+    assertTrue(true);
 });

tests/Unit/Actions/AddsDefaults.php

@@ -7,14 +7,14 @@ use PHPUnit\TextUI\DefaultResultPrinter;
 it('sets defaults', function () {
     $arguments = AddsDefaults::to(['bar' => 'foo']);
 
-    expect($arguments['printer'])->toBeInstanceOf(Printer::class);
+    assertInstanceOf(Printer::class, $arguments['printer']);
-    expect($arguments['bar'])->toBe('foo');
+    assertEquals($arguments['bar'], 'foo');
 });
 
 it('does not override options', function () {
     $defaultResultPrinter = new DefaultResultPrinter();
 
-    expect(AddsDefaults::to(['printer' => $defaultResultPrinter]))->tobe([
+    assertEquals(AddsDefaults::to(['printer' => $defaultResultPrinter]), [
         'printer' => $defaultResultPrinter,
     ]);
 });

tests/Unit/Actions/AddsTests.php

@@ -16,10 +16,10 @@ test('default php unit tests', function () {
     $phpUnitTestCase = new class() extends PhpUnitTestCase {
     };
     $testSuite->addTest($phpUnitTestCase);
-    expect($testSuite->tests())->toHaveCount(1);
+    assertCount(1, $testSuite->tests());
 
     AddsTests::to($testSuite, new \Pest\TestSuite(getcwd()));
-    expect($testSuite->tests())->toHaveCount(1);
+    assertCount(1, $testSuite->tests());
 });
 
 it('removes warnings', function () use ($pestTestCase) {
@@ -28,5 +28,5 @@ it('removes warnings', function () use ($pestTestCase) {
     $testSuite->addTest($warningTestCase);
 
     AddsTests::to($testSuite, new \Pest\TestSuite(getcwd()));
-    expect($testSuite->tests())->toHaveCount(0);
+    assertCount(0, $testSuite->tests());
 });

tests/Unit/Actions/ValidatesConfiguration.php

@@ -38,5 +38,5 @@ it('do not throws exception when `process isolation` is false', function () {
         'configuration' => $filename,
     ]);
 
-    expect(true)->toBeTrue();
+    assertTrue(true);
 });

tests/Unit/Plugins/Version.php

@@ -1,7 +1,6 @@
 <?php
 
 use Pest\Plugins\Version;
-use function Pest\version;
 use Symfony\Component\Console\Output\BufferedOutput;
 
 it('outputs the version when --version is used', function () {
@@ -9,7 +8,7 @@ it('outputs the version when --version is used', function () {
     $plugin = new Version($output);
 
     $plugin->handleArguments(['foo', '--version']);
-    expect($output->fetch())->toContain('Pest    ' . version());
+    assertStringContainsString('Pest    0.2.2', $output->fetch());
 });
 
 it('do not outputs version when --version is not used', function () {
@@ -17,5 +16,5 @@ it('do not outputs version when --version is not used', function () {
     $plugin = new Version($output);
 
     $plugin->handleArguments(['foo', 'bar']);
-    expect($output->fetch())->toBe('');
+    assertEquals('', $output->fetch());
 });

tests/Unit/Support/Backtrace.php

@@ -7,5 +7,5 @@ it('gets file name from called file', function () {
         return Backtrace::file();
     };
 
-    expect($a())->toBe(__FILE__);
+    assertEquals(__FILE__, $a());
 });

tests/Unit/Support/Container.php

@@ -15,32 +15,32 @@ it('exists')
 
 it('gets an instance', function () {
     $this->container->add(Container::class, $this->container);
-    expect($this->container->get(Container::class))->toBe($this->container);
+    assertSame($this->container, $this->container->get(Container::class));
 });
 
 test('autowire', function () {
-    expect($this->container->get(Container::class))->toBeInstanceOf(Container::class);
+    assertInstanceOf(Container::class, $this->container->get(Container::class));
 });
 
 it('creates an instance and resolves parameters', function () {
     $this->container->add(Container::class, $this->container);
     $instance = $this->container->get(ClassWithDependency::class);
 
-    expect($instance)->toBeInstanceOf(ClassWithDependency::class);
+    assertInstanceOf(ClassWithDependency::class, $instance);
 });
 
 it('creates an instance and resolves also sub parameters', function () {
     $this->container->add(Container::class, $this->container);
     $instance = $this->container->get(ClassWithSubDependency::class);
 
-    expect($instance)->toBeInstanceOf(ClassWithSubDependency::class);
+    assertInstanceOf(ClassWithSubDependency::class, $instance);
 });
 
 it('can resolve builtin value types', function () {
     $this->container->add('rootPath', getcwd());
 
     $instance = $this->container->get(TestSuite::class);
-    expect($instance)->toBeInstanceOf(TestSuite::class);
+    assertInstanceOf(TestSuite::class, $instance);
 });
 
 it('cannot resolve a parameter without type', function () {

tests/Unit/Support/Reflection.php

@@ -3,10 +3,9 @@
 use Pest\Support\Reflection;
 
 it('gets file name from closure', function () {
-    $fileName = Reflection::getFileNameFromClosure(function () {
+    $fileName = Reflection::getFileNameFromClosure(function () {});
-    });
 
-    expect($fileName)->toBe(__FILE__);
+    assertEquals(__FILE__, $fileName);
 });
 
 it('gets property values', function () {
@@ -16,5 +15,5 @@ it('gets property values', function () {
 
     $value = Reflection::getPropertyValue($class, 'foo');
 
-    expect($value)->toBe('bar');
+    assertEquals('bar', $value);
 });

tests/Visual/SingleTestOrDirectory.php

@@ -10,7 +10,7 @@ $run = function (string $target, $decorated = false) {
     return $decorated ? $process->getOutput() : preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
 };
 
-$snapshot = function ($name) {
+$snapshot  = function ($name) {
     $testsPath = dirname(__DIR__);
 
     return file_get_contents(implode(DIRECTORY_SEPARATOR, [
@@ -21,15 +21,23 @@ $snapshot = function ($name) {
 };
 
 test('allows to run a single test', function () use ($run, $snapshot) {
-    expect($run('tests/Fixtures/DirectoryWithTests/ExampleTest.php'))->toContain($snapshot('allows-to-run-a-single-test'));
+    assertStringContainsString(
+        $snapshot('allows-to-run-a-single-test'),
+        $run('tests/Fixtures/DirectoryWithTests/ExampleTest.php'));
 })->skip(PHP_OS_FAMILY === 'Windows');
 
 test('allows to run a directory', function () use ($run, $snapshot) {
-    expect($run('tests/Fixtures'))->toContain($snapshot('allows-to-run-a-directory'));
+    assertStringContainsString(
+        $snapshot('allows-to-run-a-directory'),
+        $run('tests/Fixtures')
+    );
 })->skip(PHP_OS_FAMILY === 'Windows');
 
 it('has ascii chars', function () use ($run, $snapshot) {
-    expect($run('tests/Fixtures/DirectoryWithTests/ExampleTest.php', true))->toContain($snapshot('has-ascii-chars'));
+    assertStringContainsString(
+        $snapshot('has-ascii-chars'),
+        $run('tests/Fixtures/DirectoryWithTests/ExampleTest.php', true)
+    );
 })->skip(PHP_OS_FAMILY === 'Windows');
 
 it('disable decorating printer when colors is set to never', function () use ($snapshot) {
@@ -41,5 +49,9 @@ it('disable decorating printer when colors is set to never', function () use ($s
     ], dirname(__DIR__, 2));
     $process->run();
     $output = $process->getOutput();
-    expect($output)->toContain($snapshot('disable-decorating-printer'));
+
+    assertStringContainsString(
+        $snapshot('disable-decorating-printer'),
+        $output
+    );
 })->skip(PHP_OS_FAMILY === 'Windows');

tests/Visual/Success.php

@@ -17,16 +17,12 @@ test('visual snapshot of test suite on success', function () {
     };
 
     if (getenv('REBUILD_SNAPSHOTS')) {
-        // Strip time from end of snapshot
+        file_put_contents($snapshot, $output());
-        $outputContent = preg_replace('/Time\: \s+\d+\.\d+s\s+/m', '', $output());
-
-        file_put_contents($snapshot, $outputContent);
     } elseif (!getenv('EXCLUDE')) {
         $output = explode("\n", $output());
         array_pop($output);
         array_pop($output);
-
+        assertStringContainsString(implode("\n", $output), file_get_contents($snapshot));
-        expect(implode("\n", $output))->toContain(file_get_contents($snapshot));
     }
 })->skip(!getenv('REBUILD_SNAPSHOTS') && getenv('EXCLUDE'))
     ->skip(PHP_OS_FAMILY === 'Windows');