From 7b907e93eb6a60edefb18cf31948516b716b134f Mon Sep 17 00:00:00 2001
From: Axel Guckelsberger <info@guite.de>
Date: Mon, 13 Jan 2020 17:53:54 +0100
Subject: [PATCH 1/2] Configure bundle dir before fetching catalogues

---
 Command/ExtractCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Command/ExtractCommand.php b/Command/ExtractCommand.php
index 16c77dbd..5000c362 100644
--- a/Command/ExtractCommand.php
+++ b/Command/ExtractCommand.php
@@ -98,8 +98,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $locales = [$inputLocale];
         }
 
-        $catalogues = $this->catalogueFetcher->getCatalogues($config, $locales);
         $this->configureBundleDirs($input, $config);
+        $catalogues = $this->catalogueFetcher->getCatalogues($config, $locales);
         $finder = $this->getConfiguredFinder($config);
 
         $result = $this->importer->extractToCatalogues($finder, $catalogues, [

From 5c856904bbcb16f2dc4d9214085441c669dcd3da Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Mon, 13 Jan 2020 18:50:13 +0100
Subject: [PATCH 2/2] ensure a string is passed to createMessage

---
 Catalogue/CatalogueManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Catalogue/CatalogueManager.php b/Catalogue/CatalogueManager.php
index 8c9a3135..eb83d500 100644
--- a/Catalogue/CatalogueManager.php
+++ b/Catalogue/CatalogueManager.php
@@ -58,7 +58,7 @@ public function getMessages(string $locale, string $domain): array
         }
 
         foreach ($this->catalogues[$locale]->all($domain) as $key => $text) {
-            $messages[] = $this->createMessage($this->catalogues[$locale], $locale, $domain, $key, $text);
+            $messages[] = $this->createMessage($this->catalogues[$locale], $locale, $domain, $key, $text ?? '');
         }
 
         return $messages;