Added getContainerItem(string $containerKey, mixed $fallbackValue=null): mixed to BaseErrorRendererTrait

Author: rotimi

src/BaseErrorRendererTrait.php

@@ -30,22 +30,35 @@ public function setContainer(?\Psr\Container\ContainerInterface $newContainer):
         return $this;
     }
 
-    public function getLocalizedText(string $localeKey, string $fallbackText=''): string {
+    public function getContainerItem(string $containerKey, mixed $fallbackValue=null): mixed {
 
         if(
             $this->container instanceof \Psr\Container\ContainerInterface
-            && $this->container->has(ContainerKeys::LOCALE_OBJ)
-            && $this->container->get(ContainerKeys::LOCALE_OBJ) instanceof \Vespula\Locale\Locale
+            && $this->container->has($containerKey)
         ) {
+            return $this->container->get($containerKey);
+        }
+            
+        return $fallbackValue;
+    }
+    
+    public function getLocalizedText(string $localeKey, string $fallbackText=''): string {
+        
+        /**
+         * @psalm-suppress MixedAssignment
+         */
+        $localeObj = $this->getContainerItem(ContainerKeys::LOCALE_OBJ);
+        
+        if( $localeObj instanceof \Vespula\Locale\Locale ) {
+            
             /**
              * @psalm-suppress MixedAssignment
              * @psalm-suppress MixedMethodCall
              */
-            $localizedText = $this->container->get(ContainerKeys::LOCALE_OBJ)->gettext($localeKey);
+            $localizedText = $localeObj->gettext($localeKey);
 
             // ($localizedText === $localeKey) when $localeKey is not found in the locale object
             return ($localizedText === $localeKey) ? $fallbackText : $localizedText;
-            
         }
 
         return $fallbackText;

src/LogErrorRenderer.php

@@ -22,22 +22,13 @@ public function __invoke(\Throwable $exception, bool $displayErrorDetails): stri
         $nl = PHP_EOL;
         $logErrorDetails = false;
         $text = "{$this->getErrorTitle($exception)}{$nl}";
+
+        /** @psalm-suppress MixedAssignment */
+        $appSettings = (array)$this->getContainerItem(ContainerKeys::APP_SETTINGS, []);
 
-        /** @psalm-suppress PossiblyNullReference */
-        if(
-            ($this->getContainer() instanceof ContainerInterface)
-            && $this->getContainer()->has(ContainerKeys::APP_SETTINGS)
-        ) {
-            /** @psalm-suppress PossiblyNullReference */
-            /** @psalm-suppress MixedAssignment */
-            $appSettings = $this->getContainer()
-                                ->get(ContainerKeys::APP_SETTINGS);
-            if(
-                \is_array($appSettings) 
-                && \array_key_exists(AppSettingsKeys::LOG_ERROR_DETAILS, $appSettings)
-            ) {
-                $logErrorDetails = (bool)$appSettings[AppSettingsKeys::LOG_ERROR_DETAILS];
-            }
+        if( \array_key_exists(AppSettingsKeys::LOG_ERROR_DETAILS, $appSettings) ) {
+
+            $logErrorDetails = (bool)$appSettings[AppSettingsKeys::LOG_ERROR_DETAILS];
         }
 
         if($exception instanceof \Slim\Exception\HttpException) {

tests/HtmlErrorRendererTest.php

@@ -150,6 +150,28 @@ public function testThatGetContainerAndSetContainerWorkAsExpected() {
         self::assertNotSame($contaner1, $html_renderer_no_template_file->getContainer());
     }
 
+    public function testThatGetContainerItemWorkAsExpected() {
+        
+        $html_renderer_no_template_file = new \SlimMvcTools\HtmlErrorRenderer('');
+        
+        self::assertNull($html_renderer_no_template_file->getContainerItem(ContainerKeys::LOCALE_OBJ)); // no container
+        self::assertEquals($html_renderer_no_template_file->getContainerItem(ContainerKeys::LOCALE_OBJ, -777), -777); // no container with fallback value of -777
+        
+        $contaner1 = $this->getContainer();
+        
+        $html_renderer_no_template_file->setContainer($contaner1);
+        self::assertNotNull($html_renderer_no_template_file->getContainerItem(ContainerKeys::LOCALE_OBJ));
+        self::assertNotNull($html_renderer_no_template_file->getContainerItem(ContainerKeys::LOCALE_OBJ, -777));
+        self::assertInstanceOf(
+            \Vespula\Locale\Locale::class, 
+            $html_renderer_no_template_file->getContainerItem(ContainerKeys::LOCALE_OBJ)
+        );
+        self::assertInstanceOf(
+            \Vespula\Locale\Locale::class, 
+            $html_renderer_no_template_file->getContainerItem(ContainerKeys::LOCALE_OBJ, -777)
+        );
+    }
+    
     public function testThatGetLocalizedTextWorkAsExpected() {
 
         $html_renderer_no_template_file = new \SlimMvcTools\HtmlErrorRenderer('');