cseufert / hamle

php/hamle/Text/SimpleVar.php

Spacing +6 added lines, -6 removed lines

@@ -33,22 +33,22 @@
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->var = substr($s,1,$pos-1);
-      $this->filter = new Filter(substr($s, $pos+1), $this);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->var = substr($s, 1, $pos - 1);
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
     } else {
       $this->var = substr($s, 1);
     }
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$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() {

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 

php/hamle/Text/Comparison.php

Spacing +10 added lines, -10 removed lines

@@ -35,12 +35,12 @@ 
 
   function __construct($s, $mode = self::TOKEN_CONTROL) {
     $m = array();
-    if(preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) {
-      $this->param1 = new Text($m[1],Text::TOKEN_HTML);
-      $this->param2 = new Text($m[3],Text::TOKEN_HTML);
+    if (preg_match('/^(.*) ' . self::REGEX_COMP_OPER . ' (.*)$/', $s, $m)) {
+      $this->param1 = new Text($m[1], Text::TOKEN_HTML);
+      $this->param2 = new Text($m[3], Text::TOKEN_HTML);
       $this->operator = $m[2];
     } else
-      $this->param1 = new Text($s,Text::TOKEN_HTML);
+      $this->param1 = new Text($s, Text::TOKEN_HTML);
   }
 
 //  function __construct(String $p1, String $p2, $operator) {
@@ -49,20 +49,20 @@ 
 //    $this->operator = $operator;
 //  }
   function toPHP() {
-    if(!$this->param2) return $this->param1->toPHP();
+    if (!$this->param2) return $this->param1->toPHP();
     $p1 = $this->param1->toPHP();
     $p2 = $this->param2->toPHP();
-    switch($this->operator) {
+    switch ($this->operator) {
       case "equals":
       case "equal":
-        return $p1." == ".$p2;
+        return $p1 . " == " . $p2;
       case "notequals":
       case "notequal":
-        return $p1." != ".$p2;
+        return $p1 . " != " . $p2;
       case "less":
-        return $p1." < ".$p2;
+        return $p1 . " < " . $p2;
       case "greater":
-        return $p1." > ".$p2;
+        return $p1 . " > " . $p2;
       case "has":
         return "in_array($p2, $p1)";
       case "starts":

Braces +6 added lines, -3 removed lines

@@ -39,8 +39,9 @@ 
       $this->param1 = new Text($m[1],Text::TOKEN_HTML);
       $this->param2 = new Text($m[3],Text::TOKEN_HTML);
       $this->operator = $m[2];
-    } else
-      $this->param1 = new Text($s,Text::TOKEN_HTML);
+    } else {
+          $this->param1 = new Text($s,Text::TOKEN_HTML);
+    }
   }
 
 //  function __construct(String $p1, String $p2, $operator) {
@@ -49,7 +50,9 @@ 
 //    $this->operator = $operator;
 //  }
   function toPHP() {
-    if(!$this->param2) return $this->param1->toPHP();
+    if(!$this->param2) {
+      return $this->param1->toPHP();
+    }
     $p1 = $this->param1->toPHP();
     $p2 = $this->param2->toPHP();
     switch($this->operator) {

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
   protected $s;
   protected $type;
 
+  /**
+   * @param string $s
+   */
   function __construct($s, $type = self::TOKEN_HTML) {
     $this->s = str_replace('\\$', "$", $s);
     $this->type = $type;

php/hamle/Text/Select.php

Braces +3 added lines, -2 removed lines

@@ -31,7 +31,8 @@
   function __construct($s) {
     $s = explode("->", $s, 2);
     $this->key = $s[0];
-    if (count($s) > 1)
-      $this->sel = $s[1];
+    if (count($s) > 1) {
+          $this->sel = $s[1];
+    }
   }
 }
\ No newline at end of file

php/hamle/Tag.php

Braces +33 added lines, -21 removed lines

@@ -76,9 +76,10 @@ 
       }

       array_shift($path);

     }

-    foreach ($this->tags as $tag)

-      if ($found = $tag->find($path))

-        $list = array_merge($list, $found);

+    foreach ($this->tags as $tag) {
+          if ($found = $tag->find($path))

+        $list = array_merge($list, $found);
+    }
     return $list;

   }

 

@@ -90,7 +91,9 @@ 
    */

   function replace($path, Tag $newTag) {

     if ($this->compare($path[0])) {

-      if (count($path) == 1) return $newTag;

+      if (count($path) == 1) {
+        return $newTag;
+      }
       array_shift($path);

     }

     foreach ($this->tags as $k => $tag) {

@@ -103,21 +106,25 @@ 
   }

 

   function addSnipContent($contentTag, &$tagArray = array(), $key = 0) {

-    foreach ($this->tags as $k => $tag)

-      $tag->addSnipContent($contentTag, $this->tags, $k);

+    foreach ($this->tags as $k => $tag) {
+          $tag->addSnipContent($contentTag, $this->tags, $k);
+    }
   }

 

   function compare($tic) {

-    if (isset($tic['type']) && $this->type != $tic['type'])

-      return false;

+    if (isset($tic['type']) && $this->type != $tic['type']) {
+          return false;
+    }
     if (isset($tic['id']) &&

         !(isset($this->opt['id']) && $tic['id'] == $this->opt['id'])

-    )

-      return false;

+    ) {
+          return false;
+    }
     if (isset($tic['class']) && !(isset($this->opt['class'])

             && !array_diff($tic['class'], $this->opt['class']))

-    )

-      return false;

+    ) {
+          return false;
+    }
     return true;

   }

 

@@ -127,10 +134,11 @@ 
    * @param string $mode Mode to add child [append|prepend]

    */

   function addChild(Tag $tag, $mode = "append") {

-    if ($mode == "prepend")

-      array_unshift($this->tags, $tag);

-    else

-      $this->tags[] = $tag;

+    if ($mode == "prepend") {
+          array_unshift($this->tags, $tag);
+    } else {
+          $this->tags[] = $tag;
+    }
   }

 

   /**

@@ -145,9 +153,12 @@ 
     $ind = $doIndent ? str_pad("", $indent, " ") : "";

     $oneliner = ((count($this->content) > 1 || $this->tags) ? false : true);

     $out = $ind . $this->renderStTag() . ($oneliner ? "" : "\n");

-    if ($this->content) $out .= $this->renderContent($ind, $oneliner);

-    foreach ($this->tags as $tag)

-      $out .= $tag->render($indent + self::INDENT_SIZE);

+    if ($this->content) {
+      $out .= $this->renderContent($ind, $oneliner);
+    }
+    foreach ($this->tags as $tag) {
+          $out .= $tag->render($indent + self::INDENT_SIZE);
+    }
     $out .= ($oneliner ? "" : $ind) . $this->renderEnTag() . "\n";

     return $out;

   }

@@ -161,8 +172,9 @@ 
    */

   function renderContent($pad = "", $oneliner = false) {

     $out = "";

-    foreach ($this->content as $c)

-      $out .= ($oneliner ? "" : $pad) . $c . ($oneliner ? "" : "\n");

+    foreach ($this->content as $c) {
+          $out .= ($oneliner ? "" : $pad) . $c . ($oneliner ? "" : "\n");
+    }
     return $out;

   }

 

php/hamle/Field/Checkbox.php

Braces +9 added lines, -5 removed lines

@@ -36,14 +36,18 @@
   function getInputAttDynamic(&$atts, &$type, &$content) {
     parent::getInputAttDynamic($atts, $type, $content);
     $atts['value'] = "ON";
-    if ($this->getValue())
-      $atts['checked'] = "checked";
+    if ($this->getValue()) {
+          $atts['checked'] = "checked";
+    }
   }
 
   function getValue() {
-    if (!is_null($this->setValue)) return $this->setValue;
-    if (isset($_REQUEST[$this->form . "__submit"]))
-      return isset($_REQUEST[$this->form . "_" . $this->name]);
+    if (!is_null($this->setValue)) {
+      return $this->setValue;
+    }
+    if (isset($_REQUEST[$this->form . "__submit"])) {
+          return isset($_REQUEST[$this->form . "_" . $this->name]);
+    }
     return $this->opt['default'];
   }
 }
\ No newline at end of file

php/hamle/Model/WrapArray.php

Braces +3 added lines, -2 removed lines

@@ -35,8 +35,9 @@
   }
 
   function hamleGet($key) {
-    if (!isset($this->data[$this->pos][$key]))
-      return "Missing Key [$key]";
+    if (!isset($this->data[$this->pos][$key])) {
+          return "Missing Key [$key]";
+    }
     return $this->data[$this->pos][$key];
   }
 

php/hamle/Hamle.php

Spacing +26 added lines, -26 removed lines

@@ -63,14 +63,14 @@ 
 
   public $baseModel;
 
-  const REL_CHILD = 0x01;  /* Child Relation */
+  const REL_CHILD = 0x01; /* Child Relation */
   const REL_PARENT = 0x02; /* Parent Relation */
-  const REL_ANY = 0x03;    /* Unspecified or any relation */
+  const REL_ANY = 0x03; /* Unspecified or any relation */
   
-  const SORT_NATURAL = 0x00;    /* Sort in what ever order is 'default' */
-  const SORT_ASCENDING = 0x02;  /* Sort Ascending */
+  const SORT_NATURAL = 0x00; /* Sort in what ever order is 'default' */
+  const SORT_ASCENDING = 0x02; /* Sort Ascending */
   const SORT_DESCENDING = 0x03; /* Sort Decending */
-  const SORT_RANDOM = 0x04;     /* Sort Randomly */
+  const SORT_RANDOM = 0x04; /* Sort Randomly */
   /**
    * Create new HAMLE Parser
    * 
@@ -81,22 +81,22 @@ 
    */
   function __construct($baseModel, $setup = NULL) {
     self::$me = $this;
-    if(!$setup)
+    if (!$setup)
       $setup = new Setup();
     $this->parse = new Parse();
-    if(!$setup instanceOf Setup)
+    if (!$setup instanceOf Setup)
       throw new Exception\Unsupported("Unsupported Setup Helper was passed, it must extends hamleSetup");
-    if(!$baseModel instanceOf Model)
-      throw new Exception\Unsupported("Unsupported Model(".get_class($baseModel).") Type was passed, it must implement hamleModel");
+    if (!$baseModel instanceOf Model)
+      throw new Exception\Unsupported("Unsupported Model(" . get_class($baseModel) . ") Type was passed, it must implement hamleModel");
     $this->setup = $setup;
     $this->baseModel = $baseModel;
     $this->initSnipFiles();
   }
 
   function initSnipFiles() {
-    if($this->snipMod == 0) {
+    if ($this->snipMod == 0) {
       $this->snipFiles = $this->setup->snippetFiles();
-      foreach($this->snipFiles as $f) {
+      foreach ($this->snipFiles as $f) {
         if (!file_exists($f)) throw new Exception\NotFound("Unable to find Snippet File ($f)");
         $this->snipFiles = max($this->snipFiles, filemtime($f));
       }
@@ -111,17 +111,17 @@ 
    */
   function load($hamleFile, \Closure $parseFunc = null) {
     $template = $this->setup->templatePath($hamleFile);
-      if(!file_exists($template)) 
+      if (!file_exists($template)) 
         throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
     $this->cacheFile = $this->setup->cachePath(
-                  str_replace("/","-",$hamleFile).".php");
+                  str_replace("/", "-", $hamleFile) . ".php");
     $this->setup->debugLog("Set cache file path to ({$this->cacheFile})");
-    $cacheFileAge = is_file($this->cacheFile)?filemtime($this->cacheFile):0;
+    $cacheFileAge = is_file($this->cacheFile) ? filemtime($this->cacheFile) : 0;
     $cacheDirty = !$this->cache ||
         $cacheFileAge < $this->snipMod || $cacheFileAge < filemtime($template);
-    if($cacheDirty) {
+    if ($cacheDirty) {
       $this->setup->debugLog("Parsing File ($template to {$this->cacheFile})");
-      $this->parse($parseFunc?"":file_get_contents($template), $parseFunc);
+      $this->parse($parseFunc ? "" : file_get_contents($template), $parseFunc);
     } else
       $this->setup->debugLog("Using Cached file ({$this->cacheFile})");
     return $this;
@@ -135,22 +135,22 @@ 
    * @throws Exception\ParseError if unable to write to the cache file
    */
   function parse($hamleCode, \Closure $parseFunc = null) {
-    if(!$this->cacheFile)
+    if (!$this->cacheFile)
         $this->cacheFile = $this->setup->cachePath("string.hamle.php");
-    if($parseFunc)
+    if ($parseFunc)
       $parseFunc($this->parse);
     else
       $this->parse->str($hamleCode);
     $this->setup->debugLog("Loading Snippet Files");
-    foreach($this->snipFiles as $snip)
+    foreach ($this->snipFiles as $snip)
       $this->parse->parseSnip(file_get_contents($snip));
     $this->setup->debugLog("Applying Snippet Files");
     $this->parse->applySnip();
     $this->setup->debugLog("Executing Parse Filters");
-    foreach($this->setup->getFilters() as $filter)
+    foreach ($this->setup->getFilters() as $filter)
       $this->parse->parseFilter($filter);
     $this->setup->debugLog("Updating Cache File ({$this->cacheFile})");
-    if(FALSE === file_put_contents($this->cacheFile, $this->parse->output()))
+    if (FALSE === file_put_contents($this->cacheFile, $this->parse->output()))
       throw new Exception\ParseError(
                       "Unable to write to cache file ({$this->cacheFile})");
   }
@@ -161,9 +161,9 @@ 
    */
   function string($hamleString) {
     $md5 = md5($hamleString);
-    $stringId = substr($md5,0,12).substr($md5,24,8);
+    $stringId = substr($md5, 0, 12) . substr($md5, 24, 8);
     $this->cacheFile = $this->setup->cachePath("string.$stringId.hamle.php");
-    if(!is_file($this->cacheFile))
+    if (!is_file($this->cacheFile))
       $this->parse($hamleString);
   }
 
@@ -179,9 +179,9 @@ 
       $baseModel = $this->baseModel;
       $this->baseModel = null;
       $currentModel = $baseModel == Scope::getTopScope();
-      if(!$currentModel && $baseModel) Scope::add($baseModel);
+      if (!$currentModel && $baseModel) Scope::add($baseModel);
       require $this->cacheFile;
-      if(!$currentModel && $baseModel) Scope::done();
+      if (!$currentModel && $baseModel) Scope::done();
       $this->baseModel = $baseModel;
       $out = ob_get_contents();
       ob_end_clean();
@@ -198,7 +198,7 @@ 
    * @return int The line number being passed by the parser
    */
   static function getLineNo() {
-    if(!isset(self::$me))
+    if (!isset(self::$me))
       return 0;
     return self::$me->parse->getLineNo();
   }

Braces +47 added lines, -29 removed lines

@@ -81,13 +81,16 @@ 
    */
   function __construct($baseModel, $setup = NULL) {
     self::$me = $this;
-    if(!$setup)
-      $setup = new Setup();
+    if(!$setup) {
+          $setup = new Setup();
+    }
     $this->parse = new Parse();
-    if(!$setup instanceOf Setup)
-      throw new Exception\Unsupported("Unsupported Setup Helper was passed, it must extends hamleSetup");
-    if(!$baseModel instanceOf Model)
-      throw new Exception\Unsupported("Unsupported Model(".get_class($baseModel).") Type was passed, it must implement hamleModel");
+    if(!$setup instanceOf Setup) {
+          throw new Exception\Unsupported("Unsupported Setup Helper was passed, it must extends hamleSetup");
+    }
+    if(!$baseModel instanceOf Model) {
+          throw new Exception\Unsupported("Unsupported Model(".get_class($baseModel).") Type was passed, it must implement hamleModel");
+    }
     $this->setup = $setup;
     $this->baseModel = $baseModel;
     $this->initSnipFiles();
@@ -97,7 +100,9 @@ 
     if($this->snipMod == 0) {
       $this->snipFiles = $this->setup->snippetFiles();
       foreach($this->snipFiles as $f) {
-        if (!file_exists($f)) throw new Exception\NotFound("Unable to find Snippet File ($f)");
+        if (!file_exists($f)) {
+          throw new Exception\NotFound("Unable to find Snippet File ($f)");
+        }
         $this->snipFiles = max($this->snipFiles, filemtime($f));
       }
     }
@@ -111,8 +116,9 @@ 
    */
   function load($hamleFile, \Closure $parseFunc = null) {
     $template = $this->setup->templatePath($hamleFile);
-      if(!file_exists($template)) 
-        throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
+      if(!file_exists($template)) {
+              throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
+      }
     $this->cacheFile = $this->setup->cachePath(
                   str_replace("/","-",$hamleFile).".php");
     $this->setup->debugLog("Set cache file path to ({$this->cacheFile})");
@@ -122,8 +128,9 @@ 
     if($cacheDirty) {
       $this->setup->debugLog("Parsing File ($template to {$this->cacheFile})");
       $this->parse($parseFunc?"":file_get_contents($template), $parseFunc);
-    } else
-      $this->setup->debugLog("Using Cached file ({$this->cacheFile})");
+    } else {
+          $this->setup->debugLog("Using Cached file ({$this->cacheFile})");
+    }
     return $this;
   }
   /**
@@ -135,24 +142,29 @@ 
    * @throws Exception\ParseError if unable to write to the cache file
    */
   function parse($hamleCode, \Closure $parseFunc = null) {
-    if(!$this->cacheFile)
-        $this->cacheFile = $this->setup->cachePath("string.hamle.php");
-    if($parseFunc)
-      $parseFunc($this->parse);
-    else
-      $this->parse->str($hamleCode);
+    if(!$this->cacheFile) {
+            $this->cacheFile = $this->setup->cachePath("string.hamle.php");
+    }
+    if($parseFunc) {
+          $parseFunc($this->parse);
+    } else {
+          $this->parse->str($hamleCode);
+    }
     $this->setup->debugLog("Loading Snippet Files");
-    foreach($this->snipFiles as $snip)
-      $this->parse->parseSnip(file_get_contents($snip));
+    foreach($this->snipFiles as $snip) {
+          $this->parse->parseSnip(file_get_contents($snip));
+    }
     $this->setup->debugLog("Applying Snippet Files");
     $this->parse->applySnip();
     $this->setup->debugLog("Executing Parse Filters");
-    foreach($this->setup->getFilters() as $filter)
-      $this->parse->parseFilter($filter);
+    foreach($this->setup->getFilters() as $filter) {
+          $this->parse->parseFilter($filter);
+    }
     $this->setup->debugLog("Updating Cache File ({$this->cacheFile})");
-    if(FALSE === file_put_contents($this->cacheFile, $this->parse->output()))
-      throw new Exception\ParseError(
+    if(FALSE === file_put_contents($this->cacheFile, $this->parse->output())) {
+          throw new Exception\ParseError(
                       "Unable to write to cache file ({$this->cacheFile})");
+    }
   }
 
   /**
@@ -163,8 +175,9 @@ 
     $md5 = md5($hamleString);
     $stringId = substr($md5,0,12).substr($md5,24,8);
     $this->cacheFile = $this->setup->cachePath("string.$stringId.hamle.php");
-    if(!is_file($this->cacheFile))
-      $this->parse($hamleString);
+    if(!is_file($this->cacheFile)) {
+          $this->parse($hamleString);
+    }
   }
 
   /**
@@ -179,9 +192,13 @@ 
       $baseModel = $this->baseModel;
       $this->baseModel = null;
       $currentModel = $baseModel == Scope::getTopScope();
-      if(!$currentModel && $baseModel) Scope::add($baseModel);
+      if(!$currentModel && $baseModel) {
+        Scope::add($baseModel);
+      }
       require $this->cacheFile;
-      if(!$currentModel && $baseModel) Scope::done();
+      if(!$currentModel && $baseModel) {
+        Scope::done();
+      }
       $this->baseModel = $baseModel;
       $out = ob_get_contents();
       ob_end_clean();
@@ -198,8 +215,9 @@ 
    * @return int The line number being passed by the parser
    */
   static function getLineNo() {
-    if(!isset(self::$me))
-      return 0;
+    if(!isset(self::$me)) {
+          return 0;
+    }
     return self::$me->parse->getLineNo();
   }
 

php/hamle/Text/Filter.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
   protected $s;
   protected $type;
 
+  /**
+   * @param string $s
+   */
   function __construct($s, $type = self::TOKEN_HTML) {
     $this->s = str_replace('\\$', "$", $s);
     $this->type = $type;

Braces +9 added lines, -6 removed lines

@@ -54,23 +54,26 @@
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHP() {
     $o = [$this->what->toPHPVar()] ;
-    foreach($this->vars as $v)
-      $o[] = $this->varToCode($v);
+    foreach($this->vars as $v) {
+          $o[] = $this->varToCode($v);
+    }
     return "{$this->filter}(" . implode(',',$o) . ")";
   }
 
   static function iterSplit($v, $sep = ",") {
     $o = [];
     foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+      if($i) {
+              $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+      }
     }
     return new WrapArray($o);
   }

Spacing +12 added lines, -12 removed lines

@@ -38,16 +38,16 @@ 
   protected $what;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
+    if (preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m[3]) ? explode(',', $m[3]) : [];
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(!in_array($this->filter, ['itersplit', 'newlinebr', 'round', 'strtoupper', 'strtolower', 'ucfirst'])) {
+    if (!in_array($this->filter, ['itersplit', 'newlinebr', 'round', 'strtoupper', 'strtolower', 'ucfirst'])) {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
-    switch($this->filter) {
+    switch ($this->filter) {
       case "itersplit":
         $this->filter = "Seufert\\Hamle\\Text\\Filter::iterSplit";
         break;
@@ -59,29 +59,29 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if ($escape)
+      return "<?=htmlspecialchars(" . $this->toPHP() . ")?>";
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHP() {
-    $o = [$this->what->toPHPVar()] ;
-    foreach($this->vars as $v)
+    $o = [$this->what->toPHPVar()];
+    foreach ($this->vars as $v)
       $o[] = $this->varToCode($v);
-    return "{$this->filter}(" . implode(',',$o) . ")";
+    return "{$this->filter}(" . implode(',', $o) . ")";
   }
 
   static function iterSplit($v, $sep = ",") {
     $o = [];
-    foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+    foreach (explode($sep, $v) as $k=>$i) {
+      if ($i)
+        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k, 'key'=>$k];
     }
     return new WrapArray($o);
   }
 
   static function newlineBr($v) {
-    return str_replace("\n","<br />\n",$v);
+    return str_replace("\n", "<br />\n", $v);
   }
 
 }
\ No newline at end of file

php/hamle/Tag/Control.php

Spacing +4 added lines, -4 removed lines

@@ -51,9 +51,9 @@ 
     $this->type = strtolower($tag);
     $this->var = "";
     if ($parentTag && $this->type == "else") {
-      if($parentTag instanceof H\Tag) {
+      if ($parentTag instanceof H\Tag) {
         $elseTag = $parentTag->tags[count($parentTag->tags) - 1];
-        if($elseTag instanceof H\Tag\Control &&
+        if ($elseTag instanceof H\Tag\Control &&
             in_array($elseTag->type, array('with', 'if'))
         ) {
           $elseTag->else = true;
@@ -101,8 +101,8 @@ 
         break;
       case "include":
         $file = $hsv->toHTML();
-        if($file[0] == "#")
-          $out .= "echo Hamle\\Run::includeFragment(".$hsv->toPHP().");";
+        if ($file[0] == "#")
+          $out .= "echo Hamle\\Run::includeFragment(" . $hsv->toPHP() . ");";
         else
           $out .= "echo Hamle\\Run::includeFile(" . $hsv->toPHP() . ");";
         break;

Braces +22 added lines, -16 removed lines

@@ -73,14 +73,16 @@ 
       $scopeName = $m[1];
       $lookup = substr($this->var, 0, strlen($this->var) - strlen($m[0]));
       $hsv = new H\Text(trim($lookup), H\Text::TOKEN_CONTROL);
-    } else
-      $hsv = new H\Text($this->var, H\Text::TOKEN_CONTROL);
+    } else {
+          $hsv = new H\Text($this->var, H\Text::TOKEN_CONTROL);
+    }
     switch ($this->type) {
       case "each":
-        if ($this->var)
-          $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
-        else
-          $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
+        if ($this->var) {
+                  $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
+        } else {
+                  $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
+        }
         $out .= "Hamle\\Scope::add({$this->o}); ";
         break;
       case "if":
@@ -88,9 +90,9 @@ 
         $out .= "if(" . $hsvcomp->toPHP() . ") {";
         break;
       case "with":
-        if ($scopeName)
-          $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
-        else {
+        if ($scopeName) {
+                  $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
+        } else {
           $out .= "if(({$this->o} = " . $hsv->toPHP() . ") && " .
               "{$this->o}->valid()) {\n";
           $out .= "Hamle\\Scope::add({$this->o});\n;";
@@ -101,10 +103,11 @@ 
         break;
       case "include":
         $file = $hsv->toHTML();
-        if($file[0] == "#")
-          $out .= "echo Hamle\\Run::includeFragment(".$hsv->toPHP().");";
-        else
-          $out .= "echo Hamle\\Run::includeFile(" . $hsv->toPHP() . ");";
+        if($file[0] == "#") {
+                  $out .= "echo Hamle\\Run::includeFragment(".$hsv->toPHP().");";
+        } else {
+                  $out .= "echo Hamle\\Run::includeFile(" . $hsv->toPHP() . ");";
+        }
         break;
     }
     return $out . ' ?>';
@@ -123,8 +126,9 @@ 
       case "each";
         $out .= 'Hamle\\Scope::done(); ';
         $out .= '}';
-        if (!$this->var)
-          $out .= "Hamle\\Scope::get()->rewind();\n";
+        if (!$this->var) {
+                  $out .= "Hamle\\Scope::get()->rewind();\n";
+        }
         break;
       case "if":
       case "else":
@@ -140,7 +144,9 @@ 
         return "";
         break;
     }
-    if ($this->else) $out .= "else{";
+    if ($this->else) {
+      $out .= "else{";
+    }
     return $out . ' ?>';
   }