Merge pull request #1279 from midnite81/bug/declare-strict-types-with-comments-above

Strict types expectation allows for comments above declaration

src/Expectation.php

@@ -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')),
         );

tests/Features/Expect/toUseStrictTypes.php

@@ -0,0 +1,18 @@
+<?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/ToUseStrictTypes/HasNoStrictType.php

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

tests/Fixtures/Arch/ToUseStrictTypes/HasStrictType.php

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

tests/Fixtures/Arch/ToUseStrictTypes/HasStrictTypeWithCommentsAbove.php

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