Merge branch 'hotfix/coding-standards' into release

zendframework · Sep 13, 2012 · f40a328 · f40a328
commit f40a328
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Helper/HeadStyle.php b/src/Helper/HeadStyle.php
@@ -337,8 +337,8 @@ public function itemToString(stdClass $item, $indent)
             }
         }
 
-        $escapeStart = $indent . '<!--'. PHP_EOL;
-        $escapeEnd = $indent . '-->'. PHP_EOL;
+        $escapeStart = $indent . '<!--' . PHP_EOL;
+        $escapeEnd = $indent . '-->' . PHP_EOL;
         if (isset($item->attributes['conditional'])
             && !empty($item->attributes['conditional'])
             && is_string($item->attributes['conditional'])

diff --git a/src/Model/ViewModel.php b/src/Model/ViewModel.php
@@ -220,7 +220,7 @@ public function getOptions()
     public function getVariable($name, $default = null)
     {
         $name = (string)$name;
-        if (array_key_exists($name,$this->variables)) {
+        if (array_key_exists($name, $this->variables)) {
             return $this->variables[$name];
         } else {
             return $default;

diff --git a/src/Renderer/JsonRenderer.php b/src/Renderer/JsonRenderer.php
@@ -142,7 +142,7 @@ public function render($nameOrModel, $values = null)
             }
 
             if ($this->hasJsonpCallback()) {
-                $values = $this->jsonpCallback.'('.$values.');';
+                $values = $this->jsonpCallback . '(' . $values . ');';
             }
             return $values;
         }
@@ -160,7 +160,7 @@ public function render($nameOrModel, $values = null)
             }
 
             if ($this->hasJsonpCallback()) {
-                $return = $this->jsonpCallback.'('.$return.');';
+                $return = $this->jsonpCallback . '(' . $return . ');';
             }
             return $return;
         }

diff --git a/src/View.php b/src/View.php
@@ -235,7 +235,7 @@ protected function renderChildren(Model $model)
             if (!empty($capture)) {
                 if ($child->isAppend()) {
                     $oldResult=$model->{$capture};
-                    $model->setVariable($capture, $oldResult.$result);
+                    $model->setVariable($capture, $oldResult . $result);
                 } else {
                     $model->setVariable($capture, $result);
                 }