cseufert / hamle

php/hamle/Text/Complex.php

Spacing +12 added lines, -12 removed lines

@@ -38,9 +38,9 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->filter = new Filter(substr($s, $pos+1), $this);
-      $s = substr($s,0,$pos);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
+      $s = substr($s, 0, $pos);
     }
     $s = preg_split("/-[>!]/", $s);
     // if(count($s) == 1) $s = explode("-!",$s[0]);
@@ -56,27 +56,27 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
       foreach ($this->sel as $s)
         $sel[] = "hamleGet('$s')";
-      return $this->func->toPHP() . "->" . implode('->', $sel);
+      return $this->func->toPHP()."->".implode('->', $sel);
     } else
       return $this->func->toPHP();
   }
 
   function getOrCreateModel(Model $parent = null) {
-    if($this->func instanceof Text\Scope)
+    if ($this->func instanceof Text\Scope)
       return $this->func->getOrCreateModel($parent);
-    if($this->func instanceof Text\Func)
+    if ($this->func instanceof Text\Func)
       return $this->func->getOrCreateModel($parent);
   }
 
@@ -85,10 +85,10 @@ 
    * @return WriteModel
    */
   function setValue($value) {
-    if(!$this->sel || count($this->sel) != 1)
+    if (!$this->sel || count($this->sel) != 1)
       throw new \RuntimeException('Can only set values, when one var name is present');
     $model = $this->getOrCreateModel();
-    if(!$model instanceof WriteModel)
+    if (!$model instanceof WriteModel)
       throw new \RuntimeException('Can only set values on WriteModel, got '.get_class($model));
     $model->hamleSet($this->sel[0], $value);
     return $model;

php/hamle/Text/FuncSub.php

Spacing +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
    */
   public function __construct($s) {
     $m = array();
-    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
+    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL.'+)(.*)$/', $s, $m))
       throw new ParseError("Unable to read \$ sub func in '$s'");
     if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
     elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;
@@ -57,24 +57,24 @@ 
    * @return string
    */
   public function toPHP() {
-    $limit = Hamle\Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'] . "," .
+    $limit = Hamle\Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'].",".
         $this->grouptype['grouptype'];
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    return "hamleRel(" . $this->dir . "," .
-    Hamle\Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    return "hamleRel(".$this->dir.",".
+    Hamle\Text::varToCode($this->filt['tag']).",$limit)$sub";
   }
 
   public function getOrCreateModel(Model $parent = null) {
     $model = $parent->hamleRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
       $this->sortlimit['limit'], $this->sortlimit['offset']);
-    if(!$model->valid()) {
-      if(!$parent instanceof Hamle\WriteModel)
-        throw new \Exception('Cant create model, ' . get_class($parent) . ' must implement Hamle\\WriteModel.');
+    if (!$model->valid()) {
+      if (!$parent instanceof Hamle\WriteModel)
+        throw new \Exception('Cant create model, '.get_class($parent).' must implement Hamle\\WriteModel.');
       $model = $parent->current()->hamleCreateRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
         $this->sortlimit['limit'], $this->sortlimit['offset']);
     }
-    if($this->sub)
+    if ($this->sub)
       return $this->sub->getOrCreateModel($model);
     return $model;
   }