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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
/phpunit.xml
/vendor/
.php_cs.cache
.phpunit.result.cache
4 changes: 1 addition & 3 deletions Command/DeleteObsoleteCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$locales = [$inputLocale];
}

if (null === $config = $this->configurationManager->getConfiguration($configName)) {
throw new \InvalidArgumentException(\sprintf('No configuration found for "%s"', $configName));
}
$config = $this->configurationManager->getConfiguration($configName);

$this->configureBundleDirs($input, $config);
$this->catalogueManager->load($this->catalogueFetcher->getCatalogues($config, $locales));
Expand Down
9 changes: 3 additions & 6 deletions Command/DownloadCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,13 @@ protected function configure(): void
protected function execute(InputInterface $input, OutputInterface $output): int
{
$configName = $input->getArgument('configuration');
$config = $this->configurationManager->getConfiguration($configName);
$storage = $this->getStorage($configName);

if (null === $configuration = $this->configurationManager->getConfiguration($configName)) {
throw new \InvalidArgumentException(\sprintf('No configuration found for "%s"', $configName));
}

$this->configureBundleDirs($input, $configuration);
$this->configureBundleDirs($input, $config);

if ($input->getOption('cache')) {
$translationsDirectory = $configuration->getOutputDir();
$translationsDirectory = $config->getOutputDir();
$md5BeforeDownload = $this->hashDirectory($translationsDirectory);
$storage->download();
$md5AfterDownload = $this->hashDirectory($translationsDirectory);
Expand Down
4 changes: 1 addition & 3 deletions Command/ExtractCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ protected function configure(): void
protected function execute(InputInterface $input, OutputInterface $output): int
{
$configName = $input->getArgument('configuration');
if (null === $config = $this->configurationManager->getConfiguration($configName)) {
throw new \InvalidArgumentException(\sprintf('No configuration found for "%s"', $configName));
}
$config = $this->configurationManager->getConfiguration($configName);

$locales = [];
if ($inputLocale = $input->getArgument('locale')) {
Expand Down
4 changes: 1 addition & 3 deletions Command/StatusCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ protected function configure(): void
protected function execute(InputInterface $input, OutputInterface $output): int
{
$configName = $input->getArgument('configuration');
if (null === $config = $this->configurationManager->getConfiguration($configName)) {
throw new \InvalidArgumentException(\sprintf('No configuration found for "%s"', $configName));
}
$config = $this->configurationManager->getConfiguration($configName);

$this->configureBundleDirs($input, $config);

Expand Down
4 changes: 2 additions & 2 deletions Service/ConfigurationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function addConfiguration(string $name, Configuration $configuration): vo
/**
* @param string|string[]|null $name
*/
public function getConfiguration($name = null): ?Configuration
public function getConfiguration($name = null): Configuration
{
if (empty($name)) {
return $this->getConfiguration('default');
Expand All @@ -50,7 +50,7 @@ public function getConfiguration($name = null): ?Configuration
}
}

return null;
throw new \InvalidArgumentException(\sprintf('No configuration found for "%s"', $name));
}

public function getFirstName(): ?string
Expand Down
5 changes: 4 additions & 1 deletion Tests/Unit/Service/ConfigurationManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ public function testGetConfigurationMissing(): void
$manager->addConfiguration('bar', $this->createConfiguration());
$manager->addConfiguration('default', $correctConfiguration);

$this->assertNull($manager->getConfiguration('missing'));
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('No configuration found for "missing"');

$manager->getConfiguration('missing');
}

public function testFirstName(): void
Expand Down
2 changes: 1 addition & 1 deletion TranslationBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*/
class TranslationBundle extends Bundle
{
public function build(ContainerBuilder $container)
public function build(ContainerBuilder $container): void
{
$container->addCompilerPass(new SymfonyProfilerPass());
$container->addCompilerPass(new ValidatorVisitorPass());
Expand Down