mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-03 02:24:35 -04:00
Refactor dependency checking in DependencyTest.php
This commit is contained in:
parent
13daee1d4f
commit
408c8cb15f
@ -19,6 +19,8 @@ use App\Livewire\BillingPortal\Purchase;
|
|||||||
use App\Livewire\BillingPortal\RFF;
|
use App\Livewire\BillingPortal\RFF;
|
||||||
use App\Livewire\BillingPortal\Setup;
|
use App\Livewire\BillingPortal\Setup;
|
||||||
use App\Livewire\BillingPortal\Submit;
|
use App\Livewire\BillingPortal\Submit;
|
||||||
|
use App\Rules\Subscriptions\Steps;
|
||||||
|
use App\Services\Subscription\StepService;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
|
||||||
class DependencyTest extends TestCase
|
class DependencyTest extends TestCase
|
||||||
@ -30,7 +32,7 @@ class DependencyTest extends TestCase
|
|||||||
|
|
||||||
public function testDependencyOrder()
|
public function testDependencyOrder()
|
||||||
{
|
{
|
||||||
$results = $this->checkDependencies([
|
$results = StepService::check([
|
||||||
RFF::class,
|
RFF::class,
|
||||||
RegisterOrLogin::class,
|
RegisterOrLogin::class,
|
||||||
Cart::class,
|
Cart::class,
|
||||||
@ -38,7 +40,7 @@ class DependencyTest extends TestCase
|
|||||||
|
|
||||||
$this->assertCount(1, $results);
|
$this->assertCount(1, $results);
|
||||||
|
|
||||||
$results = $this->checkDependencies([
|
$results = StepService::check([
|
||||||
RegisterOrLogin::class,
|
RegisterOrLogin::class,
|
||||||
Cart::class,
|
Cart::class,
|
||||||
RFF::class,
|
RFF::class,
|
||||||
@ -46,7 +48,7 @@ class DependencyTest extends TestCase
|
|||||||
|
|
||||||
$this->assertCount(0, $results);
|
$this->assertCount(0, $results);
|
||||||
|
|
||||||
$results = $this->checkDependencies([
|
$results = StepService::check([
|
||||||
RegisterOrLogin::class,
|
RegisterOrLogin::class,
|
||||||
RFF::class,
|
RFF::class,
|
||||||
Cart::class,
|
Cart::class,
|
||||||
@ -97,32 +99,9 @@ class DependencyTest extends TestCase
|
|||||||
], $results);
|
], $results);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function checkDependencies(array $steps): array
|
|
||||||
{
|
|
||||||
$dependencies = Purchase::$dependencies;
|
|
||||||
$step_order = array_flip($steps);
|
|
||||||
$errors = [];
|
|
||||||
|
|
||||||
foreach ($steps as $step) {
|
|
||||||
$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) {
|
|
||||||
if (in_array($dependency, $steps) && $step_order[$dependency] > $step_order[$step]) {
|
|
||||||
$errors[] = "Dependency error: $step depends on $dependency";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
private function sort(array $dependencies): array
|
private function sort(array $dependencies): array
|
||||||
{
|
{
|
||||||
$errors = $this->checkDependencies($dependencies);
|
$errors = StepService::check($dependencies);
|
||||||
|
|
||||||
if (count($errors)) {
|
if (count($errors)) {
|
||||||
return Purchase::defaultSteps();
|
return Purchase::defaultSteps();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user