fix: missing != and !== on new toUseStrictEquality arch expecta…

…tion
pestphp · Sep 23, 2024 · 432ff22 · 432ff22
1 parent a55da85
commit 432ff22
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/src/Expectation.php b/src/Expectation.php
@@ -380,7 +380,7 @@ private function getExpectationClosure(string $name): Closure
         if (self::hasExtend($name)) {
             $extend = self::$extends[$name]->bindTo($this, Expectation::class);
 
-            if ($extend != false) {
+            if ($extend != false) { // @pest-arch-ignore-line
                 return $extend;
             }
         }
@@ -522,9 +522,9 @@ public function toUseStrictEquality(): ArchExpectation
     {
         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, ' != ')),
         );
     }
 

diff --git a/src/Expectations/OppositeExpectation.php b/src/Expectations/OppositeExpectation.php
@@ -159,9 +159,9 @@ public function toUseStrictEquality(): ArchExpectation
     {
         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, ' !== ')),
         );
     }
 

diff --git a/src/Logging/Converter.php b/src/Logging/Converter.php
@@ -150,7 +150,7 @@ public function getTestSuiteName(TestSuite $testSuite): string
     {
         if ($testSuite instanceof TestSuiteForTestMethodWithDataProvider) {
             $firstTest = $this->getFirstTest($testSuite);
-            if ($firstTest != null) {
+            if ($firstTest instanceof \PHPUnit\Event\Code\TestMethod) {
                 return $this->getTestMethodNameWithoutDatasetSuffix($firstTest);
             }
         }

diff --git a/src/Support/Closure.php b/src/Support/Closure.php
@@ -26,7 +26,7 @@ public static function bind(?BaseClosure $closure, ?object $newThis, object|stri
 
         $closure = BaseClosure::bind($closure, $newThis, $newScope);
 
-        if ($closure === null) {
+        if (! $closure instanceof \Closure) {
             throw ShouldNotHappen::fromMessage('Could not bind closure.');
         }
 

diff --git a/tests/Fixtures/Arch/ToUseStrictEquality/NotStrictEquality.php b/tests/Fixtures/Arch/ToUseStrictEquality/NotStrictEquality.php
@@ -14,5 +14,9 @@ public function test(): void
         if ($a == $b) {
             echo 'Equal';
         }
+
+        if ($a != $b) {
+            echo 'Equal';
+        }
     }
 }
diff --git a/tests/Fixtures/Arch/ToUseStrictEquality/StrictEquality.php b/tests/Fixtures/Arch/ToUseStrictEquality/StrictEquality.php
@@ -14,5 +14,9 @@ public function test(): void
         if ($a === $b) {
             echo 'Equal';
         }
+
+        if ($a !== $b) {
+            echo 'Equal';
+        }
     }
 }