Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add phpunit 11 support #672

Merged
merged 1 commit into from
Aug 10, 2024
Merged

add phpunit 11 support #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"cakephp/cakephp": "^5.0",
"cakephp/cakephp": "dev-5.next as 5.1.0",
"cakephp/cakephp-codesniffer": "^5.0",
"firebase/php-jwt": "^6.2",
"phpunit/phpunit": "^10.1.0"
"phpunit/phpunit": "^10.5.5 || ^11.1.3"
},
"suggest": {
"ext-ldap": "Make sure this php extension is installed and enabled on your system if you want to use the built-in LDAP adapter for \"LdapIdentifier\".",
Expand Down
23 changes: 18 additions & 5 deletions tests/TestCase/Authenticator/AbstractAuthenticatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
namespace Authentication\Test\TestCase\Authenticator;

use Authentication\Authenticator\AbstractAuthenticator;
use Authentication\Authenticator\Result;
use Authentication\Authenticator\ResultInterface;
use Authentication\Identifier\IdentifierInterface;
use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;

Expand All @@ -30,7 +32,12 @@ class AbstractAuthenticatorTest extends TestCase
public function testGetIdentifier()
{
$identifier = $this->createMock(IdentifierInterface::class);
$authenticator = $this->getMockForAbstractClass(AbstractAuthenticator::class, [$identifier]);
$authenticator = new class ($identifier) extends AbstractAuthenticator {
public function authenticate($request): Result
{
return new Result([], ResultInterface::SUCCESS);
}
};

$this->assertSame($identifier, $authenticator->getIdentifier());
}
Expand All @@ -42,11 +49,17 @@ public function testGetIdentifier()
*/
public function testSetIdentifier()
{
$authenticator = $this->getMockForAbstractClass(AbstractAuthenticator::class, [], '', false);

$identifier = $this->createMock(IdentifierInterface::class);
$authenticator->setIdentifier($identifier);
$authenticator = new class ($identifier) extends AbstractAuthenticator {
public function authenticate($request): Result
{
return new Result([], ResultInterface::SUCCESS);
}
};

$this->assertSame($identifier, $authenticator->getIdentifier());
$otherIdentifier = $this->createMock(IdentifierInterface::class);
$authenticator->setIdentifier($otherIdentifier);

$this->assertSame($otherIdentifier, $authenticator->getIdentifier());
}
}
2 changes: 1 addition & 1 deletion tests/TestCase/Authenticator/JwtAuthenticatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function testAuthenticateInvalidPayloadEmpty()

$authenticator->expects($this->once())
->method('getPayLoad')
->will($this->returnValue(new stdClass()));
->willReturn(new stdClass());

$result = $authenticator->authenticate($request);
$this->assertInstanceOf(Result::class, $result);
Expand Down
14 changes: 7 additions & 7 deletions tests/TestCase/Authenticator/SessionAuthenticatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ public function testAuthenticateSuccess()
$this->sessionMock->expects($this->once())
->method('read')
->with('Auth')
->will($this->returnValue([
->willReturn([
'username' => 'mariano',
'password' => 'password',
]));
]);

$request = $request->withAttribute('session', $this->sessionMock);

Expand All @@ -106,7 +106,7 @@ public function testAuthenticateFailure()
$this->sessionMock->expects($this->once())
->method('read')
->with('Auth')
->will($this->returnValue(null));
->willReturn(null);

$request = $request->withAttribute('session', $this->sessionMock);

Expand All @@ -129,10 +129,10 @@ public function testVerifyByDatabaseSuccess()
$this->sessionMock->expects($this->once())
->method('read')
->with('Auth')
->will($this->returnValue([
->willReturn([
'username' => 'mariano',
'password' => 'h45h',
]));
]);

$request = $request->withAttribute('session', $this->sessionMock);

Expand All @@ -157,10 +157,10 @@ public function testVerifyByDatabaseFailure()
$this->sessionMock->expects($this->once())
->method('read')
->with('Auth')
->will($this->returnValue([
->willReturn([
'username' => 'does-not',
'password' => 'exist',
]));
]);

$request = $request->withAttribute('session', $this->sessionMock);

Expand Down
88 changes: 47 additions & 41 deletions tests/TestCase/Identifier/Resolver/ResolverAwareTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,31 @@ class ResolverAwareTraitTest extends TestCase
{
public function testBuildResolverFromClassName()
{
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;

$object->expects($this->once())
->method('getConfig')
->willReturn('Test');
public function getConfig()
{
return 'Test';
}
};

$resolver = $object->getResolver();
$this->assertInstanceOf(TestResolver::class, $resolver);
}

public function testBuildResolverFromArray()
{
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;

$object->expects($this->once())
->method('getConfig')
->willReturn([
'className' => 'Test',
]);
public function getConfig()
{
return [
'className' => 'Test',
];
}
};

$resolver = $object->getResolver();
$this->assertInstanceOf(TestResolver::class, $resolver);
Expand All @@ -57,13 +59,14 @@ public function testBuildResolverInvalid()
{
$this->expectException('RuntimeException');
$this->expectExceptionMessage('Resolver must implement `Authentication\Identifier\Resolver\ResolverInterface`.');
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;

$object->expects($this->once())
->method('getConfig')
->willReturn('Invalid');
public function getConfig()
{
return 'Invalid';
}
};

$object->getResolver();
}
Expand All @@ -72,13 +75,14 @@ public function testBuildResolverMissing()
{
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage('Resolver class `Missing` does not exist.');
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;

$object->expects($this->once())
->method('getConfig')
->willReturn('Missing');
public function getConfig()
{
return 'Missing';
}
};

$object->getResolver();
}
Expand All @@ -87,13 +91,14 @@ public function testBuildResolverMissingClassNameOption()
{
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage('Option `className` is not present.');
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;

$object->expects($this->once())
->method('getConfig')
->willReturn([]);
public function getConfig()
{
return [];
}
};

$object->getResolver();
}
Expand All @@ -102,22 +107,23 @@ public function testGetResolverNotSet()
{
$this->expectException('RuntimeException');
$this->expectExceptionMessage('Resolver has not been set.');
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;

$object->expects($this->once())
->method('getConfig')
->willReturn(null);
public function getConfig()
{
return null;
}
};

$object->getResolver();
}

public function testSetResolver()
{
$object = $this->getMockBuilder(ResolverAwareTrait::class)
->addMethods(['getConfig'])
->getMockForTrait();
$object = new class {
use ResolverAwareTrait;
};

$resolver = $this->createMock(ResolverInterface::class);

Expand Down
8 changes: 6 additions & 2 deletions tests/TestCase/PasswordHasher/PasswordHasherTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ class PasswordHasherTraitTest extends TestCase
*/
public function testGetPasswordHasher()
{
$object = $this->getMockForTrait(PasswordHasherTrait::class);
$object = new class {
use PasswordHasherTrait;
};

$defaultHasher = $object->getPasswordHasher();
$this->assertInstanceOf(DefaultPasswordHasher::class, $defaultHasher);
Expand All @@ -46,7 +48,9 @@ public function testGetPasswordHasher()
public function testSetPasswordHasher()
{
$hasher = $this->createMock(PasswordHasherInterface::class);
$object = $this->getMockForTrait(PasswordHasherTrait::class);
$object = new class {
use PasswordHasherTrait;
};

$object->setPasswordHasher($hasher);
$passwordHasher = $object->getPasswordHasher();
Expand Down
Loading