Fix PHPStan-issues (tests) and set a baseline

Author: tvdijen

.github/workflows/php.yml

@@ -192,6 +192,5 @@ jobs:
           vendor/bin/phpstan analyze -c phpstan.neon
 
       - name: PHPStan (testsuite)
-        continue-on-error: true
         run: |
           vendor/bin/phpstan analyze -c phpstan-dev.neon

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/Message.php

@@ -574,7 +574,7 @@ public static function fromXML(DOMElement $xml): Message
     /**
      * Retrieve the Extensions.
      *
-     * @return \SAML2\XML\samlp\Extensions[]
+     * @return \SAML2\XML\Chunk[]
      */
     public function getExtensions(): array
     {
@@ -598,9 +598,9 @@ public function setExtensions(array $extensions): void
      *
      * @param \SAML2\XML\samlp\Extensions $extensions 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/SubjectConfirmationMethodTest.php

@@ -4,25 +4,30 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
 use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationMethod;
 use SAML2\Assertion\Validation\Result;
 use SAML2\Constants;
+use SAML2\XML\saml\SubjectConfirmation;
 
 class SubjectConfirmationMethodTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
     /**
-     * @var \Mockery\MockInterface
+     * @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmation
      */
-    private $subjectConfirmation;
+    private SubjectConfirmation&MockInterface $subjectConfirmation;
 
 
     /**
      * @return void
      */
     public function setUp(): void
     {
-        $this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
+        parent::setUp();
+
+        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
     }
 
 

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

@@ -4,9 +4,13 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
 use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationNotBefore;
 use SAML2\Assertion\Validation\Result;
+use SAML2\XML\saml\SubjectConfirmation;
+use SAML2\XML\saml\SubjectConfirmationData;
 use Test\SAML2\ControlledTimeTestCase;
 
 /**
@@ -16,14 +20,14 @@
 class SubjectConfirmationNotBeforeTest extends ControlledTimeTestCase
 {
     /**
-     * @var \Mockery\MockInterface
+     * @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
      */
-    private $subjectConfirmation;
+    private SubjectConfirmation&MockInterface $subjectConfirmation;
 
     /**
-     * @var \Mockery\MockInterface
+     * @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
      */
-    private $subjectConfirmationData;
+    private SubjectConfirmationData&MockInterface $subjectConfirmationData;
 
 
     /**
@@ -32,8 +36,8 @@ class SubjectConfirmationNotBeforeTest extends ControlledTimeTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
-        $this->subjectConfirmationData = new \SAML2\XML\saml\SubjectConfirmationData();
+        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
+        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
     }
 

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

@@ -4,10 +4,14 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
 use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationNotOnOrAfter;
 use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationNotBefore;
 use SAML2\Assertion\Validation\Result;
+use SAML2\XML\saml\SubjectConfirmation;
+use SAML2\XML\saml\SubjectConfirmationData;
 use Test\SAML2\ControlledTimeTestCase;
 
 /**
@@ -17,14 +21,14 @@
 class SubjectConfirmationNotOnOrAfterTest extends ControlledTimeTestCase
 {
     /**
-     * @var \Mockery\MockInterface
+     * @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
      */
-    private $subjectConfirmation;
+    private SubjectConfirmation&MockInterface $subjectConfirmation;
 
     /**
-     * @var \Mockery\MockInterface
+     * @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
      */
-    private $subjectConfirmationData;
+    private SubjectConfirmationData&MockInterface $subjectConfirmationData;
 
 
     /**
@@ -33,8 +37,8 @@ class SubjectConfirmationNotOnOrAfterTest extends ControlledTimeTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
-        $this->subjectConfirmationData = new \SAML2\XML\saml\SubjectConfirmationData();
+        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
+        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
     }
 

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

@@ -4,25 +4,28 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
 use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationRecipientMatches;
 use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationResponseToMatches;
 use SAML2\Assertion\Validation\Result;
 use SAML2\Configuration\Destination;
+use SAML2\XML\saml\SubjectConfirmation;
 use SAML2\XML\saml\SubjectConfirmationData;
 use SAML2\XML\saml\SubjectConfirmationMatches;
 
 class SubjectConfirmationRecipientMathchesTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
     /**
-     * @var \Mockery\MockInterface
+     * @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
      */
-    private $subjectConfirmation;
+    private SubjectConfirmation&MockInterface $subjectConfirmation;
 
     /**
-     * @var \Mockery\MockInterface
+     * @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
      */
-    private $subjectConfirmationData;
+    private SubjectConfirmationData&MockInterface $subjectConfirmationData;
 
 
     /**
@@ -31,8 +34,8 @@ class SubjectConfirmationRecipientMathchesTest extends \Mockery\Adapter\Phpunit\
     public function setUp(): void
     {
         parent::setUp();
-        $this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
-        $this->subjectConfirmationData = new \SAML2\XML\saml\SubjectConfirmationData();
+        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
+        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
     }
 

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

@@ -5,6 +5,7 @@
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
 use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\Test;
 use SAML2\Assertion\Validation\Result;
 use SAML2\Response;
@@ -14,19 +15,19 @@
 class SubjectConfirmationResponseToMatchesTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
     /**
-     * @var \Mockery\MockInterface
+     * @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmation
      */
-    private $subjectConfirmation;
+    private SubjectConfirmation&MockInterface $subjectConfirmation;
 
     /**
-     * @var \Mockery\MockInterface
+     * @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmationData
      */
-    private $subjectConfirmationData;
+    private SubjectConfirmationData&MockInterface$subjectConfirmationData;
 
     /**
-     * @var \Mockery\MockInterface
+     * @var \Mockery\MockInterface&\SAML2\Response
      */
-    private $response;
+    private Response&MockInterface $response;
 
 
     /**
@@ -36,8 +37,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->subjectConfirmation = new SubjectConfirmation();
-        $this->subjectConfirmationData = new SubjectConfirmationData();
+        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
+        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
         $this->response = Mockery::mock(Response::class);
     }