Merge pull request #4 from milroyfraser/pest-2

Upgrade to pest 2

Author: milroyfraser

.github/workflows/static.yml

@@ -3,49 +3,30 @@ 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
+  static:
+    name: Static Tests
 
-    - name: Install Dependencies
-      run: composer update --no-interaction --no-progress --ansi
-
-    - name: Run PHP-CS-Fixer
-      run: vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run --ansi
-
-  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: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          tools: composer:v2
+          coverage: none
 
-    - 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 --ansi
 
-    - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress --ansi
+      - name: Types
+        run: composer test:types
 
-    - name: Run PHPStan
-      run: vendor/bin/phpstan analyse --no-progress --ansi
+      - name: Style
+        run: composer test:lint

.github/workflows/tests.yml

@@ -7,30 +7,30 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ['7.3', '7.4', '8.0']
+        os: [ubuntu-latest] # (macos-latest, windows-latest) 2.x-dev is under development
+        php: ['8.1', '8.2']
         dependency-version: [prefer-lowest, prefer-stable]
+        parallel: ['', '--parallel']
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }} - ${{ matrix.parallel }}
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-        tools: composer:v2
-        coverage: none
-
-    - name: Setup Problem Matches
-      run: |
-        echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-        echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-    - name: Install PHP dependencies
-      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
-
-    - name: Unit Tests
-      run: ./vendor/bin/pest --colors=always
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Setup Problem Matches
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+      - name: Install PHP dependencies
+        run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
+
+      - name: Unit Tests
+        run: composer test:unit

composer.json

@@ -14,9 +14,9 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0",
-        "pestphp/pest": "^1.0",
-        "pestphp/pest-plugin": "^1.0"
+        "php": "^8.1",
+        "pestphp/pest": "^2.0.0",
+        "pestphp/pest-plugin": "^2.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -27,23 +27,21 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "dev-master"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
+        "pestphp/pest-dev-tools": "^2.0.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true,
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "scripts": {
-        "lint": "php-cs-fixer fix -v",
-        "test:lint": "php-cs-fixer fix -v --dry-run",
-        "test:types": "phpstan analyse --ansi --debug",
+        "lint": "pint",
+        "test:lint": "pint --test",
+        "test:types": "phpstan analyse --ansi",
         "test:unit": "pest --colors=always",
         "test": [
             "@test:lint",

phpstan.neon

@@ -13,4 +13,4 @@ parameters:
     reportUnmatchedIgnoredErrors: true
 
     ignoreErrors:
-        - "# with null as default value#"
+            - "#has parameter \\$exceptionMessage with null as default value.#"

phpunit.xml

@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         backupGlobals="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
+         cacheResult="false"
          colors="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+         displayDetailsOnIncompleteTests="true"
+         displayDetailsOnSkippedTests="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
 >
     <testsuites>
         <testsuite name="default">
             <directory suffix=".php">./tests</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="true">
+    <coverage>
         <include>
             <directory suffix=".php">./src</directory>
         </include>

src/BehaviorDescriptor.php

@@ -5,7 +5,7 @@
 namespace Pest\Gwt;
 
 use Closure;
-use Pest\PendingObjects\TestCall;
+use Pest\PendingCalls\TestCall;
 use Pest\Support\Backtrace;
 use Pest\TestSuite;
 
@@ -57,23 +57,23 @@ public function when(Closure $act)
     public function then(Closure $asserting)
     {
         $arranging = $this->arranging;
-        $acting    = $this->acting;
+        $acting = $this->acting;
 
         $filename = Backtrace::testFile();
 
         return new TestCall(TestSuite::getInstance(), $filename, $this->description, function () use ($arranging, $acting, $asserting) {
             $params = [];
 
-            if (!is_null($arranging)) {
+            if (! is_null($arranging)) {
                 $params = $arranging();
-                if (!is_array($params)) {
+                if (! is_array($params)) {
                     $params = [$params];
                 }
             }
 
             $params = $acting(...$params);
 
-            if (!is_array($params)) {
+            if (! is_array($params)) {
                 $params = [$params];
             }
 
@@ -86,6 +86,7 @@ public function then(Closure $asserting)
      */
     public function throws(string $exception, string $exceptionMessage = null)
     {
-        return $this->then(function () {})->throws($exception, $exceptionMessage);
+        return $this->then(function () {
+        })->throws($exception, $exceptionMessage);
     }
 }

tests/Example.php

@@ -4,9 +4,13 @@
 use function PHPUnit\Framework\assertEquals;
 
 scenario('given and when returning nothing')
-    ->given(function () {})
-    ->when(function () {})
-    ->then(function () { assertEquals(1, 1); });
+    ->given(function () {
+    })
+    ->when(function () {
+    })
+    ->then(function () {
+        assertEquals(1, 1);
+    });
 
 scenario('given and when returning non array values')
     ->given(function () {
@@ -51,15 +55,26 @@
     ->throws(Exception::class);
 
 scenario('not returning an array works')
-    ->given(function () { return 'this is not an array'; })
-    ->when(function (string $s) { return $s; })
-    ->then(function (string $s) { expect($s)->toBe('this is not an array'); });
+    ->given(function () {
+        return 'this is not an array';
+    })
+    ->when(function (string $s) {
+        return $s;
+    })
+    ->then(function (string $s) {
+        expect($s)->toBe('this is not an array');
+    });
 
 scenario('returning an arrayable class works')
     ->given(function () {
-        return new class() {
+        return new class()
+        {
             public $a;
         };
     })
-    ->when(function ($c) { return $c; })
-    ->then(function ($c) { expect((array) $c)->toBe(['a' => null]); });
+    ->when(function ($c) {
+        return $c;
+    })
+    ->then(function ($c) {
+        expect((array) $c)->toBe(['a' => null]);
+    });