Fix PHPStan-issues (tests) and set a baseline

Author: tvdijen

composer.json

@@ -22,9 +22,6 @@
         "mockery/mockery": "~1.6",
         "simplesamlphp/simplesamlphp-test-framework": "~1.11"
     },
-    "conflict": {
-        "robrichards/xmlseclibs": "3.1.2"
-    },
     "autoload": {
         "psr-4": {
             "SAML2\\": "src/SAML2"

phpstan-baseline-dev.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Call to an undefined method Mockery\\Expectation\:\:shouldReceive\(\)\.$#'
+			identifier: method.notFound
+			count: 3
+			path: tests/SAML2/Certificate/KeyLoaderTest.php

phpstan-dev.neon

@@ -2,3 +2,5 @@ parameters:
   level: 3
   paths:
     - tests
+includes:
+  - phpstan-baseline-dev.neon

src/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationMethod.php

@@ -21,7 +21,7 @@ public function validate(
     ): void {
         if ($subjectConfirmation->getMethod() !== Constants::CM_BEARER) {
             $result->addError(sprintf(
-                'Invalid Method on SubjectConfirmation, current;y only Bearer (%s) is supported',
+                'Invalid Method on SubjectConfirmation, currently only Bearer (%s) is supported',
                 Constants::CM_BEARER
             ));
         }

src/SAML2/Message.php

@@ -575,7 +575,7 @@ public static function fromXML(DOMElement $xml): Message
     /**
      * Retrieve the Extensions.
      *
-     * @return \SAML2\XML\samlp\Extensions[]
+     * @return \SAML2\XML\Chunk[]
      */
     public function getExtensions(): array
     {
@@ -599,9 +599,9 @@ public function setExtensions(array $extensions): void
      *
      * @param \SAML2\XML\Chunk $extension The Extensions
      */
-    public function addExtension(Extensions $extensions): void
+    public function addExtension(Chunk $extension): void
     {
-        $this->extensions[] = $extensions;
+        $this->extensions[] = $extension;
     }
 
 

tests/SAML2/Assertion/ProcessorTest.php

@@ -25,6 +25,8 @@ class ProcessorTest extends MockeryTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->decrypter = m::mock(Decrypter::class);
         $validator = m::mock(\SAML2\Signature\Validator::class);
         $assertionValidator = m::mock(\SAML2\Assertion\Validation\AssertionValidator::class);

tests/SAML2/Assertion/Validation/ConstraintValidator/NotBeforeTest.php

@@ -4,6 +4,8 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
 use SAML2\Assertion;
 use SAML2\Assertion\Validation\ConstraintValidator\NotBefore;
@@ -18,24 +20,17 @@
  */
 class NotBeforeTest extends ControlledTimeTestCase
 {
-    /**
-     * @var \Mockery\MockInterface
-     */
-    private $assertion;
+    private MockInterface&Assertion $assertion;
 
-    /**
-     * @var int
-     */
-    protected $currentTime = 1;
+    protected int $currentTime = 1;
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
         parent::setUp();
-        $this->assertion = \Mockery::mock(Assertion::class);
+        $this->assertion = Mockery::mock(Assertion::class);
     }
 
 

tests/SAML2/Assertion/Validation/ConstraintValidator/NotOnOrAfterTest.php

@@ -4,7 +4,10 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
+use SAML2\Assertion;
 use SAML2\Assertion\Validation\ConstraintValidator\NotOnOrAfter;
 use SAML2\Assertion\Validation\Result;
 use Test\SAML2\ControlledTimeTestCase;
@@ -17,19 +20,15 @@
  */
 class NotOnOrAfterTest extends ControlledTimeTestCase
 {
-    /**
-     * @var \Mockery\MockInterface
-     */
-    private $assertion;
+    private MockInterface&Assertion $assertion;
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
         parent::setUp();
-        $this->assertion = \Mockery::mock(\SAML2\Assertion::class);
+        $this->assertion = Mockery::mock(Assertion::class);
     }
 
 

tests/SAML2/Assertion/Validation/ConstraintValidator/SessionNotOnOrAfterTest.php

@@ -4,7 +4,10 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
+use SAML2\Assertion;
 use SAML2\Assertion\Validation\ConstraintValidator\SessionNotOnOrAfter;
 use SAML2\Assertion\Validation\Result;
 use Test\SAML2\ControlledTimeTestCase;
@@ -17,19 +20,15 @@
  */
 class SessionNotOnOrAfterTest extends ControlledTimeTestCase
 {
-    /**
-     * @var \Mockery\MockInterface
-     */
-    private $assertion;
+    private MockInterface&Assertion $assertion;
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
         parent::setUp();
-        $this->assertion = \Mockery::mock(\SAML2\Assertion::class);
+        $this->assertion = Mockery::mock(Assertion::class);
     }
 
 

tests/SAML2/Assertion/Validation/ConstraintValidator/SpIsValidAudienceTest.php

@@ -4,35 +4,32 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
+use SAML2\Assertion;
 use SAML2\Assertion\Validation\ConstraintValidator\SpIsValidAudience;
 use SAML2\Assertion\Validation\Result;
+use SAML2\Configuration\ServiceProvider;
 
 /**
  * Because we're mocking a static call, we have to run it in separate processes so as to no contaminate the other
  * tests.
  */
 class SpIsValidAudienceTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
-    /**
-     * @var \Mockery\MockInterface
-     */
-    private $assertion;
+    private MockInterface&Assertion $assertion;
 
-    /**
-     * @var \Mockery\MockInterface
-     */
-    private $serviceProvider;
+    private MockInterface&ServiceProvider $serviceProvider;
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
         parent::setUp();
-        $this->assertion = \Mockery::mock(\SAML2\Assertion::class);
-        $this->serviceProvider = \Mockery::mock(\SAML2\Configuration\ServiceProvider::class);
+        $this->assertion = Mockery::mock(Assertion::class);
+        $this->serviceProvider = Mockery::mock(ServiceProvider::class);
     }