chore: bump static tests to PHP8.0

fix: allow multiple file extensions in test suffix (prevent class & file name syntax errors)

.github/workflows/static.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.0
         tools: composer:v2
         coverage: none
 
@@ -40,7 +40,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.0
         tools: composer:v2
         coverage: none
 

CHANGELOG.md

@@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v1.0.0 (2021-01-18)](https://github.com/pestphp/pest/compare/v1.0.0...v1.0.1)
+## [v1.0.3 (2021-03-13)](https://github.com/pestphp/pest/compare/v1.0.2...v1.0.3)
+### Added
+- Support for test extensions ([#269](https://github.com/pestphp/pest/pull/269))
+
+## [v1.0.2 (2021-02-04)](https://github.com/pestphp/pest/compare/v1.0.1...v1.0.2)
+### Added
+- Support for PHPUnit 9.5.2 ([#267](https://github.com/pestphp/pest/pull/267))
+
+## [v1.0.1 (2021-01-18)](https://github.com/pestphp/pest/compare/v1.0.0...v1.0.1)
 ### Added
 - Support for PHPUnit 9.5.1 ([#261](https://github.com/pestphp/pest/pull/261))
 

composer.json

@@ -23,7 +23,7 @@
         "pestphp/pest-plugin-coverage": "^1.0",
         "pestphp/pest-plugin-expectations": "^1.0",
         "pestphp/pest-plugin-init": "^1.0",
-        "phpunit/phpunit": ">= 9.3.7 <= 9.5.1"
+        "phpunit/phpunit": ">= 9.3.7 <= 9.5.2"
     },
     "autoload": {
         "psr-4": {
@@ -43,10 +43,10 @@
         ]
     },
     "require-dev": {
-        "illuminate/console": "^8.0",
-        "illuminate/support": "^8.0",
-        "laravel/dusk": "^6.9.1",
-        "mockery/mockery": "^1.4.1",
+        "illuminate/console": "^8.32.1",
+        "illuminate/support": "^8.32.1",
+        "laravel/dusk": "^6.13.0",
+        "mockery/mockery": "^1.4.3",
         "pestphp/pest-dev-tools": "dev-master"
     },
     "minimum-stability": "dev",

phpstan.neon

@@ -14,7 +14,6 @@ parameters:
 
     ignoreErrors:
         - "#type mixed is not subtype of native#"
-        - "#Undefined variable: \\$this#"
         - "#is not allowed to extend#"
         - "#Language construct eval#"
         - "# with null as default value#"

src/Factories/TestCaseFactory.php

@@ -5,14 +5,17 @@ declare(strict_types=1);
 namespace Pest\Factories;
 
 use Closure;
+use ParseError;
 use Pest\Concerns;
 use Pest\Contracts\HasPrintableTestCaseName;
 use Pest\Datasets;
 use Pest\Exceptions\ShouldNotHappen;
 use Pest\Support\HigherOrderMessageCollection;
 use Pest\Support\NullClosure;
+use Pest\Support\Str;
 use Pest\TestSuite;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 
 /**
  * @internal
@@ -139,6 +142,7 @@ final class TestCaseFactory
             $proxies->proxy($this);
             $chains->chain($this);
 
+            /* @phpstan-ignore-next-line */
             return call_user_func(Closure::bind($factoryTest, $this, get_class($this)), ...func_get_args());
         };
 
@@ -168,7 +172,7 @@ final class TestCaseFactory
             }, $filename);
         }
 
-        $filename     = (string) realpath($filename);
+        $filename     = str_replace('\\\\', '\\', addslashes((string) realpath($filename)));
         $rootPath     = TestSuite::getInstance()->rootPath;
         $relativePath = str_replace($rootPath . DIRECTORY_SEPARATOR, '', $filename);
         $relativePath = dirname(ucfirst($relativePath)) . DIRECTORY_SEPARATOR . basename($relativePath, '.php');
@@ -176,8 +180,12 @@ final class TestCaseFactory
 
         // Strip out any %-encoded octets.
         $relativePath = (string) preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $relativePath);
+        // Remove escaped quote sequences (maintain namespace)
+        $relativePath = str_replace(array_map(function (string $quote): string {
+            return sprintf('\\%s', $quote);
+        }, ['\'', '"']), '', $relativePath);
         // Limit to A-Z, a-z, 0-9, '_', '-'.
-        $relativePath = (string) preg_replace('/[^A-Za-z0-9.\\\]/', '', $relativePath);
+        $relativePath = (string) preg_replace('/[^A-Za-z0-9\\\\]/', '', $relativePath);
 
         $classFQN = 'P\\' . $relativePath;
         if (class_exists($classFQN)) {
@@ -194,6 +202,12 @@ final class TestCaseFactory
         $namespace = implode('\\', $partsFQN);
         $baseClass = sprintf('\%s', $this->class);
 
+        if ('' === trim($className)) {
+            $className = 'InvalidTestName' . Str::random();
+            $classFQN .= $className;
+        }
+
+        try {
             eval("
                 namespace $namespace;
 
@@ -203,6 +217,9 @@ final class TestCaseFactory
                     private static \$__filename = '$filename';
                 }
             ");
+        } catch (ParseError $caught) {
+            throw new RuntimeException(sprintf('Unable to create test case for test file at %s', $filename), 1, $caught);
+        }
 
         return $classFQN;
     }

src/Pest.php

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

src/Support/ChainableClosure.php

@@ -17,7 +17,9 @@ final class ChainableClosure
     public static function from(Closure $closure, Closure $next): Closure
     {
         return function () use ($closure, $next): void {
+            /* @phpstan-ignore-next-line */
             call_user_func_array(Closure::bind($closure, $this, get_class($this)), func_get_args());
+            /* @phpstan-ignore-next-line */
             call_user_func_array(Closure::bind($next, $this, get_class($this)), func_get_args());
         };
     }

src/Support/Container.php

@@ -79,6 +79,7 @@ final class Container
 
                         if ($candidate === null) {
                             $type = $param->getType();
+                            /* @phpstan-ignore-next-line */
                             if ($type !== null && $type->isBuiltin()) {
                                 $candidate = $param->getName();
                             } else {

src/Support/Str.php

@@ -9,6 +9,25 @@ namespace Pest\Support;
  */
 final class Str
 {
+    /**
+     * Pool of alpha-numeric characters for generating (unsafe) random strings
+     * from.
+     */
+    private const POOL = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+    /**
+     * Create a (unsecure & non-cryptographically safe) random alpha-numeric
+     * string value.
+     *
+     * @param int $length the length of the resulting randomized string
+     *
+     * @see https://github.com/laravel/framework/blob/4.2/src/Illuminate/Support/Str.php#L240-L242
+     */
+    public static function random(int $length = 16): string
+    {
+        return substr(str_shuffle(str_repeat(self::POOL, 5)), 0, $length);
+    }
+
     /**
      * Checks if the given `$target` starts with the given `$search`.
      */

tests/.snapshots/success.txt

@@ -103,6 +103,27 @@
    PASS  Tests\Fixtures\ExampleTest
   ✓ it example 2
 
+   PASS  Tests\PHPUnit\CustomAffixes\InvalidTestName
+  ✓ it runs file names like `@#$%^&()-_=+.php`
+
+   PASS  Tests\PHPUnit\CustomAffixes\ATestWithSpaces
+  ✓ it runs file names like `A Test With Spaces.php`
+
+   PASS  Tests\PHPUnit\CustomAffixes\AdditionalFileExtensionspec
+  ✓ it runs file names like `AdditionalFileExtension.spec.php`
+
+   PASS  Tests\PHPUnit\CustomAffixes\ManyExtensionsclasstest
+  ✓ it runs file names like `ManyExtensions.class.test.php`
+
+   PASS  Tests\PHPUnit\CustomAffixes\TestCaseWithQuotes
+  ✓ it runs file names like `Test 'Case' With Quotes.php`
+
+   PASS  Tests\PHPUnit\CustomAffixes\kebabcasespec
+  ✓ it runs file names like `kebab-case-spec.php`
+
+   PASS  Tests\PHPUnit\CustomAffixes\snakecasespec
+  ✓ it runs file names like `snake_case_spec.php`
+
    PASS  Tests\PHPUnit\CustomTestCase\UsesPerDirectory
   ✓ closure was bound to CustomTestCase
 
@@ -188,5 +209,5 @@
   ✓ it is a test
   ✓ it uses correct parent class
 
-  Tests:  7 skipped, 108 passed
+  Tests:  7 skipped, 115 passed
   

tests/PHPUnit/CustomAffixes/@#$%^&()-_=+.php

@@ -0,0 +1,10 @@
+<?php
+
+/*
+ * NOTE: To preserve cross-platform testing compatibility we cannot use ! * and
+ * other Windows reserved characters in this test's filename.
+ *
+ * See https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions
+ */
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/PHPUnit/CustomAffixes/A Test With Spaces.php

@@ -0,0 +1,3 @@
+<?php
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/PHPUnit/CustomAffixes/AdditionalFileExtension.spec.php

@@ -0,0 +1,3 @@
+<?php
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/PHPUnit/CustomAffixes/ManyExtensions.class.test.php

@@ -0,0 +1,3 @@
+<?php
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/PHPUnit/CustomAffixes/Test 'Case' With Quotes.php

@@ -0,0 +1,3 @@
+<?php
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/PHPUnit/CustomAffixes/kebab-case-spec.php

@@ -0,0 +1,3 @@
+<?php
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/PHPUnit/CustomAffixes/snake_case_spec.php

@@ -0,0 +1,3 @@
+<?php
+
+it(sprintf('runs file names like `%s`', basename(__FILE__)))->assertTrue(true);

tests/Visual/Success.php

@@ -13,7 +13,13 @@ test('visual snapshot of test suite on success', function () {
 
         $process->run();
 
-        return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+        return preg_replace([
+            '#\\x1b[[][^A-Za-z]*[A-Za-z]#',
+            '/(Tests\\\PHPUnit\\\CustomAffixes\\\InvalidTestName)([A-Za-z0-9]*)/',
+        ], [
+            '',
+            '$1',
+        ], $process->getOutput());
     };
 
     if (getenv('REBUILD_SNAPSHOTS')) {