Merge branch 'improvement/38'

Close #38
zendframework · Oct 8, 2019 · 90695b9 · 90695b9
2 parents 63e4945 + 573f438
commit 90695b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/Extension/EscaperExtensionFactory.php b/src/Extension/EscaperExtensionFactory.php
@@ -32,16 +32,9 @@ class EscaperExtensionFactory
     public function __invoke(ContainerInterface $container) : EscaperExtension
     {
         $config = $container->has('config') ? $container->get('config') : [];
-        $config = isset($config['plates']) ? $config['plates'] : [];
-
-        $encoding = null;
-
-        // Set encoding
-        if (isset($config['encoding'])) {
-            $encoding = $config['encoding'];
-        }
+        $config = $config['plates'] ?? [];
 
         // Create new EscaperExtension instance
-        return new EscaperExtension($encoding);
+        return new EscaperExtension($config['encoding'] ?? null);
     }
 }
diff --git a/src/PlatesEngineFactory.php b/src/PlatesEngineFactory.php
@@ -49,7 +49,7 @@ class PlatesEngineFactory
     public function __invoke(ContainerInterface $container) : PlatesEngine
     {
         $config = $container->has('config') ? $container->get('config') : [];
-        $config = isset($config['plates']) ? $config['plates'] : [];
+        $config = $config['plates'] ?? [];
 
         // Create the engine instance:
         $engine = new PlatesEngine();

diff --git a/src/PlatesRendererFactory.php b/src/PlatesRendererFactory.php
@@ -42,7 +42,7 @@ class PlatesRendererFactory
     public function __invoke(ContainerInterface $container) : PlatesRenderer
     {
         $config = $container->has('config') ? $container->get('config') : [];
-        $config = isset($config['templates']) ? $config['templates'] : [];
+        $config = $config['templates'] ?? [];
 
         // Create the engine instance:
         $engine = $this->createEngine($container);