Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor dependency checking in DependencyTest.php

Browse Source
This commit is contained in:
Benjamin Beganović 2024-02-29 17:36:52 +01:00
parent 0380a14232
commit 33e8743024
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Unit/BillingPortal/DependencyTest.php
View File

@ -64,7 +64,7 @@ class DependencyTest extends TestCase
Cart::class, Cart::class,
]); ]);
$this->assertEquals(Purchase::$steps, $results); $this->assertEquals(Purchase::defaultSteps(), $results);
$results = $this->sort([ $results = $this->sort([
RegisterOrLogin::class, RegisterOrLogin::class,
@ -100,14 +100,18 @@ class DependencyTest extends TestCase
private function checkDependencies(array $steps): array private function checkDependencies(array $steps): array
{ {
$dependencies = Purchase::$dependencies; $dependencies = Purchase::$dependencies;
$step_order = array_flip($steps); $stepOrder = array_flip($steps);
$errors = []; $errors = [];
foreach ($steps as $step) { foreach ($steps as $step) {
$dependent = $dependencies[$step]['dependencies'] ?? []; $dependent = $dependencies[$step]['dependencies'] ?? [];
if (!empty($dependent) && !array_intersect($dependent, $steps)) {
$errors[] = "Dependency error: [$step] requires at least one of its dependencies [" . implode(', ', $dependent) . "] in the list.";
}
foreach ($dependent as $dependency) { foreach ($dependent as $dependency) {
if (in_array($dependency, $steps) && $step_order[$dependency] > $step_order[$step]) { if (in_array($dependency, $steps) && $stepOrder[$dependency] > $stepOrder[$step]) {
$errors[] = "Dependency error: $step depends on $dependency"; $errors[] = "Dependency error: $step depends on $dependency";
} }
} }
@ -121,7 +125,7 @@ class DependencyTest extends TestCase
$errors = $this->checkDependencies($dependencies); $errors = $this->checkDependencies($dependencies);
if (count($errors)) { if (count($errors)) {
return Purchase::$steps; return Purchase::defaultSteps();
} }
return [Setup::class, ...$dependencies, Submit::class]; // Note: Re-index if you're doing any index-based checking/comparision. return [Setup::class, ...$dependencies, Submit::class]; // Note: Re-index if you're doing any index-based checking/comparision.