ahmido
1acbf8cc54
## Summary - remove tenant-based Graph options access from runtime service paths and enforce provider-only resolution - add `MicrosoftGraphOptionsResolver` and `ProviderConfigurationRequiredException` for centralized, actionable provider-config errors - turn `Tenant::graphOptions()` into a fail-fast kill switch to prevent legacy runtime usage - add and update tests (including guardrail) to enforce no reintroduction in `app/` - update Spec 088 artifacts (`spec`, `plan`, `research`, `tasks`, checklist) ## Validation - `vendor/bin/sail bin pint --dirty` - `vendor/bin/sail artisan test --compact --filter=NoLegacyTenantGraphOptions` - `vendor/bin/sail artisan test --compact tests/Feature/Filament` - `CI=1 vendor/bin/sail artisan test --compact` ## Notes - Branch includes the guardrail test for legacy callsite detection in `app/`. - Full suite currently green: 1227 passed, 5 skipped. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Reviewed-on: #105
109 lines
3.0 KiB
PHP
109 lines
3.0 KiB
PHP
<?php
|
|
|
|
use Illuminate\Support\Collection;
|
|
|
|
it('Spec088 blocks legacy Tenant::graphOptions call sites in app/', function (): void {
|
|
$root = base_path();
|
|
$self = realpath(__FILE__);
|
|
|
|
$directories = [
|
|
$root.'/app',
|
|
];
|
|
|
|
$excludedPaths = [
|
|
$root.'/vendor',
|
|
$root.'/storage',
|
|
$root.'/specs',
|
|
$root.'/spechistory',
|
|
$root.'/references',
|
|
$root.'/bootstrap/cache',
|
|
];
|
|
|
|
$forbiddenPatterns = [
|
|
'/\$tenant->graphOptions\s*\(/',
|
|
|
|
// Avoid failing on the kill-switch error message string in app/Models/Tenant.php.
|
|
'/(?<![\'"`])Tenant::graphOptions\s*\(/',
|
|
];
|
|
|
|
/** @var Collection<int, string> $files */
|
|
$files = collect($directories)
|
|
->filter(fn (string $dir): bool => is_dir($dir))
|
|
->flatMap(function (string $dir): array {
|
|
$iterator = new RecursiveIteratorIterator(
|
|
new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS)
|
|
);
|
|
|
|
$paths = [];
|
|
|
|
foreach ($iterator as $file) {
|
|
if (! $file->isFile()) {
|
|
continue;
|
|
}
|
|
|
|
$path = $file->getPathname();
|
|
|
|
if (! str_ends_with($path, '.php')) {
|
|
continue;
|
|
}
|
|
|
|
$paths[] = $path;
|
|
}
|
|
|
|
return $paths;
|
|
})
|
|
->filter(function (string $path) use ($excludedPaths, $self): bool {
|
|
if ($self && realpath($path) === $self) {
|
|
return false;
|
|
}
|
|
|
|
foreach ($excludedPaths as $excluded) {
|
|
if (str_starts_with($path, $excluded)) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
})
|
|
->values();
|
|
|
|
$hits = [];
|
|
|
|
foreach ($files as $path) {
|
|
$contents = file_get_contents($path);
|
|
|
|
if (! is_string($contents) || $contents === '') {
|
|
continue;
|
|
}
|
|
|
|
foreach ($forbiddenPatterns as $pattern) {
|
|
if (! preg_match($pattern, $contents)) {
|
|
continue;
|
|
}
|
|
|
|
$lines = preg_split('/\R/', $contents) ?: [];
|
|
|
|
foreach ($lines as $index => $line) {
|
|
if (preg_match($pattern, $line)) {
|
|
$relative = str_replace($root.'/', '', $path);
|
|
$hits[] = $relative.':'.($index + 1).' -> '.trim($line);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
$howToFix = <<<'TXT'
|
|
Legacy tenant Graph options accessor usage detected.
|
|
|
|
Do not call `$tenant->graphOptions()` or `Tenant::graphOptions()` anywhere under `app/`.
|
|
|
|
Use provider connection resolution instead:
|
|
- `ProviderConnectionResolver::resolveDefault($tenant, 'microsoft')`
|
|
- `ProviderGateway::graphOptions($connection, $overrides)`
|
|
|
|
Or prefer the canonical helper: `MicrosoftGraphOptionsResolver::resolveForTenant($tenant, $overrides)`.
|
|
TXT;
|
|
|
|
expect($hits)->toBeEmpty($howToFix."\n\nMatches:\n".implode("\n", $hits));
|
|
});
|