release: v3.2.5

Strict types expectation allows for comments above declaration

bin/pest

@@ -1,5 +1,7 @@
 #!/usr/bin/env php
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Pest\Kernel;
 use Pest\Panic;
@@ -37,7 +39,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--test-directory=')) {
             unset($arguments[$key]);
-        } else if ($value === '--test-directory') {
+        } elseif ($value === '--test-directory') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -62,7 +64,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--assignee=')) {
             unset($arguments[$key]);
-        } else if ($value === '--assignee') {
+        } elseif ($value === '--assignee') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -72,7 +74,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--issue=')) {
             unset($arguments[$key]);
-        } else if ($value === '--issue') {
+        } elseif ($value === '--issue') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -82,7 +84,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--ticket=')) {
             unset($arguments[$key]);
-        } else if ($value === '--ticket') {
+        } elseif ($value === '--ticket') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -92,7 +94,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--pr=')) {
             unset($arguments[$key]);
-        } else if ($value === '--pr') {
+        } elseif ($value === '--pr') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -102,7 +104,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--pull-request=')) {
             unset($arguments[$key]);
-        } else if ($value === '--pull-request') {
+        } elseif ($value === '--pull-request') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -117,7 +119,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
         }
     }
 
-
     // Used when Pest is required using composer.
     $vendorPath = dirname(__DIR__, 4).'/vendor/autoload.php';
 
@@ -134,7 +135,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
     // Get $rootPath based on $autoloadPath
     $rootPath = dirname($autoloadPath, 2);
-    $input = new ArgvInput();
+    $input = new ArgvInput;
 
     $testSuite = TestSuite::getInstance(
         $rootPath,
@@ -146,11 +147,11 @@ use Symfony\Component\Console\Output\ConsoleOutput;
     }
 
     if ($todo) {
-        $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter());
+        $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter);
     }
 
     if ($notes) {
-        $testSuite->tests->addTestCaseMethodFilter(new NotesTestCaseFilter());
+        $testSuite->tests->addTestCaseMethodFilter(new NotesTestCaseFilter);
     }
 
     if ($assignee = $input->getParameterOption('--assignee')) {

composer.json

@@ -53,7 +53,7 @@
     },
     "require-dev": {
         "pestphp/pest-dev-tools": "^3.0.0",
-        "pestphp/pest-plugin-type-coverage": "^3.0.0",
+        "pestphp/pest-plugin-type-coverage": "^3.0.1",
         "symfony/process": "^7.1.5"
     },
     "minimum-stability": "dev",

src/ArchPresets/Laravel.php

@@ -27,17 +27,20 @@ final class Laravel extends AbstractPreset
             ->ignoring('App\Enums');
 
         $this->expectations[] = expect('App\Enums')
-            ->toBeEnums();
+            ->toBeEnums()
+            ->ignoring('App\Enums\Concerns');
 
         $this->expectations[] = expect('App\Features')
-            ->toBeClasses();
+            ->toBeClasses()
+            ->ignoring('App\Features\Concerns');
 
         $this->expectations[] = expect('App\Features')
             ->toHaveMethod('resolve');
 
         $this->expectations[] = expect('App\Exceptions')
             ->classes()
-            ->toImplement('Throwable');
+            ->toImplement('Throwable')
+            ->ignoring('App\Exceptions\Handler');
 
         $this->expectations[] = expect('App')
             ->not->toImplement(Throwable::class)
@@ -149,7 +152,7 @@ final class Laravel extends AbstractPreset
             ->toOnlyBeUsedIn('App\Http');
 
         $this->expectations[] = expect('App\Http\Controllers')
-            ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy']);
+            ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy', 'middleware']);
 
         $this->expectations[] = expect([
             'dd',

src/Expectation.php

@@ -264,7 +264,7 @@ final class Expectation
         $matched = false;
 
         foreach ($expressions as $key => $callback) {
-            if ($subject != $key) {
+            if ($subject != $key) { // @pest-arch-ignore-line
                 continue;
             }
 
@@ -380,7 +380,7 @@ final class Expectation
         if (self::hasExtend($name)) {
             $extend = self::$extends[$name]->bindTo($this, Expectation::class);
 
-            if ($extend != false) {
+            if ($extend != false) { // @pest-arch-ignore-line
                 return $extend;
             }
         }
@@ -509,7 +509,7 @@ final class Expectation
     {
         return Targeted::make(
             $this,
-            fn (ObjectDescription $object): bool => (bool) preg_match('/^<\?php\s+declare\(.*?strict_types\s?=\s?1.*?\);/', (string) file_get_contents($object->path)),
+            fn (ObjectDescription $object): bool => (bool) preg_match('/^<\?php\s*(\/\*[\s\S]*?\*\/|\/\/[^\r\n]*(?:\r?\n|$)|\s)*declare\s*\(\s*strict_types\s*=\s*1\s*\)\s*;/m', (string) file_get_contents($object->path)),
             'to use strict types',
             FileLineFinder::where(fn (string $line): bool => str_contains($line, '<?php')),
         );
@@ -522,9 +522,9 @@ final class Expectation
     {
         return Targeted::make(
             $this,
-            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), ' == '), // @pest-arch-ignore-line
+            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), ' == ') && ! str_contains((string) file_get_contents($object->path), ' != '),
             'to use strict equality',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, ' == ')),
+            FileLineFinder::where(fn (string $line): bool => str_contains($line, ' == ') || str_contains($line, ' != ')),
         );
     }
 

src/Expectations/OppositeExpectation.php

@@ -159,9 +159,9 @@ final readonly class OppositeExpectation
     {
         return Targeted::make(
             $this->original,
-            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), ' === '),
+            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), ' === ') && ! str_contains((string) file_get_contents($object->path), ' !== '),
             'to use strict equality',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, ' === ')),
+            FileLineFinder::where(fn (string $line): bool => str_contains($line, ' === ') || str_contains($line, ' !== ')),
         );
     }
 

src/Logging/Converter.php

@@ -150,7 +150,7 @@ final readonly class Converter
     {
         if ($testSuite instanceof TestSuiteForTestMethodWithDataProvider) {
             $firstTest = $this->getFirstTest($testSuite);
-            if ($firstTest != null) {
+            if ($firstTest instanceof \PHPUnit\Event\Code\TestMethod) {
                 return $this->getTestMethodNameWithoutDatasetSuffix($firstTest);
             }
         }

src/PendingCalls/TestCall.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Pest\PendingCalls;
 
 use Closure;
+use Pest\Concerns\Testable;
 use Pest\Exceptions\InvalidArgumentException;
 use Pest\Exceptions\TestDescriptionMissing;
 use Pest\Factories\Attribute;
@@ -25,9 +26,9 @@ use PHPUnit\Framework\TestCase;
 /**
  * @internal
  *
- * @mixin HigherOrderCallables|TestCase
+ * @mixin HigherOrderCallables|TestCase|Testable
  */
-final class TestCall
+final class TestCall // @phpstan-ignore-line
 {
     use Describable;
 

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '3.2.0';
+    return '3.2.5';
 }
 
 function testDirectory(string $file = ''): string

src/Support/Closure.php

@@ -26,7 +26,7 @@ final class Closure
 
         $closure = BaseClosure::bind($closure, $newThis, $newScope);
 
-        if ($closure === null) {
+        if (! $closure instanceof \Closure) {
             throw ShouldNotHappen::fromMessage('Could not bind closure.');
         }
 

tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 3.2.0.  
+  Pest Testing Framework 3.2.5.  
 
   USAGE: pest <file> [options]  
 

tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 3.2.0.  
+  Pest Testing Framework 3.2.5.  
 

tests/.snapshots/success.txt

@@ -974,6 +974,10 @@
   ✓ opposite missing strict equality
   ✓ opposite has strict equality
 
+   PASS  Tests\Features\Expect\toUseStrictTypes
+  ✓ pass
+  ✓ failures
+
    PASS  Tests\Features\Expect\toUseTrait
   ✓ pass
   ✓ failures
@@ -1580,4 +1584,4 @@
    WARN  Tests\Visual\Version
   - visual snapshot of help command output
 
-  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 17 todos, 28 skipped, 1093 passed (2644 assertions)
+  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 17 todos, 28 skipped, 1095 passed (2648 assertions)

tests/Features/Expect/toUseStrictTypes.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use Pest\Arch\Exceptions\ArchExpectationFailedException;
+use Tests\Fixtures\Arch\ToUseStrictTypes\HasNoStrictType;
+use Tests\Fixtures\Arch\ToUseStrictTypes\HasStrictType;
+use Tests\Fixtures\Arch\ToUseStrictTypes\HasStrictTypeWithCommentsAbove;
+
+test('pass', function () {
+    expect(HasStrictType::class)->toUseStrictTypes()
+        ->and(HasStrictTypeWithCommentsAbove::class)->toUseStrictTypes();
+});
+
+test('failures', function () {
+    expect(HasNoStrictType::class)->toUseStrictTypes();
+})->throws(ArchExpectationFailedException::class);

tests/Fixtures/Arch/ToUseStrictEquality/NotStrictEquality.php

@@ -14,5 +14,9 @@ class NotStrictEquality
         if ($a == $b) {
             echo 'Equal';
         }
+
+        if ($a != $b) {
+            echo 'Equal';
+        }
     }
 }

tests/Fixtures/Arch/ToUseStrictEquality/StrictEquality.php

@@ -14,5 +14,9 @@ class StrictEquality
         if ($a === $b) {
             echo 'Equal';
         }
+
+        if ($a !== $b) {
+            echo 'Equal';
+        }
     }
 }

tests/Fixtures/Arch/ToUseStrictTypes/HasNoStrictType.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Tests\Fixtures\Arch\ToUseStrictTypes;
+
+class HasNoStrictType {}

tests/Fixtures/Arch/ToUseStrictTypes/HasStrictType.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToUseStrictTypes;
+
+class HasStrictType {}

tests/Fixtures/Arch/ToUseStrictTypes/HasStrictTypeWithCommentsAbove.php

@@ -0,0 +1,11 @@
+<?php
+
+/** @noinspection PhpUnused */
+
+// some other comment
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToUseStrictTypes;
+
+class HasStrictTypeWithCommentsAbove {}

tests/Visual/Parallel.php

@@ -16,7 +16,7 @@ $run = function () {
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 17 todos, 19 skipped, 1083 passed (2620 assertions)')
+        ->toContain('Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 17 todos, 19 skipped, 1085 passed (2624 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();