Check for active Alexa request to read text helper object for locale …

…setting in the middleware.
travello-gmbh · Oct 12, 2017 · 19e68fa · 19e68fa
1 parent e7fded0
commit 19e68fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Middleware/SetLocaleMiddleware.php b/src/Middleware/SetLocaleMiddleware.php
@@ -37,7 +37,7 @@ class SetLocaleMiddleware implements MiddlewareInterface
      * @param TextHelperInterface $textHelper
      * @param AlexaRequest        $alexaRequest
      */
-    public function __construct(TextHelperInterface $textHelper, AlexaRequest $alexaRequest = null)
+    public function __construct(TextHelperInterface $textHelper = null, AlexaRequest $alexaRequest = null)
     {
         $this->textHelper   = $textHelper;
         $this->alexaRequest = $alexaRequest;

diff --git a/src/Middleware/SetLocaleMiddlewareFactory.php b/src/Middleware/SetLocaleMiddlewareFactory.php
@@ -33,15 +33,19 @@ class SetLocaleMiddlewareFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        /** @var SkillConfiguration $skillConfiguration */
-        $skillConfiguration = $container->get(SkillConfiguration::class);
-
-        /** @var TextHelper $textHelper */
-        $textHelper = $container->get($skillConfiguration->getTextHelperClass());
-
         /** @var AlexaRequest $alexaRequest */
         $alexaRequest = $container->get(AlexaRequest::class);
 
+        if ($alexaRequest) {
+            /** @var SkillConfiguration $skillConfiguration */
+            $skillConfiguration = $container->get(SkillConfiguration::class);
+
+            /** @var TextHelper $textHelper */
+            $textHelper = $container->get($skillConfiguration->getTextHelperClass());
+        } else {
+            $textHelper = null;
+        }
+
         return new SetLocaleMiddleware($textHelper, $alexaRequest);
     }
 }