Cleanup unit tests

Author: tvdijen

tests/CryptoEncoding/PEMBundleTest.php

@@ -6,6 +6,7 @@
 
 use LogicException;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
@@ -35,11 +36,10 @@ public static function setUpBeforeClass(): void
     /**
      * @return \SimpleSAML\XMLSecurity\CryptoEncoding\PEMBundle
      */
+    #[DoesNotPerformAssertions]
     public function testBundle(): PEMBundle
     {
-        $bundle = PEMBundle::fromFile(self::$baseDir . '/resources/certificates/cacert.pem');
-        $this->assertInstanceOf(PEMBundle::class, $bundle);
-        return $bundle;
+        return PEMBundle::fromFile(self::$baseDir . '/resources/certificates/cacert.pem');
     }
 
 
@@ -49,7 +49,6 @@ public function testBundle(): PEMBundle
     #[Depends('testBundle')]
     public function testAll(PEMBundle $bundle): void
     {
-        // @phpstan-ignore method.alreadyNarrowedType
         $this->assertContainsOnlyInstancesOf(PEM::class, $bundle->all());
     }
 
@@ -60,7 +59,6 @@ public function testAll(PEMBundle $bundle): void
     #[Depends('testBundle')]
     public function testFirst(PEMBundle $bundle): void
     {
-        $this->assertInstanceOf(PEM::class, $bundle->first());
         $this->assertEquals($bundle->all()[0], $bundle->first());
     }
 
@@ -71,7 +69,6 @@ public function testFirst(PEMBundle $bundle): void
     #[Depends('testBundle')]
     public function testLast(PEMBundle $bundle): void
     {
-        $this->assertInstanceOf(PEM::class, $bundle->last());
         $this->assertEquals($bundle->all()[149], $bundle->last());
     }
 
@@ -96,7 +93,6 @@ public function testIterator(PEMBundle $bundle): void
         foreach ($bundle as $pem) {
             $values[] = $pem;
         }
-        // @phpstan-ignore method.alreadyNarrowedType
         $this->assertContainsOnlyInstancesOf(PEM::class, $values);
     }
 

tests/CryptoEncoding/PEMTest.php

@@ -5,6 +5,7 @@
 namespace SimpleSAML\XMLSecurity\Test\CryptoEncoding;
 
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -32,22 +33,21 @@ public static function setUpBeforeClass(): void
     }
 
 
+    #[DoesNotPerformAssertions]
     public function testFromString(): void
     {
         $str = file_get_contents(self::$baseDir . '/resources/keys/pubkey.pem');
-        $pem = PEM::fromString($str);
-        $this->assertInstanceOf(PEM::class, $pem);
+        PEM::fromString($str);
     }
 
 
     /**
      * @return \SimpleSAML\XMLSecurity\CryptoEncoding\PEM
      */
+    #[DoesNotPerformAssertions]
     public function testFromFile(): PEM
     {
-        $pem = PEM::fromFile(self::$baseDir . '/resources/keys/pubkey.pem');
-        $this->assertInstanceOf(PEM::class, $pem);
-        return $pem;
+        return PEM::fromFile(self::$baseDir . '/resources/keys/pubkey.pem');
     }