Skip to content

Commit dae8466

Browse files
tvdijentvdijen
committed
Fix PHPStan-issues (tests) and set a baseline
1 parent 28f5826 commit dae8466

File tree

55 files changed

+421
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+421
-176
lines changed

‎.github/workflows/php.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,5 @@ jobs:
192192
vendor/bin/phpstan analyze -c phpstan.neon
193193
194194
- name: PHPStan (testsuite)
195-
continue-on-error: true
196195
run: |
197196
vendor/bin/phpstan analyze -c phpstan-dev.neon

‎phpstan-baseline-dev.neon‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
parameters:
2+
ignoreErrors:
3+
-
4+
message: '#^Call to an undefined method Mockery\\Expectation\:\:shouldReceive\(\)\.$#'
5+
identifier: method.notFound
6+
count: 3
7+
path: tests/SAML2/Certificate/KeyLoaderTest.php

‎phpstan-dev.neon‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ parameters:
22
level: 3
33
paths:
44
- tests
5+
includes:
6+
- phpstan-baseline-dev.neon

‎src/SAML2/Message.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ public static function fromXML(DOMElement $xml): Message
574574
/**
575575
* Retrieve the Extensions.
576576
*
577-
* @return \SAML2\XML\samlp\Extensions[]
577+
* @return \SAML2\XML\Chunk[]
578578
*/
579579
public function getExtensions(): array
580580
{
@@ -598,9 +598,9 @@ public function setExtensions(array $extensions): void
598598
*
599599
* @param \SAML2\XML\samlp\Extensions $extensions The Extensions
600600
*/
601-
public function addExtension(Extensions $extensions): void
601+
public function addExtension(Chunk $extension): void
602602
{
603-
$this->extensions[] = $extensions;
603+
$this->extensions[] = $extension;
604604
}
605605

606606

‎tests/SAML2/Assertion/ProcessorTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class ProcessorTest extends MockeryTestCase
2525

2626
protected function setUp(): void
2727
{
28+
parent::setUp();
29+
2830
$this->decrypter = m::mock(Decrypter::class);
2931
$validator = m::mock(\SAML2\Signature\Validator::class);
3032
$assertionValidator = m::mock(\SAML2\Assertion\Validation\AssertionValidator::class);

‎tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationMethodTest.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,30 @@
44

55
namespace SAML2\Assertion\Validation\ConstraintValidator;
66

7+
use Mockery;
8+
use Mockery\MockInterface;
79
use PHPUnit\Framework\Attributes\Test;
810
use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationMethod;
911
use SAML2\Assertion\Validation\Result;
1012
use SAML2\Constants;
13+
use SAML2\XML\saml\SubjectConfirmation;
1114

1215
class SubjectConfirmationMethodTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
1316
{
1417
/**
15-
* @var \Mockery\MockInterface
18+
* @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmation
1619
*/
17-
private $subjectConfirmation;
20+
private SubjectConfirmation&MockInterface $subjectConfirmation;
1821

1922

2023
/**
2124
* @return void
2225
*/
2326
public function setUp(): void
2427
{
25-
$this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
28+
parent::setUp();
29+
30+
$this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
2631
}
2732

2833

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44

55
namespace SAML2\Assertion\Validation\ConstraintValidator;
66

7+
use Mockery;
8+
use Mockery\MockInterface;
79
use PHPUnit\Framework\Attributes\Test;
810
use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationNotBefore;
911
use SAML2\Assertion\Validation\Result;
12+
use SAML2\XML\saml\SubjectConfirmation;
13+
use SAML2\XML\saml\SubjectConfirmationData;
1014
use Test\SAML2\ControlledTimeTestCase;
1115

1216
/**
@@ -16,14 +20,14 @@
1620
class SubjectConfirmationNotBeforeTest extends ControlledTimeTestCase
1721
{
1822
/**
19-
* @var \Mockery\MockInterface
23+
* @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
2024
*/
21-
private $subjectConfirmation;
25+
private SubjectConfirmation&MockInterface $subjectConfirmation;
2226

2327
/**
24-
* @var \Mockery\MockInterface
28+
* @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
2529
*/
26-
private $subjectConfirmationData;
30+
private SubjectConfirmationData&MockInterface $subjectConfirmationData;
2731

2832

2933
/**
@@ -32,8 +36,8 @@ class SubjectConfirmationNotBeforeTest extends ControlledTimeTestCase
3236
public function setUp(): void
3337
{
3438
parent::setUp();
35-
$this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
36-
$this->subjectConfirmationData = new \SAML2\XML\saml\SubjectConfirmationData();
39+
$this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
40+
$this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
3741
$this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
3842
}
3943

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44

55
namespace SAML2\Assertion\Validation\ConstraintValidator;
66

7+
use Mockery;
8+
use Mockery\MockInterface;
79
use PHPUnit\Framework\Attributes\Test;
810
use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationNotOnOrAfter;
911
use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationNotBefore;
1012
use SAML2\Assertion\Validation\Result;
13+
use SAML2\XML\saml\SubjectConfirmation;
14+
use SAML2\XML\saml\SubjectConfirmationData;
1115
use Test\SAML2\ControlledTimeTestCase;
1216

1317
/**
@@ -17,14 +21,14 @@
1721
class SubjectConfirmationNotOnOrAfterTest extends ControlledTimeTestCase
1822
{
1923
/**
20-
* @var \Mockery\MockInterface
24+
* @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
2125
*/
22-
private $subjectConfirmation;
26+
private SubjectConfirmation&MockInterface $subjectConfirmation;
2327

2428
/**
25-
* @var \Mockery\MockInterface
29+
* @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
2630
*/
27-
private $subjectConfirmationData;
31+
private SubjectConfirmationData&MockInterface $subjectConfirmationData;
2832

2933

3034
/**
@@ -33,8 +37,8 @@ class SubjectConfirmationNotOnOrAfterTest extends ControlledTimeTestCase
3337
public function setUp(): void
3438
{
3539
parent::setUp();
36-
$this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
37-
$this->subjectConfirmationData = new \SAML2\XML\saml\SubjectConfirmationData();
40+
$this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
41+
$this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
3842
$this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
3943
}
4044

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,28 @@
44

55
namespace SAML2\Assertion\Validation\ConstraintValidator;
66

7+
use Mockery;
8+
use Mockery\MockInterface;
79
use PHPUnit\Framework\Attributes\Test;
810
use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationRecipientMatches;
911
use SAML2\Assertion\Validation\ConstraintValidator\SubjectConfirmationResponseToMatches;
1012
use SAML2\Assertion\Validation\Result;
1113
use SAML2\Configuration\Destination;
14+
use SAML2\XML\saml\SubjectConfirmation;
1215
use SAML2\XML\saml\SubjectConfirmationData;
1316
use SAML2\XML\saml\SubjectConfirmationMatches;
1417

1518
class SubjectConfirmationRecipientMathchesTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
1619
{
1720
/**
18-
* @var \Mockery\MockInterface
21+
* @var \SAML2\XML\saml\SubjectConfirmation&\Mockery\MockInterface
1922
*/
20-
private $subjectConfirmation;
23+
private SubjectConfirmation&MockInterface $subjectConfirmation;
2124

2225
/**
23-
* @var \Mockery\MockInterface
26+
* @var \SAML2\XML\saml\SubjectConfirmationData&\Mockery\MockInterface
2427
*/
25-
private $subjectConfirmationData;
28+
private SubjectConfirmationData&MockInterface $subjectConfirmationData;
2629

2730

2831
/**
@@ -31,8 +34,8 @@ class SubjectConfirmationRecipientMathchesTest extends \Mockery\Adapter\Phpunit\
3134
public function setUp(): void
3235
{
3336
parent::setUp();
34-
$this->subjectConfirmation = new \SAML2\XML\saml\SubjectConfirmation();
35-
$this->subjectConfirmationData = new \SAML2\XML\saml\SubjectConfirmationData();
37+
$this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
38+
$this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
3639
$this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
3740
}
3841

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace SAML2\Assertion\Validation\ConstraintValidator;
66

77
use Mockery;
8+
use Mockery\MockInterface;
89
use PHPUnit\Framework\Attributes\Test;
910
use SAML2\Assertion\Validation\Result;
1011
use SAML2\Response;
@@ -14,19 +15,19 @@
1415
class SubjectConfirmationResponseToMatchesTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
1516
{
1617
/**
17-
* @var \Mockery\MockInterface
18+
* @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmation
1819
*/
19-
private $subjectConfirmation;
20+
private SubjectConfirmation&MockInterface $subjectConfirmation;
2021

2122
/**
22-
* @var \Mockery\MockInterface
23+
* @var \Mockery\MockInterface&\SAML2\XML\saml\SubjectConfirmationData
2324
*/
24-
private $subjectConfirmationData;
25+
private SubjectConfirmationData&MockInterface$subjectConfirmationData;
2526

2627
/**
27-
* @var \Mockery\MockInterface
28+
* @var \Mockery\MockInterface&\SAML2\Response
2829
*/
29-
private $response;
30+
private Response&MockInterface $response;
3031

3132

3233
/**
@@ -36,8 +37,8 @@ public function setUp(): void
3637
{
3738
parent::setUp();
3839

39-
$this->subjectConfirmation = new SubjectConfirmation();
40-
$this->subjectConfirmationData = new SubjectConfirmationData();
40+
$this->subjectConfirmation = Mockery::mock(SubjectConfirmation::class);
41+
$this->subjectConfirmationData = Mockery::mock(SubjectConfirmationData::class);
4142
$this->subjectConfirmation->setSubjectConfirmationData($this->subjectConfirmationData);
4243
$this->response = Mockery::mock(Response::class);
4344
}

0 commit comments

Comments
 (0)