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

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

   }

 

Spacing +8 added lines, -8 removed lines

@@ -112,19 +112,19 @@ 
 

   function getValue() {

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

-    if (isset($_REQUEST[$this->form . "_" . $this->name])) {

+    if (isset($_REQUEST[$this->form."_".$this->name])) {

       if (get_magic_quotes_runtime())

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

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

       else

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

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

     }

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

   }

 

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

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

+    $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,8 +142,8 @@ 
   }

 

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

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

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

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

   }

 

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/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

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

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
   static function decodeClassId($s) {
     $out = $m = array();
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
+    if (preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
       $out['type'] = $m[0];
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
     if (isset($m[0])) foreach ($m[0] as $s) {

Braces +29 added lines, -18 removed lines

@@ -32,25 +32,33 @@ 
 
   function __construct($params) {
     parent::__construct();
-    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m))
-      throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
+    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m)) {
+          throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
+    }
     $this->type = $m[1];
-    if (isset($m[2]))
-      $this->path = explode(" ", $m[2]);
-    else
-      $this->path = array();
-    foreach ($this->path as $k => $v)
-      $this->path[$k] = self::decodeClassId($v);
+    if (isset($m[2])) {
+          $this->path = explode(" ", $m[2]);
+    } else {
+          $this->path = array();
+    }
+    foreach ($this->path as $k => $v) {
+          $this->path[$k] = self::decodeClassId($v);
+    }
   }
 
   static function decodeClassId($s) {
     $out = $m = array();
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
-      $out['type'] = $m[0];
+    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m)) {
+          $out['type'] = $m[0];
+    }
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
-    if (isset($m[0])) foreach ($m[0] as $s) {
+    if (isset($m[0])) {
+      foreach ($m[0] as $s) {
       if ($s[0] == "#") $out['id'] = substr($s, 1);
-      if ($s[0] == ".") $out['class'][] = substr($s, 1);
+    }
+      if ($s[0] == ".") {
+        $out['class'][] = substr($s, 1);
+      }
     }
     return $out;
   }
@@ -62,21 +70,24 @@ 
   function addSnipContent($contentTag, &$tagArray = array(), $key = 0) {
     if ($this->type == "content") {
       $tagArray[$key] = $contentTag;
-    } else
-      parent::addSnipContent($contentTag, $tagArray, $key);
+    } else {
+          parent::addSnipContent($contentTag, $tagArray, $key);
+    }
   }
 
   function apply(Hamle\Tag $rootTag) {
     if ($this->type == "append" or $this->type == "prepend") {
       $matchTags = $rootTag->find($this->path);
-      foreach ($matchTags as $tag)
-        foreach ($this->tags as $t) {
+      foreach ($matchTags as $tag) {
+              foreach ($this->tags as $t) {
           $tag->addChild($t, $this->type);
+      }
         }
     } elseif ($this->type == "replace") {
       $rootTag->replace($this->path, $this);
-    } else
-      throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
+    } else {
+          throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
+    }
   }
 
 }
\ No newline at end of file

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