Minor changes for readability

Author: weierophinney

src/ZendViewRenderer.php

@@ -295,8 +295,10 @@ private function getNamespacedResolver(AggregateResolver $aggregate)
      */
     private function mergeViewModel($name, ModelInterface $model)
     {
-        $variables = $model->getVariables();
-        $params = $this->mergeParams($name, $this->normalizeParams($variables));
+        $params = $this->mergeParams(
+            $name,
+            $this->normalizeParams($model->getVariables())
+        );
         $model->setVariables($params);
         $model->setTemplate($name);
         return $model;

test/ZendViewRendererTest.php

@@ -474,21 +474,26 @@ public function testCanRenderWithChildViewModel()
         $path = __DIR__ . '/TestAsset';
         $renderer = new ZendViewRenderer();
         $renderer->addPath($path);
-        $viewModelParent = new ViewModel();
+
         $viewModelChild = new ViewModel();
         $viewModelChild->setTemplate('zendview-null');
+
+        $viewModelParent = new ViewModel();
         $viewModelParent->setVariables([
-                'layout' => 'zendview-layout',
+            'layout' => 'zendview-layout',
         ]);
         $viewModelParent->addChild($viewModelChild, 'name');
+
         $result = $renderer->render('zendview', $viewModelParent);
 
-        $content = file_get_contents("$path/zendview-null.phtml");
-        $contentParent = file_get_contents("$path/zendview.phtml");
-        $contentParentLayout = file_get_contents("$path/zendview-layout.phtml");
-        //trim is used here, because rendering engine is trimming content too
+        $content             = file_get_contents(sprintf('%s/zendview-null.phtml', $path));
+        $contentParent       = file_get_contents(sprintf('%s/zendview.phtml', $path));
+        $contentParentLayout = file_get_contents(sprintf('%s/zendview-layout.phtml', $path));
+
+        // trim is used here, because rendering engine is trimming content too
         $content = trim(str_replace('<?php echo $name ?>', $content, $contentParent));
         $content = str_replace('<?= $this->content ?>', $content, $contentParentLayout);
+
         $this->assertEquals($content, $result);
     }
 }