1 Commits

Author SHA1 Message Date
Sebastian ad5536529d Update dependency phpunit/phpunit to v12.5.32
Build Test / test (pull_request) Successful in 53s
JS Unit Tests / test (pull_request) Successful in 57s
PHP Integration Tests / Integration Tests (pull_request) Failing after 2m0s
PHP Unit Tests / test (pull_request) Successful in 1m33s
2026-07-26 03:05:32 +00:00
5 changed files with 83 additions and 83 deletions
Generated
+33 -45
View File
@@ -9,20 +9,20 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.14.0", "version": "1.13.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae" "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
"reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae", "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^8.0" "php": "^7.1 || ^8.0"
}, },
"conflict": { "conflict": {
"doctrine/collections": "<1.6.8", "doctrine/collections": "<1.6.8",
@@ -57,15 +57,15 @@
], ],
"support": { "support": {
"issues": "https://github.com/myclabs/DeepCopy/issues", "issues": "https://github.com/myclabs/DeepCopy/issues",
"source": "https://github.com/myclabs/DeepCopy/tree/1.14.0" "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
}, },
"funding": [ "funding": [
{ {
"url": "https://github.com/mnapoli", "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
"type": "github" "type": "tidelift"
} }
], ],
"time": "2026-08-11T10:17:44+00:00" "time": "2025-08-01T08:46:24+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@@ -332,23 +332,23 @@
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
"version": "6.0.2", "version": "6.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5" "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5", "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
"reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5", "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.3" "php": ">=8.3"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^12.5.33" "phpunit/phpunit": "^12.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -381,7 +381,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
"security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2" "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1"
}, },
"funding": [ "funding": [
{ {
@@ -401,7 +401,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2026-08-25T14:40:53+00:00" "time": "2026-02-02T14:04:18+00:00"
}, },
{ {
"name": "phpunit/php-invoker", "name": "phpunit/php-invoker",
@@ -589,16 +589,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "12.5.35", "version": "12.5.32",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "345ac22e42cb14cdc7aa8428655d8bb8c82a4aab" "reference": "c02591dd7840ed124a98d7770753329ad28e9f8f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/345ac22e42cb14cdc7aa8428655d8bb8c82a4aab", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c02591dd7840ed124a98d7770753329ad28e9f8f",
"reference": "345ac22e42cb14cdc7aa8428655d8bb8c82a4aab", "reference": "c02591dd7840ed124a98d7770753329ad28e9f8f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -608,18 +608,18 @@
"ext-libxml": "*", "ext-libxml": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"myclabs/deep-copy": "^1.14.0", "myclabs/deep-copy": "^1.13.4",
"phar-io/manifest": "^2.0.4", "phar-io/manifest": "^2.0.4",
"phar-io/version": "^3.2.1", "phar-io/version": "^3.2.1",
"php": ">=8.3", "php": ">=8.3",
"phpunit/php-code-coverage": "^12.5.7", "phpunit/php-code-coverage": "^12.5.7",
"phpunit/php-file-iterator": "^6.0.2", "phpunit/php-file-iterator": "^6.0.1",
"phpunit/php-invoker": "^6.0.0", "phpunit/php-invoker": "^6.0.0",
"phpunit/php-text-template": "^5.0.0", "phpunit/php-text-template": "^5.0.0",
"phpunit/php-timer": "^8.0.0", "phpunit/php-timer": "^8.0.0",
"sebastian/cli-parser": "^4.2.1", "sebastian/cli-parser": "^4.2.1",
"sebastian/comparator": "^7.1.8", "sebastian/comparator": "^7.1.8",
"sebastian/diff": "^7.0.1", "sebastian/diff": "^7.0.0",
"sebastian/environment": "^8.1.2", "sebastian/environment": "^8.1.2",
"sebastian/exporter": "^7.0.3", "sebastian/exporter": "^7.0.3",
"sebastian/global-state": "^8.0.3", "sebastian/global-state": "^8.0.3",
@@ -667,7 +667,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy", "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.35" "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.32"
}, },
"funding": [ "funding": [
{ {
@@ -675,7 +675,7 @@
"type": "other" "type": "other"
} }
], ],
"time": "2026-09-09T04:48:50+00:00" "time": "2026-07-25T06:54:13+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",
@@ -898,24 +898,24 @@
}, },
{ {
"name": "sebastian/diff", "name": "sebastian/diff",
"version": "7.0.1", "version": "7.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/diff.git", "url": "https://github.com/sebastianbergmann/diff.git",
"reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6" "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6", "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
"reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6", "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.3" "php": ">=8.3"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^12.5.33", "phpunit/phpunit": "^12.0",
"symfony/process": "^7.4.17" "symfony/process": "^7.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -953,27 +953,15 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/diff/issues", "issues": "https://github.com/sebastianbergmann/diff/issues",
"security": "https://github.com/sebastianbergmann/diff/security/policy", "security": "https://github.com/sebastianbergmann/diff/security/policy",
"source": "https://github.com/sebastianbergmann/diff/tree/7.0.1" "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
}, },
"funding": [ "funding": [
{ {
"url": "https://github.com/sebastianbergmann", "url": "https://github.com/sebastianbergmann",
"type": "github" "type": "github"
},
{
"url": "https://liberapay.com/sebastianbergmann",
"type": "liberapay"
},
{
"url": "https://thanks.dev/u/gh/sebastianbergmann",
"type": "thanks_dev"
},
{
"url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
"type": "tidelift"
} }
], ],
"time": "2026-08-25T15:35:54+00:00" "time": "2025-02-07T04:55:46+00:00"
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
+9 -9
View File
@@ -4,8 +4,8 @@ namespace KTXM\AuthenticationProviderPassword\Controllers;
use KTXC\Http\Response\JsonResponse; use KTXC\Http\Response\JsonResponse;
use KTXC\Service\UserAccountsService; use KTXC\Service\UserAccountsService;
use KTXC\Context\IdentityContextInterface; use KTXC\SessionIdentity;
use KTXC\Context\TenantContextInterface; use KTXC\SessionTenant;
use KTXF\Controller\ControllerAbstract; use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute; use KTXF\Routing\Attributes\AuthenticatedRoute;
use KTXF\Security\Crypto; use KTXF\Security\Crypto;
@@ -15,8 +15,8 @@ use KTXM\AuthenticationProviderPassword\Stores\CredentialStore;
class PasswordController extends ControllerAbstract class PasswordController extends ControllerAbstract
{ {
public function __construct( public function __construct(
private readonly IdentityContextInterface $identityContext, private readonly SessionIdentity $sessionIdentity,
private readonly TenantContextInterface $tenantContext, private readonly SessionTenant $sessionTenant,
private readonly CredentialStore $credentialStore, private readonly CredentialStore $credentialStore,
private readonly Provider $provider, private readonly Provider $provider,
private readonly Crypto $crypto, private readonly Crypto $crypto,
@@ -27,8 +27,8 @@ class PasswordController extends ControllerAbstract
#[AuthenticatedRoute('/password/update', name: 'password.update', methods: ['POST'])] #[AuthenticatedRoute('/password/update', name: 'password.update', methods: ['POST'])]
public function update(string $current_password, string $new_password): JsonResponse public function update(string $current_password, string $new_password): JsonResponse
{ {
$tenantId = $this->tenantContext->identifier(); $tenantId = $this->sessionTenant->identifier();
$identifier = $this->identityContext->mailAddress(); $identifier = $this->sessionIdentity->mailAddress();
if ($tenantId === null || $identifier === null) { if ($tenantId === null || $identifier === null) {
return new JsonResponse(['error' => 'Invalid session state'], 400); return new JsonResponse(['error' => 'Invalid session state'], 400);
@@ -56,7 +56,7 @@ class PasswordController extends ControllerAbstract
#[AuthenticatedRoute('/status', name: 'password.admin.status', methods: ['POST'], permissions: ['authentication_provider_password.admin.view', 'authentication_provider_password.admin.manage'])] #[AuthenticatedRoute('/status', name: 'password.admin.status', methods: ['POST'], permissions: ['authentication_provider_password.admin.view', 'authentication_provider_password.admin.manage'])]
public function getStatus(string $uid): JsonResponse public function getStatus(string $uid): JsonResponse
{ {
$tenantId = $this->tenantContext->identifier(); $tenantId = $this->sessionTenant->identifier();
if ($tenantId === null) { if ($tenantId === null) {
return new JsonResponse(['error' => 'Invalid session state'], 400); return new JsonResponse(['error' => 'Invalid session state'], 400);
@@ -82,7 +82,7 @@ class PasswordController extends ControllerAbstract
#[AuthenticatedRoute('/reset', name: 'password.admin.reset', methods: ['POST'], permissions: ['authentication_provider_password.admin.manage'])] #[AuthenticatedRoute('/reset', name: 'password.admin.reset', methods: ['POST'], permissions: ['authentication_provider_password.admin.manage'])]
public function adminReset(string $uid, string $password): JsonResponse public function adminReset(string $uid, string $password): JsonResponse
{ {
$tenantId = $this->tenantContext->identifier(); $tenantId = $this->sessionTenant->identifier();
if ($tenantId === null) { if ($tenantId === null) {
return new JsonResponse(['error' => 'Invalid session state'], 400); return new JsonResponse(['error' => 'Invalid session state'], 400);
@@ -113,7 +113,7 @@ class PasswordController extends ControllerAbstract
#[AuthenticatedRoute('/remove', name: 'password.admin.remove', methods: ['POST'], permissions: ['authentication_provider_password.admin.manage'])] #[AuthenticatedRoute('/remove', name: 'password.admin.remove', methods: ['POST'], permissions: ['authentication_provider_password.admin.manage'])]
public function adminRemove(string $uid): JsonResponse public function adminRemove(string $uid): JsonResponse
{ {
$tenantId = $this->tenantContext->identifier(); $tenantId = $this->sessionTenant->identifier();
if ($tenantId === null) { if ($tenantId === null) {
return new JsonResponse(['error' => 'Invalid session state'], 400); return new JsonResponse(['error' => 'Invalid session state'], 400);
+20 -11
View File
@@ -5,9 +5,8 @@ declare(strict_types=1);
namespace KTXM\AuthenticationProviderPassword; namespace KTXM\AuthenticationProviderPassword;
use KTXC\Resource\ProviderManager; use KTXC\Resource\ProviderManager;
use KTXF\Module\Configuration\BrowserModuleContextInterface; use KTXF\Module\ModuleBrowserInterface;
use KTXF\Module\Configuration\ConsoleModuleContextInterface; use KTXF\Module\ModuleConsoleInterface;
use KTXF\Module\Configuration\ModuleContextInterface;
use KTXF\Module\ModuleInstanceAbstract; use KTXF\Module\ModuleInstanceAbstract;
use KTXM\AuthenticationProviderPassword\Console\UserPasswordCommand; use KTXM\AuthenticationProviderPassword\Console\UserPasswordCommand;
@@ -15,7 +14,7 @@ use KTXM\AuthenticationProviderPassword\Console\UserPasswordCommand;
* Default Identity Provider Module * Default Identity Provider Module
* Provides local database authentication * Provides local database authentication
*/ */
class Module extends ModuleInstanceAbstract class Module extends ModuleInstanceAbstract implements ModuleConsoleInterface, ModuleBrowserInterface
{ {
public function __construct( public function __construct(
private readonly ProviderManager $providerManager, private readonly ProviderManager $providerManager,
@@ -72,13 +71,23 @@ class Module extends ModuleInstanceAbstract
$this->providerManager->register('authentication', 'password', Provider::class); $this->providerManager->register('authentication', 'password', Provider::class);
} }
public function configure(ModuleContextInterface $context): void public function registerCI(): array
{ {
if ($context instanceof BrowserModuleContextInterface) { return [
$context->registerModule($this, 'AuthenticationProviderPassword', 'static/module.mjs'); UserPasswordCommand::class,
} ];
if ($context instanceof ConsoleModuleContextInterface) { }
$context->registerCommand(UserPasswordCommand::class);
} public function registerBI(): array
{
return [
'handle' => $this->handle(),
'namespace' => 'AuthenticationProviderPassword',
'version' => $this->version(),
'label' => $this->label(),
'author' => $this->author(),
'description' => $this->description(),
'boot' => 'static/module.mjs',
];
} }
} }
+3 -3
View File
@@ -133,7 +133,7 @@ const saveChanges = async () => {
label="Current Password" label="Current Password"
placeholder="············" placeholder="············"
variant="outlined" variant="outlined"
autocomplete="new-password" autocomplete="off"
@click:append-inner="isCurrentPasswordVisible = !isCurrentPasswordVisible" @click:append-inner="isCurrentPasswordVisible = !isCurrentPasswordVisible"
/> />
</VCol> </VCol>
@@ -150,7 +150,7 @@ const saveChanges = async () => {
label="New Password" label="New Password"
placeholder="············" placeholder="············"
variant="outlined" variant="outlined"
autocomplete="new-password" autocomplete="suppress"
@click:append-inner="isNewPasswordVisible = !isNewPasswordVisible" @click:append-inner="isNewPasswordVisible = !isNewPasswordVisible"
/> />
</VCol> </VCol>
@@ -164,7 +164,7 @@ const saveChanges = async () => {
label="Confirm New Password" label="Confirm New Password"
placeholder="············" placeholder="············"
variant="outlined" variant="outlined"
autocomplete="new-password" autocomplete="suppress"
:error="confirmPassword.length > 0 && confirmPassword !== newPassword" :error="confirmPassword.length > 0 && confirmPassword !== newPassword"
:error-messages="confirmPassword.length > 0 && confirmPassword !== newPassword ? ['Passwords do not match'] : []" :error-messages="confirmPassword.length > 0 && confirmPassword !== newPassword ? ['Passwords do not match'] : []"
@click:append-inner="isConfirmPasswordVisible = !isConfirmPasswordVisible" @click:append-inner="isConfirmPasswordVisible = !isConfirmPasswordVisible"
+18 -15
View File
@@ -6,7 +6,7 @@ namespace KTXT\AuthenticationProviderPassword\Tests\Integration;
use KTXC\Http\Request\Request; use KTXC\Http\Request\Request;
use KTXC\Http\Response\Response; use KTXC\Http\Response\Response;
use KTXC\Application; use KTXC\Server;
use KTXC\Stores\UserRolesStore; use KTXC\Stores\UserRolesStore;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
@@ -19,11 +19,11 @@ use PHPUnit\Framework\TestCase;
* through the real HTTP kernel (routing, tenant resolution, auth middleware, * through the real HTTP kernel (routing, tenant resolution, auth middleware,
* controller), not by calling controllers directly. * controller), not by calling controllers directly.
* *
* A fresh Application (and DI container) is built for every request() call, * A fresh Server (and DI container) is built for every request() call,
* mirroring the one-process-per-request model this app is actually * mirroring the one-process-per-request model this app is actually
* deployed under. Session identity is a container-lifetime singleton that * deployed under. Session identity is a container-lifetime singleton that
* AuthenticationMiddleware only ever sets, never clears, so reusing one * AuthenticationMiddleware only ever sets, never clears, so reusing one
* Application across requests would leak an authenticated identity from one * Server across requests would leak an authenticated identity from one
* "request" into the next — a problem that can't occur in production, * "request" into the next — a problem that can't occur in production,
* where each request gets its own process, but very much can here. * where each request gets its own process, but very much can here.
* *
@@ -37,7 +37,7 @@ abstract class IntegrationTestCase extends TestCase
public static function setUpBeforeClass(): void public static function setUpBeforeClass(): void
{ {
if (static::buildApplication()->environment() === 'prod') { if (static::buildServer()->environment() === 'prod') {
self::fail('Refusing to run integration tests against a server configured for the "prod" environment.'); self::fail('Refusing to run integration tests against a server configured for the "prod" environment.');
} }
@@ -58,9 +58,9 @@ abstract class IntegrationTestCase extends TestCase
} }
} }
protected static function buildApplication(): Application protected static function buildServer(): Server
{ {
return Application::create(SERVER_ROOT); return new Server(SERVER_ROOT);
} }
// ========================================================================= // =========================================================================
@@ -103,16 +103,17 @@ abstract class IntegrationTestCase extends TestCase
*/ */
protected static function createRoleWithPermissions(array $permissions, string $label = 'Test Role'): string protected static function createRoleWithPermissions(array $permissions, string $label = 'Test Role'): string
{ {
$application = static::buildApplication(); $server = static::buildServer();
try { try {
$application->kernel()->boot(); $server->kernel()->boot();
$store = $application->container()->get(UserRolesStore::class); $store = $server->container()->get(UserRolesStore::class);
$role = $store->createRole(static::$tenantIdentifier, [ $role = $store->createRole(static::$tenantIdentifier, [
'label' => $label, 'label' => $label,
'permissions' => $permissions, 'permissions' => $permissions,
]); ]);
} finally { } finally {
$application->shutdown(); restore_error_handler();
restore_exception_handler();
} }
return $role['rid']; return $role['rid'];
@@ -173,13 +174,15 @@ abstract class IntegrationTestCase extends TestCase
$uri = 'http://' . static::$tenantDomain . $path; $uri = 'http://' . static::$tenantDomain . $path;
$request = Request::create($uri, $method, [], [], [], $server, $content); $request = Request::create($uri, $method, [], [], [], $server, $content);
// A fresh application mirrors production while shutdown restores its // Kernel::boot() registers a global error/exception handler per
// process-level error handler after the in-process request. // instance and never removes it (fine under one-process-per-request
$application = static::buildApplication(); // in production; here it would otherwise stack a handler per test).
// Pop back to whatever was in place before this request.
try { try {
$response = $application->runHttpRequest($request); $response = static::buildServer()->handle($request);
} finally { } finally {
$application->shutdown(); restore_error_handler();
restore_exception_handler();
} }
$body = $response->getContent(); $body = $response->getContent();