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
15 changes: 14 additions & 1 deletion spec/system/framework/Publisher/PublisherSupport.spec.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,25 @@
expect($result[0])->toBeAnInstanceOf(TestPublisher::class);
});

it('Decouverte dans un dossiers non existant', function (): void {
it('Decouverte dans un dossier non existant', function (): void {
$result = Publisher::discover('Nothing');

expect($result)->toBe([]);
});

it('Decouverte dans un namespace', function (): void {
$result = Publisher::discover('Publishers', 'Spec\BlitzPHP\App');

expect($result)->toHaveLength(1);
expect($result[0])->toBeAnInstanceOf(TestPublisher::class);
});

it('Decouverte dans un namespace inexistants', function (): void {
$result = Publisher::discover('Publishers', 'Nothing\App');

expect($result)->toBe([]);
});

it('DiscoverStores', function (): void {
$publisher = Publisher::discover()[0];
$publisher->set([])->addFile($this->file);
Expand Down
24 changes: 17 additions & 7 deletions src/Cli/Commands/Utilities/Publish.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,33 @@ class Publish extends Command
protected $description = 'Découvre et exécute toutes les classes Publisher prédéfinies.';

/**
* The Command's arguments
*
* @var array<string, string>
* {@inheritDoc}
*/
protected $arguments = [
'[directory:Publishers]' => "[Facultatif] Le répertoire à analyser dans chaque espace de noms. Par défaut\u{a0}: \"Publishers\".",
'[directory:Publishers]' => 'Le répertoire à analyser dans chaque namespace.',
];

/**
* {@inheritDoc}
*/
protected $options = [
'-n|--namespace' => 'Le namespace à partir duquel on devra chercher les fichiers à publier. Par défaut, tous les namespaces sont analysés.',
];

/**
* Affiche l'aide du script klinge cli lui-même.
*/
public function execute(array $params)
{
$directory = array_shift($params) ?? 'Publishers';
$directory = $this->argument('directory', $params['directory'] ?? 'Publishers');
$namespace = $this->option('namespace', $params['namespace'] ?? '');

if ([] === $publishers = Publisher::discover($directory)) {
$this->write(lang('Publisher.publishMissing', [$directory]));
if ([] === $publishers = Publisher::discover($directory, $namespace)) {
if ($namespace === '') {
$this->write(lang('Publisher.publishMissing', [$directory]));
} else {
$this->write(lang('Publisher.publishMissingNamespace', [$directory, $namespace]));
}

return;
}
Expand Down
22 changes: 14 additions & 8 deletions src/Publisher/Publisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,23 @@ class Publisher extends FileCollection
*
* @return list<self>
*/
final public static function discover(string $directory = 'Publishers'): array
final public static function discover(string $directory = 'Publishers', string $namespace = ''): array
{
if (isset(self::$discovered[$directory])) {
return self::$discovered[$directory];
$key = implode('.', [$directory, $namespace]);

if (isset(self::$discovered[$key])) {
return self::$discovered[$key];
}

self::$discovered[$directory] = [];
self::$discovered[$key] = [];

$locator = Services::locator();

if ([] === $files = $locator->listFiles($directory)) {
$files = $namespace === ''
? $locator->listFiles($directory)
: $locator->listNamespaceFiles($namespace, $directory);

if ([] === $files) {
return [];
}

Expand All @@ -109,13 +115,13 @@ final public static function discover(string $directory = 'Publishers'): array
$className = $locator->findQualifiedNameFromPath($file);

if ($className !== false && class_exists($className) && is_a($className, self::class, true)) {
self::$discovered[$directory][] = Services::factory($className);
self::$discovered[$key][] = Services::factory($className);
}
}

sort(self::$discovered[$directory]);
sort(self::$discovered[$key]);

return self::$discovered[$directory];
return self::$discovered[$key];
}

/**
Expand Down
7 changes: 4 additions & 3 deletions src/Translations/en/Publisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
'fileNotAllowed' => '{0} fails the following restriction for {1}: {2}',

// Publish Command
'publishMissing' => 'No Publisher classes detected in {0} across all namespaces.',
'publishSuccess' => '{0} published {1} file(s) to {2}.',
'publishFailure' => '{0} failed to publish to {1}!',
'publishMissing' => 'No Publisher classes detected in {0} across all namespaces.',
'publishMissingNamespace' => 'No Publisher classes detected in {0} in namespace {1}.',
'publishSuccess' => '{0} published {1} file(s) to {2}.',
'publishFailure' => '{0} failed to publish to {1}!',
];