Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 39 additions & 1 deletion WebFiori/Framework/Router/RouterUri.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@
*/
public function getMiddleware() : array {
if (count($this->assignedMiddlewareList) != count($this->sortedMiddleeareList)) {
$this->sortedMiddleeareList = $this->sortByDependencies($this->assignedMiddlewareList);
$resolved = $this->resolveDependencies($this->assignedMiddlewareList);
$this->sortedMiddleeareList = $this->sortByDependencies($resolved);
}

return $this->sortedMiddleeareList;
Expand Down Expand Up @@ -624,10 +625,47 @@
* @param array $middlewareList Array of AbstractMiddleware instances.
*
* @return array Sorted array.
/**
* Resolves transitive dependencies by pulling missing middleware from the registry.
*
* @param array $middlewareList The initially assigned middleware.
*
* @return array The expanded list including all transitive dependencies.
*/
private function resolveDependencies(array $middlewareList): array {
$byName = [];

foreach ($middlewareList as $mw) {
$byName[$mw->getName()] = $mw;
}

$queue = $middlewareList;

while (!empty($queue)) {
$current = array_shift($queue);

foreach ($current->getDependencies() as $depName) {
if (isset($byName[$depName])) {
continue;
}

$dep = MiddlewareManager::getMiddleware($depName);

if ($dep !== null) {
$byName[$depName] = $dep;
$queue[] = $dep;
}
}
}

return array_values($byName);
}
/**
* Sorts middleware using topological sort (Kahn's algorithm).
*
* @throws RoutingException If circular dependency detected.
*/
private function sortByDependencies(array $middlewareList): array {

Check failure on line 668 in WebFiori/Framework/Router/RouterUri.php

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this function to reduce its Cognitive Complexity from 29 to the 20 allowed.

See more on https://sonarcloud.io/project/issues?id=WebFiori_framework&issues=AZ7FMxvmYF4-iXSsHfSS&open=AZ7FMxvmYF4-iXSsHfSS&pullRequest=396
if (empty($middlewareList)) {
return [];
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?php
/**
* This file is licensed under MIT License.
*
* Copyright (c) 2026-present WebFiori Framework
*
* For more information on the license, please visit:
* https://github.com/WebFiori/.github/blob/main/LICENSE
*
*/
namespace WebFiori\Framework\Test\Middleware;

use PHPUnit\Framework\TestCase;
use WebFiori\Framework\Middleware\AbstractMiddleware;
use WebFiori\Framework\Middleware\MiddlewareManager;
use WebFiori\Framework\Router\RouterUri;
use WebFiori\Http\Request;
use WebFiori\Http\Response;

class MwA extends AbstractMiddleware {
public function __construct() { parent::__construct('mw-a'); }
public function before(Request $r, Response $res) {}
public function after(Request $r, Response $res) {}
public function afterSend(Request $r, Response $res) {}
}

class MwB extends AbstractMiddleware {
public function __construct() { parent::__construct('mw-b'); }
public function getDependencies(): array { return ['mw-a']; }
public function before(Request $r, Response $res) {}
public function after(Request $r, Response $res) {}
public function afterSend(Request $r, Response $res) {}
}

class MwC extends AbstractMiddleware {
public function __construct() { parent::__construct('mw-c'); }
public function getDependencies(): array { return ['mw-b']; }
public function before(Request $r, Response $res) {}
public function after(Request $r, Response $res) {}
public function afterSend(Request $r, Response $res) {}
}

class MwOrphan extends AbstractMiddleware {
public function __construct() { parent::__construct('mw-orphan'); }
public function getDependencies(): array { return ['mw-nonexistent']; }
public function before(Request $r, Response $res) {}
public function after(Request $r, Response $res) {}
public function afterSend(Request $r, Response $res) {}
}

class MiddlewareTransitiveDepsTest extends TestCase {
protected function setUp(): void {
parent::setUp();
MiddlewareManager::register(new MwA());
MiddlewareManager::register(new MwB());
MiddlewareManager::register(new MwC());
}

protected function tearDown(): void {
MiddlewareManager::reset();
parent::tearDown();
}

/** @test */
public function testSingleDependencyAutoResolved() {
$uri = new RouterUri('https://example.com/test', '');
$uri->addMiddleware(new MwB()); // depends on mw-a

$middleware = $uri->getMiddleware();
$names = array_map(fn($mw) => $mw->getName(), $middleware);

$this->assertContains('mw-a', $names);
$this->assertContains('mw-b', $names);
$this->assertCount(2, $middleware);
}

/** @test */
public function testTransitiveChainResolved() {
$uri = new RouterUri('https://example.com/test', '');
$uri->addMiddleware(new MwC()); // C depends on B, B depends on A

$middleware = $uri->getMiddleware();
$names = array_map(fn($mw) => $mw->getName(), $middleware);

$this->assertContains('mw-a', $names);
$this->assertContains('mw-b', $names);
$this->assertContains('mw-c', $names);
$this->assertCount(3, $middleware);
}

/** @test */
public function testExecutionOrderCorrect() {
$uri = new RouterUri('https://example.com/test', '');
$uri->addMiddleware(new MwC());

$middleware = $uri->getMiddleware();
$names = array_map(fn($mw) => $mw->getName(), $middleware);

// A must come before B, B before C
$this->assertLessThan(
array_search('mw-b', $names),
array_search('mw-a', $names)
);
$this->assertLessThan(
array_search('mw-c', $names),
array_search('mw-b', $names)
);
}

/** @test */
public function testNoDuplicateWhenDependencyAlreadyAssigned() {
$uri = new RouterUri('https://example.com/test', '');
$uri->addMiddleware(new MwA());
$uri->addMiddleware(new MwB());

$middleware = $uri->getMiddleware();
$names = array_map(fn($mw) => $mw->getName(), $middleware);

$this->assertCount(2, $middleware);
$this->assertEquals(1, count(array_keys($names, 'mw-a')));
}

/** @test */
public function testMissingDependencySkippedSilently() {
$uri = new RouterUri('https://example.com/test', '');
$uri->addMiddleware(new MwOrphan()); // depends on mw-nonexistent

$middleware = $uri->getMiddleware();
$names = array_map(fn($mw) => $mw->getName(), $middleware);

$this->assertContains('mw-orphan', $names);
$this->assertNotContains('mw-nonexistent', $names);
$this->assertCount(1, $middleware);
}

/** @test */
public function testNoDependenciesUnchanged() {
$uri = new RouterUri('https://example.com/test', '');
$uri->addMiddleware(new MwA()); // no dependencies

$middleware = $uri->getMiddleware();
$this->assertCount(1, $middleware);
$this->assertEquals('mw-a', $middleware[0]->getName());
}
}
Loading