cseufert / hamle

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

php/hamle/Field/Memo.php

Spacing +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
   }
 
   function isClicked() {
-    return isset($_REQUEST[$this->form . "_" . $this->name]);
+    return isset($_REQUEST[$this->form."_".$this->name]);
   }
 }
\ No newline at end of file

php/hamle/Filter/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
   }
 
   static function filterText($s) {
-    return "/*<![CDATA[*/\n" .
+    return "/*<![CDATA[*/\n".
     /*preg_replace(HamlParser::MATCH_INTERPOLATION, '<?php echo \1; ?>', $text)*/
-    $s . "/*]]>*/";
+    $s."/*]]>*/";
   }
 }
\ No newline at end of file

php/hamle/Text/FormField.php

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
   }
 
   function toPHP() {
-    return '$form->getField(' . Text::varToCode($this->var) . ')->getValue()';
+    return '$form->getField('.Text::varToCode($this->var).')->getValue()';
   }
 
   function toHTML($escape = false) {
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
 }
\ No newline at end of file

php/hamle/Scope.php

Spacing +1 added lines, -1 removed lines

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

       return self::$namedScopes[$name];

     } else

-      if(self::$returnZeroOnNoScope)

+      if (self::$returnZeroOnNoScope)

         return new Model\Zero();

       throw new RunTime("Unable to find scope ($name)");

   }

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/Field/Button.php

Spacing +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
   }
 
   function isClicked() {
-    return isset($_REQUEST[$this->form . "_" . $this->name]);
+    return isset($_REQUEST[$this->form."_".$this->name]);
   }
 }
\ No newline at end of file

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;

   }

 

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

Spacing +5 added lines, -5 removed lines

@@ -36,17 +36,17 @@ 
   function __construct($s) {
     $m = [];
     //var_dump($s);
-    if(!preg_match('/\$\[(-?[0-9]+|[a-zA-Z][a-zA-Z0-9]+)\]/', $s, $m)) {
+    if (!preg_match('/\$\[(-?[0-9]+|[a-zA-Z][a-zA-Z0-9]+)\]/', $s, $m)) {
       throw new ParseError("Unable to match scope ($s)");
     }
     $this->scope = $m[1];
   }
 
   function toPHP() {
-    if(is_numeric($this->scope)) {
-      return "Hamle\\Scope::get(" . Text::varToCode($this->scope) . ")";
+    if (is_numeric($this->scope)) {
+      return "Hamle\\Scope::get(".Text::varToCode($this->scope).")";
     } else {
-      return "Hamle\\Scope::getName(" . Text::varToCode($this->scope) . ")";
+      return "Hamle\\Scope::getName(".Text::varToCode($this->scope).")";
     }
   }
 
@@ -60,7 +60,7 @@ 
 
 
   function getOrCreateModel(Model $parent = null) {
-    if(is_numeric($this->scope)) {
+    if (is_numeric($this->scope)) {
       return \Seufert\Hamle\Scope::get($this->scope);
     }
     return \Seufert\Hamle\Scope::getName($this->scope);