cseufert / hamle

php/hamle/Text/Func.php

Spacing +19 added lines, -19 removed lines

@@ -50,7 +50,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 \$ func in '$s'");
     if (trim($m[2]))
       $this->sub = new FuncSub($m[2]);
@@ -92,13 +92,13 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
+      foreach ($m[0] as $k=>$mv)
         if ($m[2][$k]) {
-          $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+          $dir = $m[1][$k] == "-" ?Hamle\Hamle::SORT_DESCENDING : Hamle\Hamle::SORT_ASCENDING;
           $att['sort'][$m[2][$k]] = $dir;
         } else $rand = true;
     }
-    if($rand)
+    if ($rand)
       $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
@@ -116,25 +116,25 @@ 
    * @return string PHP Code
    */
   public function toPHP() {
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    if($this->scope instanceof Scope) {
-      return $this->scope->toPHP() . $sub;
-    } elseif($this->scope === true) {
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    if ($this->scope instanceof Scope) {
+      return $this->scope->toPHP().$sub;
+    } elseif ($this->scope === true) {
       return "Hamle\\Scope::get(0)$sub";
     }
-    $limit = Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
+    $limit = Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'];
     if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
-      Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+      return "Hamle\\Run::modelTypeTags(".
+      Text::varToCode($this->filt['tag']).",$limit)$sub";
     if (count($this->filt['id']))
       if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
-        return "Hamle\\Run::modelId(" .
-        Text::varToCode(current($this->filt['id']['*'])) .
+        return "Hamle\\Run::modelId(".
+        Text::varToCode(current($this->filt['id']['*'])).
         ",$limit)$sub";
       else
-        return "Hamle\\Run::modelTypeId(" .
-        Text::varToCode($this->filt['id']) . ",$limit)$sub";
+        return "Hamle\\Run::modelTypeId(".
+        Text::varToCode($this->filt['id']).",$limit)$sub";
     return "";
   }
 
@@ -143,7 +143,7 @@ 
    * @return Model
    */
   public function getOrCreateModel(Model $parent = null) {
-    if($this->scope instanceof Scope) {
+    if ($this->scope instanceof Scope) {
       $parent = $this->scope->getOrCreateModel();
     } elseif ($this->scope === true)
       $parent = \Seufert\Hamle\Scope::get(0);
@@ -169,9 +169,9 @@ 
           $this->sortlimit['limit'],
           $this->sortlimit['offset']
         );
-    if($this->sub)
+    if ($this->sub)
       return $this->sub->getOrCreateModel($parent)->current();
-    if(!$parent)
+    if (!$parent)
       throw new \RuntimeException('Unable to create model with no relation');
     return $parent->current();
   }

Braces +55 added lines, -35 removed lines

@@ -50,10 +50,12 @@ 
    */
   public function __construct($s) {
     $m = array();
-    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m))
-      throw new ParseError("Unable to read \$ func in '$s'");
-    if (trim($m[2]))
-      $this->sub = new FuncSub($m[2]);
+    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m)) {
+          throw new ParseError("Unable to read \$ func in '$s'");
+    }
+    if (trim($m[2])) {
+          $this->sub = new FuncSub($m[2]);
+    }
     if (!trim($m[1])) {
       $this->scope = true;
       return;
@@ -70,16 +72,23 @@ 
     $m = array();
     $att = array('id' => array(), 'tag' => array());
     foreach (explode(",", $s) as $str) {
-      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) $type = $m[0];
-      else $type = "*";
-      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) $att['id'][$type][] = $m[1];
-      elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m))
-        foreach ($m[1] as $tag)
+      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) {
+        $type = $m[0];
+      } else {
+        $type = "*";
+      }
+      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) {
+        $att['id'][$type][] = $m[1];
+      } elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m)) {
+              foreach ($m[1] as $tag)
           $att['tag'][$type][] = new Text($tag, Text::TOKEN_CODE);
-      else $att['tag'][$type] = array();
+      } else {
+        $att['tag'][$type] = array();
+      }
+    }
+    if (!(count($att['id']) xor count($att['tag']))) {
+          throw new ParseError("Only tag, type or id can be combined");
     }
-    if (!(count($att['id']) xor count($att['tag'])))
-      throw new ParseError("Only tag, type or id can be combined");
     return $att;
   }
 
@@ -92,14 +101,18 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
-        if ($m[2][$k]) {
+      foreach($m[0] as $k=>$mv) {
+              if ($m[2][$k]) {
           $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+      }
           $att['sort'][$m[2][$k]] = $dir;
-        } else $rand = true;
+        } else {
+          $rand = true;
+        }
+    }
+    if($rand) {
+          $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     }
-    if($rand)
-      $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
 
@@ -124,17 +137,19 @@ 
     }
     $limit = Text::varToCode($this->sortlimit['sort']) . "," .
         $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
-    if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
+    if (count($this->filt['tag'])) {
+          return "Hamle\\Run::modelTypeTags(" .
       Text::varToCode($this->filt['tag']) . ",$limit)$sub";
-    if (count($this->filt['id']))
-      if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
+    }
+    if (count($this->filt['id'])) {
+          if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
         return "Hamle\\Run::modelId(" .
         Text::varToCode(current($this->filt['id']['*'])) .
         ",$limit)$sub";
-      else
-        return "Hamle\\Run::modelTypeId(" .
+    } else {
+              return "Hamle\\Run::modelTypeId(" .
         Text::varToCode($this->filt['id']) . ",$limit)$sub";
+      }
     return "";
   }
 
@@ -145,34 +160,39 @@ 
   public function getOrCreateModel(Model $parent = null) {
     if($this->scope instanceof Scope) {
       $parent = $this->scope->getOrCreateModel();
-    } elseif ($this->scope === true)
-      $parent = \Seufert\Hamle\Scope::get(0);
-    if ($this->filt && count($this->filt['tag']))
-      $parent = \Seufert\Hamle\Run::modelTypeTags(
+    } elseif ($this->scope === true) {
+          $parent = \Seufert\Hamle\Scope::get(0);
+    }
+    if ($this->filt && count($this->filt['tag'])) {
+          $parent = \Seufert\Hamle\Run::modelTypeTags(
         $this->filt['tag'],
         $this->sortlimit['sort'],
         $this->sortlimit['limit'],
         $this->sortlimit['offset']
       );
-    if ($this->filt && count($this->filt['id']))
-      if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) === 1)
+    }
+    if ($this->filt && count($this->filt['id'])) {
+          if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) === 1)
         $parent = \Seufert\Hamle\Run::modelId(
           current($this->filt['id']['*']),
             $this->sortlimit['sort'],
             $this->sortlimit['limit'],
             $this->sortlimit['offset']
             );
-      else
-        $parent = \Seufert\Hamle\Run::modelTypeId(
+    } else {
+              $parent = \Seufert\Hamle\Run::modelTypeId(
           $this->filt['id'],
           $this->sortlimit['sort'],
           $this->sortlimit['limit'],
           $this->sortlimit['offset']
         );
-    if($this->sub)
-      return $this->sub->getOrCreateModel($parent)->current();
-    if(!$parent)
-      throw new \RuntimeException('Unable to create model with no relation');
+      }
+    if($this->sub) {
+          return $this->sub->getOrCreateModel($parent)->current();
+    }
+    if(!$parent) {
+          throw new \RuntimeException('Unable to create model with no relation');
+    }
     return $parent->current();
   }
 

php/hamle/Text/Filter.php

Spacing +21 added lines, -21 removed lines

@@ -41,47 +41,47 @@ 
   protected $chained;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
+    if (preg_match("/^([a-z]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
-      if(isset($m['chained']) && strlen($m['chained'])) {
-        $this->chained = new Filter($m['chained'],$what);
+      foreach ($this->vars as $k=>$v)
+        $this->vars[$k] = str_replace("&comma;", ',', $v);
+      if (isset($m['chained']) && strlen($m['chained'])) {
+        $this->chained = new Filter($m['chained'], $what);
       }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(method_exists(Filter::class, $this->filter)) {
+    if (method_exists(Filter::class, $this->filter)) {
       $this->filter = "Seufert\\Hamle\\Text\\Filter::{$this->filter}";
-    } elseif(!in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst', 'json'])) {
+    } elseif (!in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst', 'json'])) {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
     $mapFilter = ['json'=>'json_encode'];
-    if(isset($mapFilter[$this->filter]))
+    if (isset($mapFilter[$this->filter]))
       $this->filter = $mapFilter[$this->filter];
     $this->what = $what;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
+    if ($this->chained)
       $pre = $this->chained->toPHPpre();
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
+    if ($this->chained)
       $post = $this->chained->toPHPpost();
     $o = '';
-    foreach($this->vars as $v)
+    foreach ($this->vars as $v)
       $o .= ','.$this->varToCode($v);
     return "$o)$post";
   }
@@ -96,24 +96,24 @@ 
 
   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);
   }
 
   static function replace($v, $src, $dst) {
-    return str_replace($src,$dst,$v);
+    return str_replace($src, $dst, $v);
   }
 
   static function ascents($v) {
-    $v = str_replace(['$',' ',','],'', $v);
-    return (int) round($v * 100,0);
+    $v = str_replace(['$', ' ', ','], '', $v);
+    return (int) round($v * 100, 0);
   }
 
 }
\ No newline at end of file

Braces +21 added lines, -14 removed lines

@@ -44,8 +44,9 @@ 
     if(preg_match("/^([a-z]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
+      foreach($this->vars as $k=>$v) {
+              $this->vars[$k] = str_replace("&comma;",',',$v);
+      }
       if(isset($m['chained']) && strlen($m['chained'])) {
         $this->chained = new Filter($m['chained'],$what);
       }
@@ -58,31 +59,36 @@ 
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
     $mapFilter = ['json'=>'json_encode'];
-    if(isset($mapFilter[$this->filter]))
-      $this->filter = $mapFilter[$this->filter];
+    if(isset($mapFilter[$this->filter])) {
+          $this->filter = $mapFilter[$this->filter];
+    }
     $this->what = $what;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
-      $pre = $this->chained->toPHPpre();
+    if($this->chained) {
+          $pre = $this->chained->toPHPpre();
+    }
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
-      $post = $this->chained->toPHPpost();
+    if($this->chained) {
+          $post = $this->chained->toPHPpost();
+    }
     $o = '';
-    foreach($this->vars as $v)
-      $o .= ','.$this->varToCode($v);
+    foreach($this->vars as $v) {
+          $o .= ','.$this->varToCode($v);
+    }
     return "$o)$post";
   }
 
@@ -97,8 +103,9 @@ 
   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);
   }

php/hamle/Hamle.php

Spacing +25 added lines, -25 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,12 +81,12 @@ 
    */
   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)
+    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;
@@ -94,9 +94,9 @@ 
   }
 
   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($this->setup->getMinify())))
+    if (FALSE === file_put_contents($this->cacheFile, $this->parse->output($this->setup->getMinify())))
       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);
   }
 
@@ -183,9 +183,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();
@@ -202,7 +202,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($this->setup->getMinify())))
-      throw new Exception\ParseError(
+    if(FALSE === file_put_contents($this->cacheFile, $this->parse->output($this->setup->getMinify()))) {
+          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);
+    }
   }
 
   function getCacheFileName() {
@@ -183,9 +196,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();
@@ -202,8 +219,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/Tag/Control.php

Spacing +13 added lines, -13 removed lines

@@ -47,13 +47,13 @@ 
    */
   function __construct($tag, $parentTag = null) {
     parent::__construct();
-    $this->o = "\$o" . self::$instCount++;
+    $this->o = "\$o".self::$instCount++;
     $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;
@@ -67,7 +67,7 @@ 
   }
 
   function renderStTag() {
-    $out = "<" . "?php ";
+    $out = "<"."?php ";
     $scopeName = "";
     if (preg_match('/ as ([a-zA-Z]+)$/', $this->var, $m)) {
       $scopeName = $m[1];
@@ -78,20 +78,20 @@ 
     switch ($this->type) {
       case "each":
         if ($this->var)
-          $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
+          $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":
         $hsvcomp = new H\Text\Comparison($this->var);
-        $out .= "if(" . $hsvcomp->toPHP() . ") {";
+        $out .= "if(".$hsvcomp->toPHP().") {";
         break;
       case "with":
         if ($scopeName)
-          $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
+          $out .= "Hamle\\Scope::add(".$hsv->toPHP().", \"$scopeName\");\n;";
         else {
-          $out .= "if(({$this->o} = " . $hsv->toPHP() . ") && " .
+          $out .= "if(({$this->o} = ".$hsv->toPHP().") && ".
               "{$this->o}->valid()) {\n";
           $out .= "Hamle\\Scope::add({$this->o});\n;";
         }
@@ -101,13 +101,13 @@ 
         break;
       case "include":
         $file = $hsv->toHTML();
-        if($file[0] == "#")
+        if ($file[0] == "#")
           $out .= "echo Hamle\\Run::includeFragment(".$hsv->toPHP().");";
         else
-          $out .= "echo Hamle\\Run::includeFile(" . $hsv->toPHP() . ");";
+          $out .= "echo Hamle\\Run::includeFile(".$hsv->toPHP().");";
         break;
     }
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   /**
@@ -118,7 +118,7 @@ 
   }
 
   function renderEnTag() {
-    $out = '<' . '?php ';
+    $out = '<'.'?php ';
     switch ($this->type) {
       case "each";
         $out .= 'Hamle\\Scope::done(); ';
@@ -141,7 +141,7 @@ 
         break;
     }
     if ($this->else) $out .= "else{";
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   function render($indent = 0, $minify = false) {

Braces +28 added lines, -19 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 . "\n?>";
@@ -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 . "\n?>";
   }
 
@@ -148,9 +154,12 @@ 
     $ind = $minify ? '' : str_pad('', $indent);
     $oneliner = (!(count($this->content) > 1 || $this->tags));
     $out = $this->renderStTag();
-    if ($this->content) $out .= $this->renderContent($ind, $oneliner || $minify);
-    foreach ($this->tags as $tag)
-      $out .= $tag->render($indent, $minify);
+    if ($this->content) {
+      $out .= $this->renderContent($ind, $oneliner || $minify);
+    }
+    foreach ($this->tags as $tag) {
+          $out .= $tag->render($indent, $minify);
+    }
     $out .= $this->renderEnTag();
     return $out;
   }

php/hamle/Tag.php

Spacing +3 added lines, -3 removed lines

@@ -143,11 +143,11 @@ 
   function render($indent = 0, $minify = false) {

     $ind = $minify ? '' : str_pad('', $indent);

     $oneliner = (!(count($this->content) > 1 || $this->tags));

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

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

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

     foreach ($this->tags as $tag)

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

-    $out .= ($minify || $oneliner ? '' : $ind) . $this->renderEnTag() . ($minify ? '' : "\n");

+    $out .= ($minify || $oneliner ? '' : $ind).$this->renderEnTag().($minify ? '' : "\n");

     return $out;

   }

 

@@ -161,7 +161,7 @@ 
   function renderContent($pad = "", $oneliner = false) {

     $out = "";

     foreach ($this->content as $c)

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

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

     return $out;

   }

 

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;
+    }
   }

 

   /**

@@ -144,9 +152,12 @@ 
     $ind = $minify ? '' : str_pad('', $indent);

     $oneliner = (!(count($this->content) > 1 || $this->tags));

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

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

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

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

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

     return $out;

   }

@@ -160,8 +171,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;

   }