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

   }

 

Spacing +3 added lines, -3 removed lines

@@ -144,11 +144,11 @@ 
     //if(strtoupper($this->type) == "A") var_dump($this);

     $ind = $doIndent ? str_pad("", $indent, " ") : "";

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

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

+    $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);

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

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

     return $out;

   }

 

@@ -162,7 +162,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;

   }

 

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

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 
   function getValue() {
     if (!is_null($this->setValue)) return $this->setValue;
-    if (isset($_REQUEST[$this->form . "__submit"]))
-      return isset($_REQUEST[$this->form . "_" . $this->name]);
+    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

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

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

php/hamle/Parse.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 

  */

 namespace Seufert\Hamle;

-use Seufert\Hamle\Exception\ParseError;

-use Seufert\Hamle\Parse\Filter as ParseFilter;

+use Seufert\Hamle\Exception\ParseError;
+use Seufert\Hamle\Parse\Filter as ParseFilter;
 use Seufert\Hamle\Text;

 

 /**

Doc Comments +12 added lines

@@ -92,6 +92,9 @@ 
     }

   }

 

+  /**
+   * @param string $s
+   */
   function parseSnip($s) {

     //save root tags

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

@@ -223,6 +226,9 @@ 
     }

   }

 

+  /**
+   * @param string $qs
+   */
   function parseQueryString($qs) {

     $out = [];

     foreach(explode('&',$qs) as $s) {

@@ -240,6 +246,9 @@ 
 

   }

 

+  /**
+   * @param integer $indent
+   */
   function consumeBlock($indent) {

     $out = array();

     $m = array();

@@ -254,6 +263,9 @@ 
     return $out;

   }

 

+  /**
+   * @param integer $indent
+   */
   function indentLevel($indent) {

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

     if (!count($this->indents)) {

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;

   }

 

@@ -144,9 +147,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] : "";

@@ -158,13 +163,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($text);

-            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($text);
+            } elseif ($code == "|else") {

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

               $hTag->setVar($text);

             } else {

@@ -175,8 +180,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

@@ -187,8 +193,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();

@@ -201,25 +208,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++;

     }

   }

@@ -235,8 +251,9 @@ 
 

   function output() {

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

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

-      $out .= $tag->render();

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

 

   }

@@ -248,15 +265,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

Spacing +10 added lines, -10 removed lines

@@ -157,7 +157,7 @@ 
         $i = self::indentLevel($indent);

         unset($m[0]);

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

-          case "|": //Control Tag

+          case "|" : //Control Tag

             if ($code == "|snippet")

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

             elseif ($code == "|form")

@@ -192,10 +192,10 @@ 
             break;

           default:

             $attr = array();

-            if(isset($params[0]) && $params[0] == "[") {

+            if (isset($params[0]) && $params[0] == "[") {

               $param = substr($params, 1, strlen($params) - 2);

-              $param = str_replace('+','%2B', $param);

-              $param = str_replace('\\&','%26', $param);

+              $param = str_replace('+', '%2B', $param);

+              $param = str_replace('\\&', '%26', $param);

 //              parse_str($param, $attr);

               $attr = $this->parseQueryString($param);

             }

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

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

             }

-            if($ref)

+            if ($ref)

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

             else

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

@@ -219,16 +219,16 @@ 
         else

           $this->root[] = $hTag;

       } else

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

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

       $this->lineNo++;

     }

   }

 

   function parseQueryString($qs) {

     $out = [];

-    foreach(explode('&',$qs) as $s) {

-      $kv = explode('=',$s,2);

-      $out[urldecode($kv[0])] = isset($kv[1])?urldecode($kv[1]):null;

+    foreach (explode('&', $qs) as $s) {

+      $kv = explode('=', $s, 2);

+      $out[urldecode($kv[0])] = isset($kv[1]) ?urldecode($kv[1]) : null;

     }

     return $out;

   }

@@ -246,7 +246,7 @@ 
     $m = array();

     while ($this->lineNo + 1 < $this->lineCount &&

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

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

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

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

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

         $out[] = $m[2];

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

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 . ' ?>';
+    return $out.' ?>';
   }
 
   /**
@@ -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 . ' ?>';
+    return $out.' ?>';
   }
 
   function render($indent = 0, $doIndent = true) {

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

Spacing +16 added lines, -16 removed lines

@@ -43,7 +43,7 @@ 
    */
   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]);
@@ -86,13 +86,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;
   }
@@ -110,25 +110,25 @@ 
    * @return string PHP Code
    */
   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 "";
   }
 

php/hamle/Exception/ParseError.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
   function __construct($message = "", $code = 0, $previous = NULL) {
     ///@todo  Include Line number & file name within parse error exceptions
-    $message .= ", on line " . Hamle\Hamle::getLineNo() . " in file ?.hamle";
+    $message .= ", on line ".Hamle\Hamle::getLineNo()." in file ?.hamle";
     parent::__construct($message, $code, $previous);
   }