cseufert / hamle

php/hamle/Tag/Snippet.php

Braces +29 added lines, -18 removed lines

@@ -32,25 +32,33 @@ 
 
   function __construct($params) {
     parent::__construct();
-    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m))
-      throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
+    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m)) {
+          throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
+    }
     $this->type = $m[1];
-    if (isset($m[2]))
-      $this->path = explode(" ", $m[2]);
-    else
-      $this->path = array();
-    foreach ($this->path as $k => $v)
-      $this->path[$k] = self::decodeClassId($v);
+    if (isset($m[2])) {
+          $this->path = explode(" ", $m[2]);
+    } else {
+          $this->path = array();
+    }
+    foreach ($this->path as $k => $v) {
+          $this->path[$k] = self::decodeClassId($v);
+    }
   }
 
   static function decodeClassId($s) {
     $out = $m = array();
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
-      $out['type'] = $m[0];
+    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m)) {
+          $out['type'] = $m[0];
+    }
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
-    if (isset($m[0])) foreach ($m[0] as $ss) {
+    if (isset($m[0])) {
+      foreach ($m[0] as $ss) {
       if ($s[0] == "#") $out['id'] = substr($ss, 1);
-      if ($s[0] == ".") $out['class'][] = substr($ss, 1);
+    }
+      if ($s[0] == ".") {
+        $out['class'][] = substr($ss, 1);
+      }
     }
     return $out;
   }
@@ -62,21 +70,24 @@ 
   function addSnipContent($contentTag, &$tagArray = array(), $key = 0) {
     if ($this->type == "content") {
       $tagArray[$key] = $contentTag;
-    } else
-      parent::addSnipContent($contentTag, $tagArray, $key);
+    } else {
+          parent::addSnipContent($contentTag, $tagArray, $key);
+    }
   }
 
   function apply(Hamle\Tag $rootTag) {
     if ($this->type == "append" or $this->type == "prepend") {
       $matchTags = $rootTag->find($this->path);
-      foreach ($matchTags as $tag)
-        foreach ($this->tags as $t) {
+      foreach ($matchTags as $tag) {
+              foreach ($this->tags as $t) {
           $tag->addChild($t, $this->type);
+      }
         }
     } elseif ($this->type == "replace") {
       $rootTag->replace($this->path, $this);
-    } else
-      throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
+    } else {
+          throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
+    }
   }
 
 }
\ No newline at end of file

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

php/hamle/Parse.php

Braces +61 added lines, -41 removed lines

@@ -109,22 +109,25 @@ 
     $revSnip = array();

     /** @var Tag[] $roots */

     $roots = array();

-    foreach ($this->root as $snip)

-      if ($snip instanceOf Tag\Snippet) {

+    foreach ($this->root as $snip) {
+          if ($snip instanceOf Tag\Snippet) {

         if ($snip->getType() == "append") {

-          array_unshift($revSnip, $snip);

+          array_unshift($revSnip, $snip);
+    }
         } else {

           $fwdSnip[] = $snip;

         }

       } else {

         $roots[] = $snip;

       }

-    foreach ($fwdSnip as $snip)

-      foreach ($roots as $root)

-        $snip->apply($root);

-    foreach ($revSnip as $snip)

-      foreach ($roots as $root)

-        $snip->apply($root);

+    foreach ($fwdSnip as $snip) {
+          foreach ($roots as $root)

+        $snip->apply($root);
+    }
+    foreach ($revSnip as $snip) {
+          foreach ($roots as $root)

+        $snip->apply($root);
+    }
     $this->root = $roots;

   }

 

@@ -143,9 +146,11 @@ 
     $heir = array();

     while ($this->lineNo < $this->lineCount) {

       $line = $this->lines[$this->lineNo];

-      if (trim($line)) if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {

+      if (trim($line)) {
+        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {

         if (FALSE !== strpos($m[1], "\t"))

-          throw new ParseError("Tabs are not supported in templates at this time");

+          throw new ParseError("Tabs are not supported in templates at this time");
+      }
         $indent = strlen($m[1]);

         $tag = isset($m[2]) ? $tag = $m[2] : "";

         $classid = isset($m[3]) ? $m[3] : "";

@@ -157,13 +162,13 @@ 
         unset($m[0]);

         switch (strlen($code) ? $code[0] : ($textcode ? $textcode : "")) {

           case "|": //Control Tag

-            if ($code == "|snippet")

-              $hTag = new Tag\Snippet($text);

-            elseif ($code == "|form")

-              $hTag = new Tag\Form($text);

-            elseif ($code == "|formhint")

-              $hTag = new Tag\FormHint();

-            elseif ($code == "|else") {

+            if ($code == "|snippet") {
+                          $hTag = new Tag\Snippet($text);
+            } elseif ($code == "|form") {
+                          $hTag = new Tag\Form($text);
+            } elseif ($code == "|formhint") {
+                          $hTag = new Tag\FormHint();
+            } elseif ($code == "|else") {

               $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);

               $hTag->setVar($text);

             } else {

@@ -174,8 +179,9 @@ 
           case ":": //Filter Tag

             $hTag = new Tag\Filter(substr($code, 1));

             $hTag->addContent($text, Text::TOKEN_CODE);

-            foreach ($this->consumeBlock($indent) as $l)

-              $hTag->addContent($l, Text::TOKEN_CODE);

+            foreach ($this->consumeBlock($indent) as $l) {
+                          $hTag->addContent($l, Text::TOKEN_CODE);
+            }
             break;

           case "_": //String Tag

           case "__": //Unescape String Tag

@@ -186,8 +192,9 @@ 
           case "//": // Non Printed Comment

             $hTag = new Tag\Comment($textcode);

             $hTag->addContent($text);

-            foreach ($this->consumeBlock($indent) as $l)

-              $hTag->addContent($l, Text::TOKEN_CODE);

+            foreach ($this->consumeBlock($indent) as $l) {
+                          $hTag->addContent($l, Text::TOKEN_CODE);
+            }
             break;

           default:

             $attr = array();

@@ -199,25 +206,34 @@ 
             }

             $class = array(); $id = ""; $ref = "";

             preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);

-            if (isset($cid[0])) foreach ($cid[0] as $s) {

-              if ($s[0] == "#") $id = substr($s, 1);

-              if ($s[0] == ".") $class[] = substr($s, 1);

-              if ($s[0] == "!") $ref = substr($s, 1);

+            if (isset($cid[0])) {
+              foreach ($cid[0] as $s) {

+              if ($s[0] == "#") $id = substr($s, 1);
+            }
+              if ($s[0] == ".") {
+                $class[] = substr($s, 1);
+              }
+              if ($s[0] == "!") {
+                $ref = substr($s, 1);
+              }
             }

-            if($ref)

-              $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);

-            else

-              $hTag = new Tag\Html($tag, $class, $attr, $id);

+            if($ref) {
+                          $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
+            } else {
+                          $hTag = new Tag\Html($tag, $class, $attr, $id);
+            }
             $hTag->addContent($text);

             break;

         }

         $heir[$i] = $hTag;

-        if ($i > 0)

-          $heir[$i - 1]->addChild($hTag);

-        else

-          $this->root[] = $hTag;

-      } else

-        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());

+        if ($i > 0) {
+                  $heir[$i - 1]->addChild($hTag);
+        } else {
+                  $this->root[] = $hTag;
+        }
+      } else {
+              throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+      }
       $this->lineNo++;

     }

   }

@@ -233,8 +249,9 @@ 
 

   function output($minify = false) {

     $out = "<?php\nuse Seufert\\Hamle;\n?>";

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

-      $out .= $tag->render(0, $minify);

+    foreach ($this->root as $tag) {
+          $out .= $tag->render(0, $minify);
+    }
     return $out;

 

   }

@@ -246,15 +263,18 @@ 
         (!trim($this->lines[$this->lineNo + 1]) ||

             preg_match('/^(\s){' . $indent . '}((\s)+[^\s].*)$/',

                 $this->lines[$this->lineNo + 1], $m))) {

-      if (trim($this->lines[$this->lineNo + 1]))

-        $out[] = $m[2];

+      if (trim($this->lines[$this->lineNo + 1])) {
+              $out[] = $m[2];
+      }
       $this->lineNo++;

     }

     return $out;

   }

 

   function indentLevel($indent) {

-    if (!isset($this->indents)) $this->indents = array();

+    if (!isset($this->indents)) {
+      $this->indents = array();
+    }
     if (!count($this->indents)) {

       $this->indents = array(0 => $indent);

       // Key = indent level, Value = Depth in spaces