cseufert / hamle

php/hamle/Tag/Comment.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
   function renderContent($pad = "", $oneliner = false) {
     if ($this->commentstyle == "HTML")
       if (count($this->content) > 1)
-        return $pad . "  " . implode("\n$pad", $this->content) . "\n";
+        return $pad."  ".implode("\n$pad", $this->content)."\n";
       else
         return current($this->content);
     return "";

php/hamle/Tag/Form.php

Spacing +6 added lines, -6 removed lines

@@ -61,7 +61,7 @@ 
     foreach ($labelTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source]))
+          if (isset($fields[$source]))
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
           else
             $tag->opt['style'] = "display:none;";
@@ -70,7 +70,7 @@ 
     foreach ($inputTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source]))
+          if (isset($fields[$source]))
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
           else
             $tag->opt['style'] = "display:none;";
@@ -79,7 +79,7 @@ 
     foreach ($inputTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source])) {
+          if (isset($fields[$source])) {
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
             unset($fields[$source]);
           } else
@@ -87,13 +87,13 @@ 
         }
     foreach ($fields as $n => $f) {
       if (!$f instanceOf Button) {
-        $this->addChild($label = new DynHtml("label", [],[],"",$n));
+        $this->addChild($label = new DynHtml("label", [], [], "", $n));
         $f->getLabelAttStatic($label->opt, $label->type, $label->content);
       }
-      $this->addChild($input = new DynHtml("input", [],[],"",$n));
+      $this->addChild($input = new DynHtml("input", [], [], "", $n));
       $f->getInputAttStatic($input->opt, $input->type, $input->content);
     }
-    return "<form " . implode(" ", $out) . "><?php \$form = " . $this->var->toPHP() . "; \$form->process(); ?>";
+    return "<form ".implode(" ", $out)."><?php \$form = ".$this->var->toPHP()."; \$form->process(); ?>";
   }
 
   function renderEnTag() {

php/hamle/Tag/DynHtml.php

Spacing +9 added lines, -9 removed lines

@@ -38,14 +38,14 @@ 
     $this->source[] = $ref;
     $this->baseType = $tag;
     self::$var++;
-    $this->varname = "\$dynhtml" . self::$var;
+    $this->varname = "\$dynhtml".self::$var;
   }
 
   function render($indent = 0, $doIndent = true) {
     $data = H\Text::varToCode(array("base" => $this->baseType, "type" => $this->type, "opt" => $this->opt, "source" => $this->source, "content" => $this->content));
-    $out = "<?php " . $this->varname . "=$data; echo Hamle\\Tag\\DynHtml::toStTag(" . $this->varname . ",\$form).";
-    $out .= "implode(\"\\n\"," . $this->varname . "['content']).";
-    $out .= "Hamle\\Tag\\DynHtml::toEnTag(" . $this->varname . ",\$form)?>\n";
+    $out = "<?php ".$this->varname."=$data; echo Hamle\\Tag\\DynHtml::toStTag(".$this->varname.",\$form).";
+    $out .= "implode(\"\\n\",".$this->varname."['content']).";
+    $out .= "Hamle\\Tag\\DynHtml::toEnTag(".$this->varname.",\$form)?>\n";
     return $out;
   }
 
@@ -57,21 +57,21 @@ 
     foreach ($d["source"] as $source) {
       $form->getField($source)->getDynamicAtt($d['base'], $d['opt'], $d['type'], $d['content']);
     }
-    $out = "<" . $d['type'] . " ";
+    $out = "<".$d['type']." ";
     foreach ($d['opt'] as $k => $v) {
       if (is_array($v)) {
         foreach ($v as $k2 => $v2)
-          if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
+          if ($v[$k2] instanceof Text) $v[$k2] = eval('return '.$v[$k2]->toPHP().';');
         $v = implode(" ", $v);
       }
-      if ($v instanceOf H\Text) $v = eval('return ' . $v->toPHP() . ';');
-      $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
+      if ($v instanceOf H\Text) $v = eval('return '.$v->toPHP().';');
+      $out .= $k."=\"".htmlspecialchars($v)."\" ";
     }
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";
     return $out;
   }
 
   static function toEnTag($d, $form) {
-    return in_array($d['type'], self::$selfCloseTags) ? "" : "</" . $d['type'] . ">";
+    return in_array($d['type'], self::$selfCloseTags) ? "" : "</".$d['type'].">";
   }
 }
\ No newline at end of file

php/hamle/Tag/Control.php

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

Spacing +6 added lines, -6 removed lines

@@ -35,12 +35,12 @@ 
 
   function __construct($s, $mode = self::TOKEN_CONTROL) {
     $m = array();
-    if(preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) {
-      $this->param1 = new Text($m[1],Text::TOKEN_HTML);
-      $this->param2 = new Text($m[3],Text::TOKEN_HTML);
+    if (preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) {
+      $this->param1 = new Text($m[1], Text::TOKEN_HTML);
+      $this->param2 = new Text($m[3], Text::TOKEN_HTML);
       $this->operator = $m[2];
     } else
-      $this->param1 = new Text($s,Text::TOKEN_HTML);
+      $this->param1 = new Text($s, Text::TOKEN_HTML);
   }
 
 //  function __construct(String $p1, String $p2, $operator) {
@@ -49,10 +49,10 @@ 
 //    $this->operator = $operator;
 //  }
   function toPHP() {
-    if(!$this->param2) return $this->param1->toPHP();
+    if (!$this->param2) return $this->param1->toPHP();
     $p1 = $this->param1->toPHP();
     $p2 = $this->param2->toPHP();
-    switch($this->operator) {
+    switch ($this->operator) {
       case "equals":
       case "equal":
         return $p1." == ".$p2;

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

   }

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

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