cseufert / hamle

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/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/Text/SimpleVar.php

Braces +6 added lines, -4 removed lines

@@ -44,8 +44,9 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
@@ -67,8 +68,9 @@ 
    */
   function setValue($value) {
     $model = $this->getOrCreateModel();
-    if(!$model instanceof WriteModel)
-      throw new \RuntimeException('Can only write to model that implements WriteModel');
+    if(!$model instanceof WriteModel) {
+          throw new \RuntimeException('Can only write to model that implements WriteModel');
+    }
     $model->hamleSet($this->var, $value);
     return $model;
   }

php/hamle/Run.php

Braces +8 added lines, -5 removed lines

@@ -54,10 +54,11 @@ 
    */

   static function popInstance() {

     array_pop(self::$hamleList);

-    if (self::$hamleList)

-      self::$hamle = self::$hamleList[count(self::$hamleList) - 1];

-    else

-      self::$hamle = NULL;

+    if (self::$hamleList) {
+          self::$hamle = self::$hamleList[count(self::$hamleList) - 1];
+    } else {
+          self::$hamle = NULL;
+    }
   }

 

   /**

@@ -113,7 +114,9 @@ 
    */

   static function modelId($id, $sort = [], $limit = 0, $offset = 0) {

     $o = self::$hamle->setup->getModelDefault($id, $sort, $limit, $offset);

-    if (!$o instanceOf Model) throw new RunTime("Application must return instance of hamleModel");

+    if (!$o instanceOf Model) {
+      throw new RunTime("Application must return instance of hamleModel");
+    }
     return $o;

   }

 

php/hamle/Text/FuncSub.php

Braces +22 added lines, -12 removed lines

@@ -39,17 +39,25 @@ 
    */
   public 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]);
+    }
   }
 
   /**
@@ -69,13 +77,15 @@ 
     $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(!$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)
-      return $this->sub->getOrCreateModel($model)->current();
+    if($this->sub) {
+          return $this->sub->getOrCreateModel($model)->current();
+    }
     return $model->current();
   }
 

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($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/Text/Func.php

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/Complex.php

Braces +31 added lines, -21 removed lines

@@ -43,20 +43,24 @@ 
     }
     $s = preg_split("/-[>!]/", $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 (!$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() {
@@ -65,18 +69,22 @@ 
   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();
+    }
   }
 
   function getOrCreateModel(Model $parent = null) {
-    if($this->func instanceof Text\Scope)
-      return $this->func->getOrCreateModel($parent);
-    if($this->func instanceof Text\Func)
-      return $this->func->getOrCreateModel($parent);
+    if($this->func instanceof Text\Scope) {
+          return $this->func->getOrCreateModel($parent);
+    }
+    if($this->func instanceof Text\Func) {
+          return $this->func->getOrCreateModel($parent);
+    }
     throw new RuntimeException('Unsupported func type encountered:'.get_class($this->func));
   }
 
@@ -85,11 +93,13 @@ 
    * @return WriteModel
    */
   function setValue($value) {
-    if(!$this->sel || count($this->sel) != 1)
-      throw new RuntimeException('Can only set values, when one var name is present');
+    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)
-      throw new RuntimeException('Can only set values on WriteModel, got '.get_class($model));
+    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;
   }