Working on phpstan issues in test scripts

3 files changed, 20 insertions, 11 deletions

diff --git a/tests/app/Services/GedcomEditServiceTest.php b/tests/app/Services/GedcomEditServiceTest.php
index 979d1d7fa6..cc23fb4061 100644
--- a/tests/app/Services/GedcomEditServiceTest.php
+++ b/tests/app/Services/GedcomEditServiceTest.php
@@ -19,6 +19,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Services;
 
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Http\RequestHandlers\FixLevel0MediaDataTest;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -33,7 +35,7 @@ class GedcomEditServiceTest extends TestCase
     {
         $gedcom_edit_service = new GedcomEditService();
 
-        static::assertSame(
+        self::assertSame(
             '1 BIRT Y',
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -44,7 +46,7 @@ class GedcomEditServiceTest extends TestCase
             )
         );
 
-        static::assertSame(
+        self::assertSame(
             "\n1 BIRT Y\n2 ADDR England",
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -54,7 +56,7 @@ class GedcomEditServiceTest extends TestCase
             )
         );
 
-        static::assertSame(
+        self::assertSame(
             "\n1 BIRT\n2 PLAC England",
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -64,7 +66,7 @@ class GedcomEditServiceTest extends TestCase
             )
         );
 
-        static::assertSame(
+        self::assertSame(
             "\n1 BIRT\n2 PLAC England\n2 SOUR @S1@\n3 PAGE 123",
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -75,7 +77,7 @@ class GedcomEditServiceTest extends TestCase
         );
 
         // Missing SOUR, so ignore PAGE
-        static::assertSame(
+        self::assertSame(
             "\n1 BIRT\n2 PLAC England",
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -85,7 +87,7 @@ class GedcomEditServiceTest extends TestCase
             )
         );
 
-        static::assertSame(
+        self::assertSame(
             "\n1 BIRT\n2 PLAC England",
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -95,7 +97,7 @@ class GedcomEditServiceTest extends TestCase
             )
         );
 
-        static::assertSame(
+        self::assertSame(
             "\n1 BIRT\n2 PLAC England\n1 DEAT\n2 PLAC Scotland",
             $gedcom_edit_service->editLinesToGedcom(
                 'INDI',
@@ -122,6 +124,7 @@ class GedcomEditServiceTest extends TestCase
         self::assertSameSize($expected_new_facts, $new_facts);
         for ($i = 0; $i < count($expected_new_facts); $i++) {
             $new_fact = $new_facts->get($i);
+            self::assertInstanceOf(Fact::class, $new_fact);
             self::assertSame($expected_new_facts[$i], $new_fact->tag());
         }
     }
@@ -146,6 +149,7 @@ class GedcomEditServiceTest extends TestCase
         self::assertSameSize($expected_new_facts, $new_facts);
         for ($i = 0; $i < count($expected_new_facts); $i++) {
             $new_fact = $new_facts->get($i);
+            self::assertInstanceOf(Fact::class, $new_fact);
             self::assertSame($expected_new_facts[$i], $new_fact->tag());
         }
     }
diff --git a/tests/app/Services/RateLimitServiceTest.php b/tests/app/Services/RateLimitServiceTest.php
index ee73cf78e6..275f70a016 100644
--- a/tests/app/Services/RateLimitServiceTest.php
+++ b/tests/app/Services/RateLimitServiceTest.php
@@ -52,15 +52,15 @@ class RateLimitServiceTest extends TestCase
 
         $rate_limit_service->limitRateForUser($user, 3, 30, 'rate-limit');
         $history = $user->getPreference('rate-limit');
-        static::assertCount(1, explode(',', $history));
+        self::assertCount(1, explode(',', $history));
 
         $rate_limit_service->limitRateForUser($user, 3, 30, 'rate-limit');
         $history = $user->getPreference('rate-limit');
-        static::assertCount(2, explode(',', $history));
+        self::assertCount(2, explode(',', $history));
 
         $rate_limit_service->limitRateForUser($user, 3, 30, 'rate-limit');
         $history = $user->getPreference('rate-limit');
-        static::assertCount(3, explode(',', $history));
+        self::assertCount(3, explode(',', $history));
     }
 
     public function testOldEventsIgnored(): void
@@ -74,7 +74,7 @@ class RateLimitServiceTest extends TestCase
 
         $rate_limit_service->limitRateForUser($user, 5, 30, 'rate-limit');
         $history = $user->getPreference('rate-limit');
-        static::assertCount(6, explode(',', $history));
+        self::assertCount(6, explode(',', $history));
     }
 
     public function testLimitReached(): void
diff --git a/tests/app/Services/UserServiceTest.php b/tests/app/Services/UserServiceTest.php
index 7b4b44547a..5fe7b3a30c 100644
--- a/tests/app/Services/UserServiceTest.php
+++ b/tests/app/Services/UserServiceTest.php
@@ -74,6 +74,7 @@ class UserServiceTest extends TestCase
         $user_service = new UserService();
         $user1        = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user2        = $user_service->find($user1->id());
+        self::assertInstanceOf(UserInterface::class, $user2);
 
         self::assertSame($user1->id(), $user2->id());
     }
@@ -83,6 +84,7 @@ class UserServiceTest extends TestCase
         $user_service = new UserService();
         $user1        = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user2        = $user_service->findByEmail($user1->email());
+        self::assertInstanceOf(UserInterface::class, $user2);
 
         self::assertSame($user1->id(), $user2->id());
     }
@@ -92,6 +94,7 @@ class UserServiceTest extends TestCase
         $user_service = new UserService();
         $user1        = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user2        = $user_service->findByUserName($user1->userName());
+        self::assertInstanceOf(UserInterface::class, $user2);
 
         self::assertSame($user1->id(), $user2->id());
     }
@@ -102,6 +105,8 @@ class UserServiceTest extends TestCase
         $user1        = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user2        = $user_service->findByIdentifier($user1->userName());
         $user3        = $user_service->findByIdentifier($user1->email());
+        self::assertInstanceOf(UserInterface::class, $user2);
+        self::assertInstanceOf(UserInterface::class, $user3);
 
         self::assertSame($user1->id(), $user2->id());
         self::assertSame($user1->id(), $user3->id());