Fix PHPStan-issues (tests) and set a baseline

tvdijen · tvdijen · commit 56f1fab95cc2 · 2026-02-28T23:24:28.000+01:00
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/NotOnOrAfterTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/NotOnOrAfterTest.php
@@ -4,7 +4,9 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
 use PHPUnit\Framework\Attributes\Test;
+use SAML2\Assertion;
 use SAML2\Assertion\Validation\ConstraintValidator\NotOnOrAfter;
 use SAML2\Assertion\Validation\Result;
 use Test\SAML2\ControlledTimeTestCase;
@@ -29,7 +31,7 @@ class NotOnOrAfterTest extends ControlledTimeTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->assertion = \Mockery::mock(\SAML2\Assertion::class);
+        $this->assertion = Mockery::mock(Assertion::class);
     }
 
 
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SessionNotOnOrAfterTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SessionNotOnOrAfterTest.php
@@ -4,7 +4,9 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
 use PHPUnit\Framework\Attributes\Test;
+use SAML2\Assertion;
 use SAML2\Assertion\Validation\ConstraintValidator\SessionNotOnOrAfter;
 use SAML2\Assertion\Validation\Result;
 use Test\SAML2\ControlledTimeTestCase;
@@ -29,7 +31,7 @@ class SessionNotOnOrAfterTest extends ControlledTimeTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->assertion = \Mockery::mock(\SAML2\Assertion::class);
+        $this->assertion = Mockery::mock(Assertion::class);
     }
 
 
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SpIsValidAudienceTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SpIsValidAudienceTest.php
@@ -4,9 +4,12 @@
 
 namespace SAML2\Assertion\Validation\ConstraintValidator;
 
+use Mockery;
 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
@@ -31,8 +34,8 @@ class SpIsValidAudienceTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
     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);
     }
 
 
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationMethodTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationMethodTest.php
@@ -17,7 +17,7 @@ class SubjectConfirmationMethodTest extends \Mockery\Adapter\Phpunit\MockeryTest
     /**
      * @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmation
      */
-    private SubjectConfirmation&MockInterface $subjectConfirmation;
+    private SubjectConfirmation $subjectConfirmation;
 
 
     /**
@@ -27,7 +27,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
+        $this->subjectConfirmation = new SubjectConfirmation();
     }
 
 
@@ -37,11 +37,6 @@ public function setUp(): void
     #[Test]
     public function subjectConfirmationWithBearerMethodIsValid(): void
     {
-        $this->subjectConfirmation
-            ->shouldReceive('setMethod')
-            ->once()
-            ->shouldReceive('getMethod')
-            ->andReturn(Constants::CM_BEARER);
         $this->subjectConfirmation->setMethod(Constants::CM_BEARER);
 
         $validator = new SubjectConfirmationMethod();
@@ -58,11 +53,6 @@ public function subjectConfirmationWithBearerMethodIsValid(): void
     #[Test]
     public function subjectConfirmationWithHolderOfKeyMethodIsNotValid(): void
     {
-        $this->subjectConfirmation
-            ->shouldReceive('setMethod')
-            ->once()
-            ->shouldReceive('getMethod')
-            ->andReturn(Constants::CM_HOK);
         $this->subjectConfirmation->setMethod(Constants::CM_HOK);
 
         $validator = new SubjectConfirmationMethod();
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationNotBeforeTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationNotBeforeTest.php
@@ -4,8 +4,6 @@
 
 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;
@@ -19,15 +17,11 @@
  */
 class SubjectConfirmationNotBeforeTest extends ControlledTimeTestCase
 {
-    /**
-     * @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
-     */
-    private SubjectConfirmation&MockInterface $subjectConfirmation;
+    /** @var \SAML2\XML\saml\SubjectConfirmation */
+    private SubjectConfirmation $subjectConfirmation;
 
-    /**
-     * @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
-     */
-    private SubjectConfirmationData&MockInterface $subjectConfirmationData;
+    /** @var \SAML2\XML\saml\SubjectConfirmationData */
+    private SubjectConfirmationData $subjectConfirmationData;
 
 
     /**
@@ -36,8 +30,9 @@ class SubjectConfirmationNotBeforeTest extends ControlledTimeTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
-        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
+
+        $this->subjectConfirmation = new SubjectConfirmation();
+        $this->subjectConfirmationData = new SubjectConfirmationData();
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
     }
 
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationNotOnOrAfterTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationNotOnOrAfterTest.php
@@ -4,8 +4,6 @@
 
 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;
@@ -20,14 +18,10 @@
  */
 class SubjectConfirmationNotOnOrAfterTest extends ControlledTimeTestCase
 {
-    /**
-     * @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
-     */
+    /** @var \SAML2\XML\saml\SubjectConfirmation */
     private SubjectConfirmation&MockInterface $subjectConfirmation;
 
-    /**
-     * @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
-     */
+    /** @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface */
     private SubjectConfirmationData&MockInterface $subjectConfirmationData;
 
 
@@ -37,8 +31,8 @@ class SubjectConfirmationNotOnOrAfterTest extends ControlledTimeTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
-        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
+        $this->subjectConfirmation = new SubjectConfirmation);
+        $this->subjectConfirmationData = new SubjectConfirmationData();
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
     }
 
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationRecipientMathchesTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationRecipientMathchesTest.php
@@ -4,8 +4,6 @@
 
 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;
@@ -17,15 +15,11 @@
 
 class SubjectConfirmationRecipientMathchesTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
-    /**
-     * @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
-     */
-    private SubjectConfirmation&MockInterface $subjectConfirmation;
+    /** @var \SAML2\XML\saml\SubjectConfirmation */
+    private SubjectConfirmation $subjectConfirmation;
 
-    /**
-     * @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
-     */
-    private SubjectConfirmationData&MockInterface $subjectConfirmationData;
+    /** @var \SAML2\XML\saml\SubjectConfirmationData */
+    private SubjectConfirmationData $subjectConfirmationData;
 
 
     /**
@@ -34,8 +28,8 @@ class SubjectConfirmationRecipientMathchesTest extends \Mockery\Adapter\Phpunit\
     public function setUp(): void
     {
         parent::setUp();
-        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
-        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
+        $this->subjectConfirmation = new SubjectConfirmation();
+        $this->subjectConfirmationData = new SubjectConfirmationData();
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
     }
 
diff --git a/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationResponseToMatchesTest.php b/tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationResponseToMatchesTest.php
@@ -5,7 +5,6 @@
 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 +13,13 @@
 
 class SubjectConfirmationResponseToMatchesTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
-    /**
-     * @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmation
-     */
-    private SubjectConfirmation&MockInterface $subjectConfirmation;
+    /** @var \SAML2\XML\saml\SubjectConfirmation */
+    private SubjectConfirmation $subjectConfirmation;
 
-    /**
-     * @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmationData
-     */
-    private SubjectConfirmationData&MockInterface $subjectConfirmationData;
+    /** @var \SAML2\XML\saml\SubjectConfirmationData */
+    private SubjectConfirmationData $subjectConfirmationData;
 
-    /**
-     * @var \Mockery\MockInterface&\SAML2\Response
-     */
+    /** @var \Mockery\MockInterface&\SAML2\Response */
     private Response&MockInterface $response;
 
 
@@ -37,8 +30,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
-        $this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
+        $this->subjectConfirmation = new SubjectConfirmation();
+        $this->subjectConfirmationData = new SubjectConfirmationData();
         $this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
         $this->response = Mockery::mock(Response::class);
     }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace SAML2\Assertion\Validation\ConstraintValidator;`
`6`	`6`
	`7`	`+use Mockery;`
`7`	`8`	`use PHPUnit\Framework\Attributes\Test;`
	`9`	`+use SAML2\Assertion;`
`8`	`10`	`use SAML2\Assertion\Validation\ConstraintValidator\NotOnOrAfter;`
`9`	`11`	`use SAML2\Assertion\Validation\Result;`
`10`	`12`	`use Test\SAML2\ControlledTimeTestCase;`
`@@ -29,7 +31,7 @@ class NotOnOrAfterTest extends ControlledTimeTestCase`
`29`	`31`	`public function setUp(): void`
`30`	`32`	`{`
`31`	`33`	`parent::setUp();`
`32`		`- $this->assertion = \Mockery::mock(\SAML2\Assertion::class);`
	`34`	`+ $this->assertion = Mockery::mock(Assertion::class);`
`33`	`35`	`}`
`34`	`36`
`35`	`37`