cseufert / hamle

php/hamle/Tag/Text.php

Doc Comments +6 added lines

@@ -33,11 +33,17 @@
 class Text extends Tag {
   protected $escape = true;
 
+  /**
+   * @param string $tag
+   */
   function __construct($tag) {
     parent::__construct();
     $this->escape = ($tag == "_");
   }
 
+  /**
+   * @param string $s
+   */
   function addContent($s, $strtype = H\Text::TOKEN_HTML) {
     if (trim($s)) {
       if ($this->escape) {

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
       if ($this->escape) {
         $parse = new H\Text($s, $strtype);
         $this->content[] = $parse->toHTML();
-      } else
-        $this->content[] = $s;
+      } else {
+              $this->content[] = $s;
+      }
     }
   }
 

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)) {

Spacing +10 added lines, -10 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,20 +49,20 @@ 
 //    $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;
+        return $p1 . " == " . $p2;
       case "notequals":
       case "notequal":
-        return $p1." != ".$p2;
+        return $p1 . " != " . $p2;
       case "less":
-        return $p1." < ".$p2;
+        return $p1 . " < " . $p2;
       case "greater":
-        return $p1." > ".$p2;
+        return $p1 . " > " . $p2;
       case "has":
         return "in_array($p2, $p1)";
       case "starts":

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) {

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

Spacing +6 added lines, -6 removed lines

@@ -34,9 +34,9 @@ 
   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 (!$s[0]) throw new ParseError("Unable to parse Complex Expression");
@@ -51,12 +51,12 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$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) {

Braces +19 added lines, -13 removed lines

@@ -39,20 +39,24 @@ 
       $s = substr($s,0,$pos);
     }
     $s = explode("->", $s);
-    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 (!$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() {
@@ -61,11 +65,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

php/hamle/Text/Filter.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
   /** @var SimpleVar  */
   protected $what;
 
+  /**
+   * @param string $s
+   */
   function __construct($s, Text $what) {
     if(preg_match("/^([a-z]+)(\\((.*)\\))$/",$s, $m)) {
       $this->filter = $m[1];

Spacing +8 added lines, -8 removed lines

@@ -37,28 +37,28 @@
   protected $what;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z]+)(\\((.*)\\))$/",$s, $m)) {
+    if (preg_match("/^([a-z]+)(\\((.*)\\))$/", $s, $m)) {
       $this->filter = $m[1];
-      $this->vars = isset($m[3])?explode(',',$m[3]):[];
+      $this->vars = isset($m[3]) ? explode(',', $m[3]) : [];
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(!in_array($this->filter,['round','strtoupper','strtolower','ucfirst'])) {
+    if (!in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
     $this->what = $what;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if ($escape)
+      return "<?=htmlspecialchars(" . $this->toPHP() . ")?>";
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHP() {
-    $o = [$this->what->toPHPVar()] ;
-    foreach($this->vars as $v)
+    $o = [$this->what->toPHPVar()];
+    foreach ($this->vars as $v)
       $o[] = $this->varToCode($v);
-    return "{$this->filter}(" . implode(',',$o) . ")";
+    return "{$this->filter}(" . implode(',', $o) . ")";
   }
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -50,15 +50,17 @@
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHP() {
     $o = [$this->what->toPHPVar()] ;
-    foreach($this->vars as $v)
-      $o[] = $this->varToCode($v);
+    foreach($this->vars as $v) {
+          $o[] = $this->varToCode($v);
+    }
     return "{$this->filter}(" . implode(',',$o) . ")";
   }
 }
\ No newline at end of file

php/hamle/Text/FuncSub.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
 class FuncSub extends Hamle\Text\Func {
   protected $dir;
 
+  /**
+   * @param string $s
+   */
   function __construct($s) {
     $m = array();
     if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,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 \$ sub func in '$s'");
     if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
     elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;

Braces +16 added lines, -8 removed lines

@@ -33,17 +33,25 @@
 
   function __construct($s) {
     $m = array();
-    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
-      throw new ParseError("Unable to read \$ sub func in '$s'");
-    if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
-    elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;
-    else $this->dir = Hamle\Hamle::REL_ANY;
+    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m)) {
+          throw new ParseError("Unable to read \$ sub func in '$s'");
+    }
+    if ($m[1] == "<") {
+      $this->dir = Hamle\Hamle::REL_PARENT;
+    } elseif ($m[1] == ">") {
+      $this->dir = Hamle\Hamle::REL_CHILD;
+    } else {
+      $this->dir = Hamle\Hamle::REL_ANY;
+    }
     $this->sortlimit = $this->attSortLimit($m[2]);
     $this->filt = $this->attIdTag($m[2]);
     $this->grouptype = $this->attGroupType($m[2]);
-    if ($this->filt['id']) throw new ParseError("Unable to select by id");
-    if (trim($m[3]))
-      $this->sub = new FuncSub($m[3]);
+    if ($this->filt['id']) {
+      throw new ParseError("Unable to select by id");
+    }
+    if (trim($m[3])) {
+          $this->sub = new FuncSub($m[3]);
+    }
   }
 
   function 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;

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Chris
- * Date: 4/12/2014
- * Time: 12:04 PM
- */
+   * Created by PhpStorm.
+   * User: Chris
+   * Date: 4/12/2014
+   * Time: 12:04 PM
+   */
 namespace Seufert\Hamle\Text;
 
 use Seufert\Hamle\Text;

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

Spacing +5 added lines, -5 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));

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

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

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

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

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

   }

-},true,true);

+},true, true);

 

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

 

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

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