cseufert / hamle

php/autoload.php

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
     $s = DIRECTORY_SEPARATOR;

     $class = str_replace("\\",$s,substr($class,14));

     $path = __DIR__.$s."hamle".$s."$class.php";

-    if(is_file($path)) include_once($path);

+    if(is_file($path)) {
+      include_once($path);
+    }
   }

 },true,true);

 

Spacing +4 added lines, -4 removed lines

@@ -34,11 +34,11 @@
  * @param string $class Class name to be autoloaded

  */

 spl_autoload_register(function($class) {

-  if(strpos($class, "Seufert\\Hamle\\") === 0) {

+  if (strpos($class, "Seufert\\Hamle\\") === 0) {

     $s = DIRECTORY_SEPARATOR;

-    $class = str_replace("\\",$s,substr($class,14));

+    $class = str_replace("\\", $s, substr($class, 14));

     $path = __DIR__.$s."hamle".$s."$class.php";

-    if(is_file($path)) include_once($path);

+    if (is_file($path)) include_once($path);

   }

-},true,true);

+},true, true);

 

php/hamle/Filter/Sass.php

Braces +9 added lines, -5 removed lines

@@ -34,14 +34,18 @@
   static function filterText($s) {
     $as = explode("\n", $s);
     $indent = -1;
-    foreach ($as as $line)
-      if (preg_match('/^(\s+).*$/', $line, $m)) {
+    foreach ($as as $line) {
+          if (preg_match('/^(\s+).*$/', $line, $m)) {
         $lnInd = strlen($m[1]);
-        if ($indent < 0) $indent = $lnInd;
+    }
+        if ($indent < 0) {
+          $indent = $lnInd;
+        }
         $indent = min($indent, $lnInd);
       }
-    foreach ($as as $k => $v)
-      $as[$k] = substr($v, $indent);
+    foreach ($as as $k => $v) {
+          $as[$k] = substr($v, $indent);
+    }
     $s = implode("\n", $as);
 
     require_once ME_DIR . "/lib/phpsass/SassParser.php";

Spacing +2 added lines, -2 removed lines

@@ -44,13 +44,13 @@
       $as[$k] = substr($v, $indent);
     $s = implode("\n", $as);
 
-    require_once ME_DIR . "/lib/phpsass/SassParser.php";
+    require_once ME_DIR."/lib/phpsass/SassParser.php";
     $sp = new SassParser(array("cache" => FALSE,
         "style" => stdConf::get("me.developer") ? SassRenderer::STYLE_EXPANDED : SassRenderer::STYLE_COMPRESSED,
         "syntax" => SassFile::SASS, 'debug' => TRUE));
     $tree = $sp->toTree($s);
     $out = $tree->render();
     $pad = str_pad("", $indent, " ");
-    return $pad . str_replace("\n", "\n$pad", trim($out));
+    return $pad.str_replace("\n", "\n$pad", trim($out));
   }
 }
\ No newline at end of file

php/hamle/Tag/DynHtml.php

Braces +6 added lines, -3 removed lines

@@ -60,11 +60,14 @@
     $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() . ';');
+        foreach ($v as $k2 => $v2) {
+                  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() . ';');
+      if ($v instanceOf H\Text) {
+        $v = eval('return ' . $v->toPHP() . ';');
+      }
       $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
     }
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";

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, $minify = false) {
     $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)?>".($minify ? '' : "\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)?>".($minify ? '' : "\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/Form.php

Braces +26 added lines, -17 removed lines

@@ -41,12 +41,15 @@ 
   function __construct($param) {
     parent::__construct();
     $param = explode(' ', $param);
-    if (count($param) < 2) throw new ParseError("|form requires 2 arguments, form type, and instance");
+    if (count($param) < 2) {
+      throw new ParseError("|form requires 2 arguments, form type, and instance");
+    }
     $this->var = new H\Text($param[1]);
-    if (preg_match('/^(.*)\((.*)\)/', $param[0], $m))
-      $this->form = new $m[1]($m[2]);
-    else
-      $this->form = new $param[0];
+    if (preg_match('/^(.*)\((.*)\)/', $param[0], $m)) {
+          $this->form = new $m[1]($m[2]);
+    } else {
+          $this->form = new $param[0];
+    }
   }
 
   function renderStTag() {
@@ -58,32 +61,38 @@ 
     }
     $fields = $this->form->getFields();
     $labelTags = $this->find(array(array("type" => "label")));
-    foreach ($labelTags as $tag)
-      if ($tag instanceOf Html)
+    foreach ($labelTags as $tag) {
+          if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
           if(isset($fields[$source]))
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
-          else
-            $tag->opt['style'] = "display:none;";
+    }
+          else {
+                      $tag->opt['style'] = "display:none;";
+          }
         }
     $inputTags = $this->find(array(array("type" => "hint")));
-    foreach ($inputTags as $tag)
-      if ($tag instanceOf Html)
+    foreach ($inputTags as $tag) {
+          if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
           if(isset($fields[$source]))
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
-          else
-            $tag->opt['style'] = "display:none;";
+    }
+          else {
+                      $tag->opt['style'] = "display:none;";
+          }
         }
     $inputTags = $this->find(array(array("type" => "input")));
-    foreach ($inputTags as $tag)
-      if ($tag instanceOf Html)
+    foreach ($inputTags as $tag) {
+          if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
           if(isset($fields[$source])) {
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
+    }
             unset($fields[$source]);
-          } else
-            $tag->opt['style'] = "display:none;";
+          } else {
+                      $tag->opt['style'] = "display:none;";
+          }
         }
     foreach ($fields as $n => $f) {
       if (!$f instanceOf Button) {

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

Braces +8 added lines, -6 removed lines

@@ -31,8 +31,9 @@ 
   protected $commentstyle;
 
   function __construct($type) {
-    if ($type == "/")
-      $this->commentstyle = "HTML";
+    if ($type == "/") {
+          $this->commentstyle = "HTML";
+    }
   }
 
   function renderStTag() {
@@ -40,11 +41,12 @@ 
   }
 
   function renderContent($pad = "", $oneliner = false) {
-    if ($this->commentstyle == "HTML")
-      if (count($this->content) > 1)
+    if ($this->commentstyle == "HTML") {
+          if (count($this->content) > 1)
         return $pad . "  " . implode("\n$pad", $this->content) . "\n";
-      else
-        return current($this->content);
+    } else {
+              return current($this->content);
+      }
     return "";
   }
 

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

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
     parent::__construct();
     $this->type = ucfirst(strtolower($tag));
     $this->filter = "\\Seufert\\Hamle\\Filter\\{$this->type}";
-    if (!class_exists($this->filter))
-      Throw new ParseError("Unable to fild filter $tag");
+    if (!class_exists($this->filter)) {
+          Throw new ParseError("Unable to fild filter $tag");
+    }
   }
 
   function renderContent($pad = "", $oneliner = false) {

php/hamle/Tag/Html.php

Braces +23 added lines, -13 removed lines

@@ -42,17 +42,21 @@ 
   function __construct($tag, $class = array(), $attr = array(), $id = "") {
     parent::__construct();
     $this->opt = $attr;
-    if(isset($attr['class']) && !is_array($attr['class']))
-      $this->opt['class'] = $attr['class']?explode(" ",$attr['class']):array();
+    if(isset($attr['class']) && !is_array($attr['class'])) {
+          $this->opt['class'] = $attr['class']?explode(" ",$attr['class']):array();
+    }
     $this->source = array();
     $this->type = $tag ? $tag : "div";
     if($class) {
-      if (isset($this->opt['class']))
-        $this->opt['class'] = array_merge($this->opt['class'], $class);
-      else
-        $this->opt['class'] = $class;
+      if (isset($this->opt['class'])) {
+              $this->opt['class'] = array_merge($this->opt['class'], $class);
+      } else {
+              $this->opt['class'] = $class;
+      }
+    }
+    if($id) {
+      $this->opt['id'] = $id;
     }
-    if($id) $this->opt['id'] = $id;
   }
 
   function renderStTag() {
@@ -61,8 +65,9 @@ 
   }
 
   function renderEnTag() {
-    if (in_array($this->type, self::$selfCloseTags))
-      return "";
+    if (in_array($this->type, self::$selfCloseTags)) {
+          return "";
+    }
     return "</{$this->type}>";
   }
 
@@ -74,10 +79,15 @@ 
   function optToTags() {
     $out = array();
     foreach ($this->opt as $k => $v) {
-      if ($k == "class" && !$v) continue;
-      if (is_array($v)) $v = implode(" ", $v);
-      if (!$v instanceof H\Text)
-        $v = new H\Text($v);
+      if ($k == "class" && !$v) {
+        continue;
+      }
+      if (is_array($v)) {
+        $v = implode(" ", $v);
+      }
+      if (!$v instanceof H\Text) {
+              $v = new H\Text($v);
+      }
       $k = new H\Text($k);
       $out[] = " " . $k->toHTML() . "=\"" . $v->toHTMLAtt() . "\"";
     }

Spacing +6 added lines, -6 removed lines

@@ -42,22 +42,22 @@ 
   function __construct($tag, $class = array(), $attr = array(), $id = "") {
     parent::__construct();
     $this->opt = $attr;
-    if(isset($attr['class']) && !is_array($attr['class']))
-      $this->opt['class'] = $attr['class']?explode(" ",$attr['class']):array();
+    if (isset($attr['class']) && !is_array($attr['class']))
+      $this->opt['class'] = $attr['class'] ?explode(" ", $attr['class']) : array();
     $this->source = array();
     $this->type = $tag ? $tag : "div";
-    if($class) {
+    if ($class) {
       if (isset($this->opt['class']))
         $this->opt['class'] = array_merge($this->opt['class'], $class);
       else
         $this->opt['class'] = $class;
     }
-    if($id) $this->opt['id'] = $id;
+    if ($id) $this->opt['id'] = $id;
   }
 
   function renderStTag() {
     $close = in_array($this->type, self::$selfCloseTags) ? " />" : ">";
-    return "<{$this->type}" . $this->optToTags() . $close;
+    return "<{$this->type}".$this->optToTags().$close;
   }
 
   function renderEnTag() {
@@ -79,7 +79,7 @@ 
       if (!$v instanceof H\Text)
         $v = new H\Text($v);
       $k = new H\Text($k);
-      $out[] = " " . $k->toHTML() . "=\"" . $v->toHTMLAtt() . "\"";
+      $out[] = " ".$k->toHTML()."=\"".$v->toHTMLAtt()."\"";
     }
     return implode("", $out);
   }

php/hamle/Form.php

Braces +17 added lines, -12 removed lines

@@ -64,15 +64,18 @@ 
   

   function process() {

     $clicked = "";

-    foreach($this->_fields as $f)

-      if($f instanceOf Field\Button)

+    foreach($this->_fields as $f) {
+          if($f instanceOf Field\Button)

         if($f->isClicked())

-          $clicked = $f;

-    foreach($this->_fields as $f)

-      $f->doProcess($clicked?true:false);

-    if($clicked)

-      try {

-        $this->onSubmit($clicked);

+          $clicked = $f;
+    }
+    foreach($this->_fields as $f) {
+          $f->doProcess($clicked?true:false);
+    }
+    if($clicked) {
+          try {

+        $this->onSubmit($clicked);
+    }
       } catch(Exception\FormInvalid $e) {

         $this->hint = $e->getMessage();

       }

@@ -80,8 +83,9 @@ 
   

   function isValid() {

     $valid = true;

-    foreach($this->_fields as $f)

-      $valid = $f->valid && $valid;

+    foreach($this->_fields as $f) {
+          $valid = $f->valid && $valid;
+    }
     return $valid;

   }

   /**

@@ -95,8 +99,9 @@ 
     return $this->_fields;

   }

   function getField($n) {

-    if(!isset($this->_fields[$n]))

-      throw new Exception\NoKey("unable to find form field ($n)");

+    if(!isset($this->_fields[$n])) {
+          throw new Exception\NoKey("unable to find form field ($n)");
+    }
     return $this->_fields[$n];

   }

   function __get($n) {

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
     $this->setup();

     $fields = $this->_fields;

     $this->_fields = array();

-    foreach($fields as $v) {

+    foreach ($fields as $v) {

       $this->_fields[$v->name] = $v;

       $v->form($this->_name);

     }

@@ -64,23 +64,23 @@ 
   

   function process() {

     $clicked = "";

-    foreach($this->_fields as $f)

-      if($f instanceOf Field\Button)

-        if($f->isClicked())

+    foreach ($this->_fields as $f)

+      if ($f instanceOf Field\Button)

+        if ($f->isClicked())

           $clicked = $f;

-    foreach($this->_fields as $f)

-      $f->doProcess($clicked?true:false);

-    if($clicked)

+    foreach ($this->_fields as $f)

+      $f->doProcess($clicked ?true:false);

+    if ($clicked)

       try {

         $this->onSubmit($clicked);

-      } catch(Exception\FormInvalid $e) {

+      } catch (Exception\FormInvalid $e) {

         $this->hint = $e->getMessage();

       }

   }

   

   function isValid() {

     $valid = true;

-    foreach($this->_fields as $f)

+    foreach ($this->_fields as $f)

       $valid = $f->valid && $valid;

     return $valid;

   }

@@ -95,7 +95,7 @@ 
     return $this->_fields;

   }

   function getField($n) {

-    if(!isset($this->_fields[$n]))

+    if (!isset($this->_fields[$n]))

       throw new Exception\NoKey("unable to find form field ($n)");

     return $this->_fields[$n];

   }

@@ -104,7 +104,7 @@ 
   }

   

   function getHTMLProp() {

-    return array('action'=>'','method'=>'post','name'=>$this->_name,

+    return array('action'=>'', 'method'=>'post', 'name'=>$this->_name,

                                         'enctype'=>'multipart/form-data');

   }

 

php/hamle/Text/Plain.php

Braces +3 added lines, -2 removed lines

@@ -23,8 +23,9 @@
   }
 
   function toHTML($escape = false) {
-    if ($this->type == self::TOKEN_CODE)
-      return $this->s;
+    if ($this->type == self::TOKEN_CODE) {
+          return $this->s;
+    }
     return htmlspecialchars($this->s);
   }
 }
\ No newline at end of file