Merge pull request #355 from ker0x/get-configuration-exception

Move Exception into getConfiguration method

Author: Olivier Dolbeau

.gitignore

@@ -5,3 +5,4 @@
 /phpunit.xml
 /vendor/
 .php_cs.cache
+.phpunit.result.cache

Command/DeleteObsoleteCommand.php

@@ -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));

Command/DownloadCommand.php

@@ -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);

Command/ExtractCommand.php

@@ -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')) {

Command/StatusCommand.php

@@ -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);
 

Service/ConfigurationManager.php

@@ -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');
@@ -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

Tests/Unit/Service/ConfigurationManagerTest.php

@@ -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

TranslationBundle.php

@@ -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());