Skip to content

Commit 2dc73e0

Browse files
ioigoumeioigoume
authored
fix phpunit notices (#73)
* fix phpunit notices * fix phpsatn reported issues
1 parent 7614ad7 commit 2dc73e0

8 files changed

Lines changed: 121 additions & 151 deletions

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"verify": [
6060
"vendor/bin/phpcs -p",
6161
"vendor/bin/phpunit --no-coverage --testdox",
62-
"vendor/bin/phpstan --memory-limit=256M analyze -c phpstan.neon"
62+
"vendor/bin/phpstan --memory-limit=256M analyze -c phpstan.neon",
63+
"vendor/bin/phpstan --memory-limit=256M analyze -c phpstan-dev.neon"
6364
],
6465
"tests": [
6566
"vendor/bin/phpunit --no-coverage"

‎phpstan-dev-baseline.neon‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎phpstan-dev.neon‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ parameters:
33
paths:
44
- tests
55

6-
includes:
7-
- phpstan-dev-baseline.neon

‎tests/src/Controller/Cas10ControllerTest.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
use SimpleSAML\Configuration;
1111
use SimpleSAML\Module\casserver\Cas\Ticket\FileSystemTicketStore;
1212
use SimpleSAML\Module\casserver\Controller\Cas10Controller;
13-
use SimpleSAML\Session;
1413
use Symfony\Component\HttpFoundation\Request;
1514

1615
class Cas10ControllerTest extends TestCase
1716
{
1817
private array $moduleConfig;
1918

20-
private Session $sessionMock;
21-
2219
private array $ticket;
2320

2421
private string $sessionId;
@@ -37,11 +34,6 @@ protected function setUp(): void
3734
],
3835
];
3936

40-
$this->sessionMock = $this->getMockBuilder(Session::class)
41-
->disableOriginalConstructor()
42-
->onlyMethods(['getSessionId'])
43-
->getMock();
44-
4537
$this->ticket = [
4638
'id' => 'ST-' . $this->sessionId,
4739
'validBefore' => 1731111111,

‎tests/src/Controller/Cas20ControllerTest.php‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
namespace SimpleSAML\Module\casserver\Tests\Controller;
66

77
use PHPUnit\Framework\Attributes\DataProvider;
8-
use PHPUnit\Framework\MockObject\MockObject;
98
use PHPUnit\Framework\TestCase;
109
use SimpleSAML\CAS\Constants as C;
1110
use SimpleSAML\Configuration;
1211
use SimpleSAML\Module;
1312
use SimpleSAML\Module\casserver\Cas\Factories\TicketFactory;
1413
use SimpleSAML\Module\casserver\Cas\Ticket\FileSystemTicketStore;
15-
use SimpleSAML\Module\casserver\Cas\TicketValidator;
1614
use SimpleSAML\Module\casserver\Controller\Cas20Controller;
17-
use SimpleSAML\Session;
1815
use SimpleSAML\Utils;
1916
use Symfony\Component\HttpFoundation\Request;
2017
use Symfony\Component\HttpFoundation\Response;
@@ -23,8 +20,6 @@ class Cas20ControllerTest extends TestCase
2320
{
2421
private array $moduleConfig;
2522

26-
private Session $sessionMock;
27-
2823
private Request $samlValidateRequest;
2924

3025
private string $sessionId;
@@ -33,10 +28,6 @@ class Cas20ControllerTest extends TestCase
3328

3429
private FileSystemTicketStore $ticketStore;
3530

36-
private TicketValidator $ticketValidatorMock;
37-
38-
private Utils\HTTP|MockObject $utilsHttpMock;
39-
4031
private array $ticket;
4132

4233
private array $proxyTicket;
@@ -59,21 +50,6 @@ protected function setUp(): void
5950
// Hard code the ticket store
6051
$this->ticketStore = new FileSystemTicketStore(Configuration::loadFromArray($this->moduleConfig));
6152

62-
$this->ticketValidatorMock = $this->getMockBuilder(TicketValidator::class)
63-
->setConstructorArgs([Configuration::loadFromArray($this->moduleConfig)])
64-
->onlyMethods(['validateAndDeleteTicket'])
65-
->getMock();
66-
67-
$this->sessionMock = $this->getMockBuilder(Session::class)
68-
->disableOriginalConstructor()
69-
->onlyMethods(['getSessionId'])
70-
->getMock();
71-
72-
$this->utilsHttpMock = $this->getMockBuilder(Utils\HTTP::class)
73-
->disableOriginalConstructor()
74-
->onlyMethods(['fetch'])
75-
->getMock();
76-
7753
$this->ticket = [
7854
'id' => 'ST-' . $this->sessionId,
7955
'validBefore' => 1731111111,
@@ -152,6 +128,7 @@ public function testProxyValidatePassesTheCorrectMethodToValidate(string $prefix
152128
$controllerMock->expects($this->once())
153129
->method('validate')
154130
->with($request, $method, false, null, $prefix . $this->sessionId, 'https://myservice.com/abcd', null);
131+
155132
$controllerMock->$method($request, ...$requestParameters);
156133
}
157134

@@ -355,7 +332,7 @@ public function testProxyReturnsProxyTicket(): void
355332
$xml->registerXPathNamespace('cas', 'serviceResponse');
356333
$this->assertEquals('serviceResponse', $xml->getName());
357334
$this->assertNotNull($xml->xpath('//cas:proxySuccess'));
358-
$ticketId = (string)$xml->xpath('//cas:proxyTicket')[0];
335+
$ticketId = (string) $xml->xpath('//cas:proxyTicket')[0];
359336
$proxyTicket = $this->ticketStore->getTicket($ticketId);
360337
$this->assertTrue(filter_var($ticketFactory->isProxyTicket($proxyTicket), FILTER_VALIDATE_BOOLEAN));
361338
}
@@ -748,14 +725,19 @@ public function testThrowOnProxyServiceIdentityFail(): void
748725
parameters: $params,
749726
);
750727

751-
$this->utilsHttpMock->expects($this->once())
728+
$httpUtilsMock = $this->getMockBuilder(Utils\HTTP::class)
729+
->disableOriginalConstructor()
730+
->onlyMethods(['fetch'])
731+
->getMock();
732+
733+
$httpUtilsMock->expects($this->once())
752734
->method('fetch')
753735
->willThrowException(new \Exception());
754736

755737
$cas20Controller = new Cas20Controller(
756738
sspConfig: $this->sspConfig,
757739
casConfig: $config,
758-
httpUtils: $this->utilsHttpMock,
740+
httpUtils: $httpUtilsMock,
759741
);
760742
$ticketStore = $cas20Controller->getTicketStore();
761743
$ticketStore->addTicket($this->ticket);

‎tests/src/Controller/Cas30ControllerTest.php‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@
1111
use SimpleSAML\Module\casserver\Cas\Ticket\FileSystemTicketStore;
1212
use SimpleSAML\Module\casserver\Cas\TicketValidator;
1313
use SimpleSAML\Module\casserver\Controller\Cas30Controller;
14-
use SimpleSAML\Session;
1514
use Symfony\Component\HttpFoundation\Request;
1615
use Symfony\Component\HttpFoundation\Response;
1716

1817
class Cas30ControllerTest extends TestCase
1918
{
2019
private array $moduleConfig;
2120

22-
private Session $sessionMock;
23-
2421
private Request $samlValidateRequest;
2522

2623
private string $sessionId;
@@ -29,8 +26,6 @@ class Cas30ControllerTest extends TestCase
2926

3027
private FileSystemTicketStore $ticketStore;
3128

32-
private TicketValidator $ticketValidatorMock;
33-
3429
private array $ticket;
3530

3631

@@ -51,16 +46,6 @@ protected function setUp(): void
5146
// Hard code the ticket store
5247
$this->ticketStore = new FileSystemTicketStore(Configuration::loadFromArray($this->moduleConfig));
5348

54-
$this->ticketValidatorMock = $this->getMockBuilder(TicketValidator::class)
55-
->setConstructorArgs([Configuration::loadFromArray($this->moduleConfig)])
56-
->onlyMethods(['validateAndDeleteTicket'])
57-
->getMock();
58-
59-
$this->sessionMock = $this->getMockBuilder(Session::class)
60-
->disableOriginalConstructor()
61-
->onlyMethods(['getSessionId'])
62-
->getMock();
63-
6449
$this->ticket = [
6550
'id' => 'ST-' . $this->sessionId,
6651
'validBefore' => 9999999999,
@@ -236,15 +221,20 @@ public function testCasValidateAndDeleteTicketThrowsException(): void
236221
content: $samlRequest,
237222
);
238223

239-
$this->ticketValidatorMock
224+
$ticketValidatorMock = $this->getMockBuilder(TicketValidator::class)
225+
->setConstructorArgs([Configuration::loadFromArray($this->moduleConfig)])
226+
->onlyMethods(['validateAndDeleteTicket'])
227+
->getMock();
228+
229+
$ticketValidatorMock
240230
->expects($this->once())
241231
->method('validateAndDeleteTicket')
242232
->willThrowException(new \RuntimeException('Cas validateAndDeleteTicket failed'));
243233

244234
$cas30Controller = new Cas30Controller(
245235
$this->sspConfig,
246236
$casconfig,
247-
$this->ticketValidatorMock,
237+
$ticketValidatorMock,
248238
);
249239

250240
// Exception expected
@@ -289,15 +279,20 @@ public function testUnableToLoadTicket(): void
289279
content: $samlRequest,
290280
);
291281

292-
$this->ticketValidatorMock
282+
$ticketValidatorMock = $this->getMockBuilder(TicketValidator::class)
283+
->setConstructorArgs([Configuration::loadFromArray($this->moduleConfig)])
284+
->onlyMethods(['validateAndDeleteTicket'])
285+
->getMock();
286+
287+
$ticketValidatorMock
293288
->expects($this->once())
294289
->method('validateAndDeleteTicket')
295290
->willReturn('i am a string');
296291

297292
$cas30Controller = new Cas30Controller(
298293
$this->sspConfig,
299294
$casconfig,
300-
$this->ticketValidatorMock,
295+
$ticketValidatorMock,
301296
);
302297

303298
// Exception expected

0 commit comments

Comments
 (0)