cseufert / hamle

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

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
   function getInputAttStatic(&$atts, &$type, &$content) {

     $atts['id'] = $atts['name'] = $this->form . "_" . $this->name;

     $atts['type'] = "text";

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

   }

 

   function getInputAttDynamic(&$atts, &$type, &$content) {

@@ -142,7 +142,7 @@ 
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts["for"] = $this->form . "_" . $this->name;

     $content = array($this->opt['label']);

   }

@@ -151,7 +151,7 @@ 
   }

 

   function getHintAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts['class'][] = "hamleFormHint";

   }

 

Braces +26 added lines, -16 removed lines

@@ -66,7 +66,9 @@ 
   }

 

   function __call($name, $valarray) {

-    if (count($valarray) < 1) return $this->__get($name);

+    if (count($valarray) < 1) {
+      return $this->__get($name);
+    }
     $val = count($valarray) == 1 ? current($valarray) : $valarray;

     switch ($name) {

       case "name":

@@ -111,12 +113,15 @@ 
   }

 

   function getValue() {

-    if (!is_null($this->setValue)) return $this->setValue;

+    if (!is_null($this->setValue)) {
+      return $this->setValue;
+    }
     if (isset($_REQUEST[$this->form . "_" . $this->name])) {

-      if (get_magic_quotes_runtime())

-        return stripslashes($_REQUEST[$this->form . "_" . $this->name]);

-      else

-        return $_REQUEST[$this->form . "_" . $this->name];

+      if (get_magic_quotes_runtime()) {
+              return stripslashes($_REQUEST[$this->form . "_" . $this->name]);
+      } else {
+              return $_REQUEST[$this->form . "_" . $this->name];
+      }
     }

     return $this->opt['default'];

   }

@@ -133,12 +138,15 @@ 
     if (!$this->valid) {

       $atts['class'][] = "hamleFormError";

     }

-    if ($this->opt["disabled"])

-      $atts['disabled'] = "disabled";

-    if ($this->opt['required'])

-      $atts['required'] = "required";

-    if ($this->opt['help'])

-      $atts['title'] = $this->opt['help'];

+    if ($this->opt["disabled"]) {
+          $atts['disabled'] = "disabled";
+    }
+    if ($this->opt['required']) {
+          $atts['required'] = "required";
+    }
+    if ($this->opt['help']) {
+          $atts['title'] = $this->opt['help'];
+    }
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

@@ -176,10 +184,12 @@ 
   function doProcess($submit) {

     if ($submit) {

       $value = $this->getValue();

-      if ($this->opt['required'])

-        $this->valid = $this->valid && strlen($value);

-      if ($this->opt['regex'])

-        $this->valid = $this->valid && preg_match($this->opt['regex'], $value);

+      if ($this->opt['required']) {
+              $this->valid = $this->valid && strlen($value);
+      }
+      if ($this->opt['regex']) {
+              $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
+      }
     }

   }

 

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

Braces +8 added lines, -5 removed lines

@@ -54,10 +54,11 @@ 
    */

   static function popInstance() {

     array_pop(self::$hamleList);

-    if (self::$hamleList)

-      self::$hamle = self::$hamleList[count(self::$hamleList) - 1];

-    else

-      self::$hamle = NULL;

+    if (self::$hamleList) {
+          self::$hamle = self::$hamleList[count(self::$hamleList) - 1];
+    } else {
+          self::$hamle = NULL;
+    }
   }

 

   /**

@@ -116,7 +117,9 @@ 
   static function modelId($id, $sortDir = 0, $sortField = "", $limit = 0, $offset = 0) {

     $o = self::$hamle->setup->getModelDefault($id,

         $sortDir, $sortField, $limit, $offset);

-    if (!$o instanceOf Model) throw new RunTime("Application must return instance of hamleModel");

+    if (!$o instanceOf Model) {
+      throw new RunTime("Application must return instance of hamleModel");
+    }
     return $o;

   }

 

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) ? "/>" : ">";

php/hamle/Tag/Text.php

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/Tag/Form.php

Spacing +5 added lines, -5 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,10 +87,10 @@ 
         }
     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(); ?>";

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

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