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

php/hamle/Tag/Control.php

Spacing +2 added lines, -2 removed lines

@@ -97,8 +97,8 @@
         break;
       case "include":
         $file = $hsv->toHTML();
-        if($file[0] == "#")
-          $out .= "echo Hamle\\Run::includeFragment(".$hsv->toPHP().");";
+        if ($file[0] == "#")
+          $out .= "echo Hamle\\Run::includeFragment(" . $hsv->toPHP() . ");";
         else
           $out .= "echo Hamle\\Run::includeFile(" . $hsv->toPHP() . ");";
         break;

Braces +28 added lines, -20 removed lines

@@ -53,10 +53,12 @@ 
     if ($parentTag) {
       $elseTag = $parentTag->tags[count($parentTag->tags) - 1];
       if ($this->type == "else") {
-        if (!$elseTag instanceOf H\Tag)
-          throw new ParseError("Unable to use else here");
-        if (!in_array($elseTag->type, array('with', 'if')))
-          throw new ParseError("You can only use else with |with and |if, you tried |{$parentTag->type}");
+        if (!$elseTag instanceOf H\Tag) {
+                  throw new ParseError("Unable to use else here");
+        }
+        if (!in_array($elseTag->type, array('with', 'if'))) {
+                  throw new ParseError("You can only use else with |with and |if, you tried |{$parentTag->type}");
+        }
         $elseTag->else = true;
       }
     }
@@ -69,14 +71,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":
@@ -84,9 +88,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;";
@@ -97,10 +101,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 . ' ?>';
@@ -119,8 +124,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":
@@ -136,7 +142,9 @@ 
         return "";
         break;
     }
-    if ($this->else) $out .= "else{";
+    if ($this->else) {
+      $out .= "else{";
+    }
     return $out . ' ?>';
   }
 

php/hamle/Tag/Html.php

Spacing +4 added lines, -4 removed lines

@@ -42,17 +42,17 @@
   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() {

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() . "\"";
     }

php/hamle/Form.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
    * Fills the $this->fields array with hamleFields

    */

   function setup() {

-    throw new Exception\RunTime("You must configure the form in the setup ".

+    throw new Exception\RunTime("You must configure the form in the setup " .

       "function, by adding fields to the \$this->fields array");

   }

   

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

   }

 

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

php/hamle/Text/Func.php

Spacing +5 added lines, -5 removed lines

@@ -81,13 +81,13 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
+      foreach ($m[0] as $k=>$mv)
         if ($m[2][$k]) {
-          $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+          $dir = $m[1][$k] == "-" ? Hamle\Hamle::SORT_DESCENDING : Hamle\Hamle::SORT_ASCENDING;
           $att['sort'][$m[2][$k]] = $dir;
         } else $rand = true;
     }
-    if($rand)
+    if ($rand)
       $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
@@ -106,9 +106,9 @@ 
         $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
     $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
     if ($this->scope) {
-      if($this->scope === true)
+      if ($this->scope === true)
         return "Hamle\\Scope::get(0)$sub";
-      return $this->scope->toPHP().$sub;
+      return $this->scope->toPHP() . $sub;
     }
     if (count($this->filt['tag']))
       return "Hamle\\Run::modelTypeTags(" .

Braces +41 added lines, -25 removed lines

@@ -38,10 +38,12 @@ 
 
   function __construct($s) {
     $m = array();
-    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m))
-      throw new ParseError("Unable to read \$ func in '$s'");
-    if (trim($m[2]))
-      $this->sub = new FuncSub($m[2]);
+    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m)) {
+          throw new ParseError("Unable to read \$ func in '$s'");
+    }
+    if (trim($m[2])) {
+          $this->sub = new FuncSub($m[2]);
+    }
     if (!trim($m[1])) {
       $this->scope = true;
       return;
@@ -58,17 +60,24 @@ 
     $m = array();
     $att = array('id' => array(), 'tag' => array());
     foreach (explode(",", $s) as $str) {
-      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) $type = $m[0];
-      else $type = "*";
-      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) $att['id'][$type][] = $m[1];
-      elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m))
-        foreach ($m[1] as $tag)
+      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) {
+        $type = $m[0];
+      } else {
+        $type = "*";
+      }
+      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) {
+        $att['id'][$type][] = $m[1];
+      } elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m)) {
+              foreach ($m[1] as $tag)
           $att['tag'][$type][] = new Text($tag, Text::TOKEN_CODE);
-      else $att['tag'][$type] = array();
+      } else {
+        $att['tag'][$type] = array();
+      }
     }
     //var_dump($att);
-    if (!(count($att['id']) xor count($att['tag'])))
-      throw new ParseError("Only tag, type or id can be combined");
+    if (!(count($att['id']) xor count($att['tag']))) {
+          throw new ParseError("Only tag, type or id can be combined");
+    }
     return $att;
   }
 
@@ -81,14 +90,18 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
-        if ($m[2][$k]) {
+      foreach($m[0] as $k=>$mv) {
+              if ($m[2][$k]) {
           $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+      }
           $att['sort'][$m[2][$k]] = $dir;
-        } else $rand = true;
+        } else {
+          $rand = true;
+        }
+    }
+    if($rand) {
+          $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     }
-    if($rand)
-      $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
 
@@ -106,21 +119,24 @@ 
         $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
     $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
     if ($this->scope) {
-      if($this->scope === true)
-        return "Hamle\\Scope::get(0)$sub";
+      if($this->scope === true) {
+              return "Hamle\\Scope::get(0)$sub";
+      }
       return $this->scope->toPHP().$sub;
     }
-    if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
+    if (count($this->filt['tag'])) {
+          return "Hamle\\Run::modelTypeTags(" .
       Text::varToCode($this->filt['tag']) . ",$limit)$sub";
-    if (count($this->filt['id']))
-      if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
+    }
+    if (count($this->filt['id'])) {
+          if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
         return "Hamle\\Run::modelId(" .
         Text::varToCode(current($this->filt['id']['*'])) .
         ",$limit)$sub";
-      else
-        return "Hamle\\Run::modelTypeId(" .
+    } else {
+              return "Hamle\\Run::modelTypeId(" .
         Text::varToCode($this->filt['id']) . ",$limit)$sub";
+      }
     return "";
   }