cseufert / hamle

php/hamle/Setup.php

Braces +6 added lines, -3 removed lines

@@ -41,7 +41,9 @@ 
   public function cachePath($f) {

     $s = DIRECTORY_SEPARATOR;

     $dir = implode($s,[__DIR__,"..","..","cache",""]);

-    if(!is_dir($dir)) mkdir($dir);

+    if(!is_dir($dir)) {
+      mkdir($dir);
+    }
     return $dir.$f;

   }

 

@@ -67,8 +69,9 @@ 
    * @throws Exception\RunTime

    */

   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {

-    if(count($typeId) > 1)

-      throw new Exception\RunTime("Unable to open more than one ID at a time");

+    if(count($typeId) > 1) {
+          throw new Exception\RunTime("Unable to open more than one ID at a time");
+    }
     return new Model\Zero();

   }

 

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

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/Tag/Control.php

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 . ' ?>';
   }
 

php/hamle/Text/Func.php

Braces +38 added lines, -23 removed lines

@@ -43,10 +43,12 @@ 
    */
   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;
@@ -63,17 +65,24 @@ 
     $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();
+      }
     }
     //var_dump($att);
-    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;
   }
 
@@ -86,14 +95,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;
   }
 
@@ -118,17 +131,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 "";
   }
 

php/hamle/Text/Complex.php

Braces +22 added lines, -14 removed lines

@@ -39,21 +39,27 @@ 
       $s = substr($s,0,$pos);
     }
     $s = explode("->", $s);
-    if(count($s) == 1) $s = explode("-!",$s[0]);
-    if (!$s[0]) throw new ParseError("Unable to parse Complex Expression");
-    if ($s[0][1] == "(")
-      $this->func = new Text\Func($s[0]);
-    elseif ($s[0][1] == "[")
-      $this->func = new Text\Scope($s[0]);
-    else
-      $this->func = new SimpleVar($s[0]);
+    if(count($s) == 1) {
+      $s = explode("-!",$s[0]);
+    }
+    if (!$s[0]) {
+      throw new ParseError("Unable to parse Complex Expression");
+    }
+    if ($s[0][1] == "(") {
+          $this->func = new Text\Func($s[0]);
+    } elseif ($s[0][1] == "[") {
+          $this->func = new Text\Scope($s[0]);
+    } else {
+          $this->func = new SimpleVar($s[0]);
+    }
     array_shift($s);
     $this->sel = $s;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
   function toPHP() {
@@ -62,11 +68,13 @@ 
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
-      foreach ($this->sel as $s)
-        $sel[] = "hamleGet('$s')";
+      foreach ($this->sel as $s) {
+              $sel[] = "hamleGet('$s')";
+      }
       return $this->func->toPHP() . "->" . implode('->', $sel);
-    } else
-      return $this->func->toPHP();
+    } else {
+          return $this->func->toPHP();
+    }
   }
 
 }
\ No newline at end of file

php/hamle/Text/Filter.php

Braces +15 added lines, -10 removed lines

@@ -41,8 +41,9 @@ 
     if(preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m[3]) ? explode(',', $m[3]) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace(",",',',$v);
+      foreach($this->vars as $k=>$v) {
+              $this->vars[$k] = str_replace(",",',',$v);
+      }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
@@ -54,29 +55,33 @@ 
         $this->filter = "Seufert\\Hamle\\Text\\Filter::{$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 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);
   }

php/hamle/Scope.php

Braces +23 added lines, -14 removed lines

@@ -18,12 +18,14 @@ 
   static $namedScopes = array();

 

   static function add($model, $name = null) {

-    if (!$model instanceOf Model)

-      throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");

-    if ($name)

-      self::$namedScopes[$name] = $model;

-    else

-      self::$scopes[] = $model;

+    if (!$model instanceOf Model) {
+          throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");
+    }
+    if ($name) {
+          self::$namedScopes[$name] = $model;
+    } else {
+          self::$scopes[] = $model;
+    }
   }

 

   static function done() {

@@ -41,15 +43,21 @@ 
    */

   static function get($id = 0) {

     if (0 == $id) {

-      if ($scope = end(self::$scopes))

-        return $scope;

+      if ($scope = end(self::$scopes)) {
+              return $scope;
+      }
       throw new OutOfScope("Unable to find Scope ($id)");

     }

     $key = $id - 1;

-    if ($id < 0) $key = count(self::$scopes) + $id - 1;

-    if ($id == 0) $key = count(self::$scopes) - 1;

-    if (!isset(self::$scopes[$key]))

-      throw new OutOfScope("Unable to find Scope ($id) or $key");

+    if ($id < 0) {
+      $key = count(self::$scopes) + $id - 1;
+    }
+    if ($id == 0) {
+      $key = count(self::$scopes) - 1;
+    }
+    if (!isset(self::$scopes[$key])) {
+          throw new OutOfScope("Unable to find Scope ($id) or $key");
+    }
     return self::$scopes[$key];

   }

 

@@ -67,8 +75,9 @@ 
       self::$namedScopes[$name]->rewind();

       return self::$namedScopes[$name];

     } else

-      if(self::$returnZeroOnNoScope)

-        return new Model\Zero();

+      if(self::$returnZeroOnNoScope) {
+              return new Model\Zero();
+      }
       throw new RunTime("Unable to find scope ($name)");

   }

 

php/hamle/Text/FuncSub.php

Braces +16 added lines, -8 removed lines

@@ -38,17 +38,25 @@
    */
   function __construct($s) {
     $m = array();
-    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;
-    else $this->dir = Hamle\Hamle::REL_ANY;
+    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;
+    } else {
+      $this->dir = Hamle\Hamle::REL_ANY;
+    }
     $this->sortlimit = $this->attSortLimit($m[2]);
     $this->filt = $this->attIdTag($m[2]);
     $this->grouptype = $this->attGroupType($m[2]);
-    if ($this->filt['id']) throw new ParseError("Unable to select by id");
-    if (trim($m[3]))
-      $this->sub = new FuncSub($m[3]);
+    if ($this->filt['id']) {
+      throw new ParseError("Unable to select by id");
+    }
+    if (trim($m[3])) {
+          $this->sub = new FuncSub($m[3]);
+    }
   }
 
   /**