cseufert / hamle

php/hamle/Text/Comparison.php

Doc Comments +3 added lines

@@ -33,6 +33,9 @@
   protected $param1, $param2, $operator;
   const REGEX_COMP_OPER = '(equals|notequal|notequals|less|greater|has|starts|contains|ends)';
 
+  /**
+   * @param string $s
+   */
   function __construct($s, $mode = self::TOKEN_CONTROL) {
     $m = array();
     if(preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) {

Braces +6 added lines, -3 removed lines

@@ -39,8 +39,9 @@ 
       $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);
+    } else {
+          $this->param1 = new Text($s,Text::TOKEN_HTML);
+    }
   }
 
 //  function __construct(String $p1, String $p2, $operator) {
@@ -49,7 +50,9 @@ 
 //    $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) {

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

Doc Comments +3 added lines

@@ -33,6 +33,9 @@
   protected $sel = null;
   protected $filter;
 
+  /**
+   * @param string $s
+   */
   function __construct($s) {
     if(FALSE !== $pos = strpos($s,'|')) {
       $this->filter = new Filter(substr($s, $pos+1), $this);

Braces +22 added lines, -14 removed lines

@@ -39,21 +39,27 @@ 
       $s = substr($s,0,$pos);
     }
     $s = explode("->", $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(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]);
+    }
     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() {
@@ -62,11 +68,13 @@ 
   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();
+    }
   }
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -34,12 +34,12 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->filter = new Filter(substr($s, $pos+1), $this);
-      $s = substr($s,0,$pos);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
+      $s = substr($s, 0, $pos);
     }
     $s = explode("->", $s);
-    if(count($s) == 1) $s = explode("-!",$s[0]);
+    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]);
@@ -52,19 +52,19 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
       foreach ($this->sel as $s)
         $sel[] = "hamleGet('$s')";
-      return $this->func->toPHP() . "->" . implode('->', $sel);
+      return $this->func->toPHP()."->".implode('->', $sel);
     } else
       return $this->func->toPHP();
   }

php/hamle/Text/Plain.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
   protected $s;
   protected $type;
 
+  /**
+   * @param string $s
+   */
   function __construct($s, $type = self::TOKEN_HTML) {
     $this->s = str_replace('\\$', "$", $s);
     $this->type = $type;

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

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

Braces +27 added lines, -16 removed lines

@@ -53,39 +53,48 @@ 
     $pos = 0;
     $this->nodes = array();
     $rFlag = PREG_OFFSET_CAPTURE + PREG_SET_ORDER;
-    if (strlen(trim($s)) == 0) return;
+    if (strlen(trim($s)) == 0) {
+      return;
+    }
     if ($mode == self::TOKEN_CONTROL) {
       if (preg_match('/^"(.*)"$/', trim($s), $m)) {
         $this->nodes[] = new Text($m[1]);
-      } else
-        $this->nodes[] = new Text\Complex(trim($s));
+      } else {
+              $this->nodes[] = new Text\Complex(trim($s));
+      }
       return;
     }
     preg_match_all(self::REGEX_HTML, $s, $m, $rFlag);
     foreach ($m as $match) {
       if ($mode & self::FIND_BARDOLLAR && isset($match[2])) {
-        if ($match[2][1] != $pos)
-          $this->nodes[] = new Text\Plain(
+        if ($match[2][1] != $pos) {
+                  $this->nodes[] = new Text\Plain(
               substr($s, $pos, $match[2][1] - $pos), $mode);
+        }
         $this->nodes[] = new Text\Complex(substr($match[2][0], 1, -1));
         $pos = $match[2][1] + strlen($match[2][0]);
       } elseif ($mode & self::FIND_DOLLARVAR) {
-        if ($match[1][1] > 0 && $s[$match[1][1] - 1] == '\\') continue;
-        if ($match[1][1] != $pos)
-          $this->nodes[] = new Text\Plain(
+        if ($match[1][1] > 0 && $s[$match[1][1] - 1] == '\\') {
+          continue;
+        }
+        if ($match[1][1] != $pos) {
+                  $this->nodes[] = new Text\Plain(
               substr($s, $pos, $match[1][1] - $pos), $mode);
+        }
         $this->nodes[] = new Text\SimpleVar($match[1][0]);
         $pos = $match[1][1] + strlen($match[1][0]);
       }
     }
-    if ($pos != strlen($s))
-      $this->nodes[] = new Text\Plain(substr($s, $pos), $mode);
+    if ($pos != strlen($s)) {
+          $this->nodes[] = new Text\Plain(substr($s, $pos), $mode);
+    }
   }
 
   function toHTML($escape = false) {
     $out = array();
-    foreach ($this->nodes as $string)
-      $out[] = $string->toHTML($escape);
+    foreach ($this->nodes as $string) {
+          $out[] = $string->toHTML($escape);
+    }
     return implode("", $out);
   }
 
@@ -95,8 +104,9 @@ 
 
   function toPHP() {
     $out = array();
-    foreach ($this->nodes as $string)
-      $out[] = $string->toPHP();
+    foreach ($this->nodes as $string) {
+          $out[] = $string->toPHP();
+    }
     return implode(".", $out);
   }
 
@@ -107,8 +117,9 @@ 
   static function varToCode($var) {
     if (is_array($var)) {
       $code = array();
-      foreach ($var as $key => $value)
-        $code[] = self::varToCode($key) . "=>" . self::varToCode($value);
+      foreach ($var as $key => $value) {
+              $code[] = self::varToCode($key) . "=>" . self::varToCode($value);
+      }
       return 'array(' . implode(",", $code) . ')'; //remove unnecessary coma
     } elseif (is_bool($var)) {
       return ($var ? 'TRUE' : 'FALSE');

Spacing +4 added lines, -4 removed lines

@@ -101,15 +101,15 @@ 
   }
 
   function doEval() {
-    return eval('return ' . $this->toPHP() . ';');
+    return eval('return '.$this->toPHP().';');
   }
 
   static function varToCode($var) {
     if (is_array($var)) {
       $code = array();
       foreach ($var as $key => $value)
-        $code[] = self::varToCode($key) . "=>" . self::varToCode($value);
-      return 'array(' . implode(",", $code) . ')'; //remove unnecessary coma
+        $code[] = self::varToCode($key)."=>".self::varToCode($value);
+      return 'array('.implode(",", $code).')'; //remove unnecessary coma
     } elseif (is_bool($var)) {
       return ($var ? 'TRUE' : 'FALSE');
     } elseif (is_int($var) || is_float($var) || is_numeric($var)) {
@@ -117,7 +117,7 @@ 
     } elseif ($var instanceof Text) {
       return $var->toPHP();
     } else {
-      return "'" . str_replace(array('$', "'"), array('\\$', "\\'"), $var) . "'";
+      return "'".str_replace(array('$', "'"), array('\\$', "\\'"), $var)."'";
     }
   }
 

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

Braces +8 added lines, -6 removed lines

@@ -34,16 +34,18 @@
   function __construct($s) {
     $m = array();
     //var_dump($s);
-    if (!preg_match('/\$\[(-?[0-9]+|[a-zA-Z][a-zA-Z0-9]+)\]/', $s, $m))
-      throw new ParseError("Unable to match scope ($s)");
+    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) . ")";
-    else
-      return "Hamle\\Scope::getName(" . 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) . ")";
+    }
   }
 
   function toHTML($escape = false) {

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 
   function toPHP() {
     if (is_numeric($this->scope))
-      return "Hamle\\Scope::get(" . Text::varToCode($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).")";
   }
 
   function toHTML($escape = false) {