cseufert / hamle

php/hamle/Text/Comparison.php

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

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
   }
 
   function toPHP() {
-    return '$form->getField(' . Text::varToCode($this->var) . ')->getValue()';
+    return '$form->getField('.Text::varToCode($this->var).')->getValue()';
   }
 
   function toHTML($escape = false) {
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
 }
\ No newline at end of file

php/hamle/Field/Button.php

Spacing +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
   }
 
   function isClicked() {
-    return isset($_REQUEST[$this->form . "_" . $this->name]);
+    return isset($_REQUEST[$this->form."_".$this->name]);
   }
 }
\ No newline at end of file

php/hamle/Form.php

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

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

Spacing +5 added lines, -5 removed lines

@@ -36,17 +36,17 @@ 
   function __construct($s) {
     $m = [];
     //var_dump($s);
-    if(!preg_match('/\$\[(-?[0-9]+|[a-zA-Z][a-zA-Z0-9]+)\]/', $s, $m)) {
+    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) . ")";
+    if (is_numeric($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).")";
     }
   }
 
@@ -60,7 +60,7 @@ 
 
 
   function getOrCreateModel(Model $parent = null) {
-    if(is_numeric($this->scope)) {
+    if (is_numeric($this->scope)) {
       return \Seufert\Hamle\Scope::get($this->scope);
     }
     return \Seufert\Hamle\Scope::getName($this->scope);

php/hamle/Text/SimpleVar.php

Spacing +9 added lines, -9 removed lines

@@ -35,26 +35,26 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->var = substr($s,1,$pos-1);
-      $this->filter = new Filter(substr($s, $pos+1), $this);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->var = substr($s, 1, $pos - 1);
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
     } else {
       $this->var = substr($s, 1);
     }
   }
 
   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() {
-    return "Hamle\\Scope::get()->hamleGet(" . Text::varToCode($this->var) . ")";
+    return "Hamle\\Scope::get()->hamleGet(".Text::varToCode($this->var).")";
   }
 
   function getOrCreateModel(Model $parent = null) {
@@ -67,7 +67,7 @@ 
    */
   function setValue($value) {
     $model = $this->getOrCreateModel();
-    if(!$model instanceof WriteModel)
+    if (!$model instanceof WriteModel)
       throw new \RuntimeException('Can only write to model that implements WriteModel');
     $model->hamleSet($this->var, $value);
     return $model;

php/hamle/Text/FuncSub.php

Spacing +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
    */
   public 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;
@@ -57,24 +57,24 @@ 
    * @return string
    */
   public function toPHP() {
-    $limit = Hamle\Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'] . "," .
+    $limit = Hamle\Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'].",".
         $this->grouptype['grouptype'];
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    return "hamleRel(" . $this->dir . "," .
-    Hamle\Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    return "hamleRel(".$this->dir.",".
+    Hamle\Text::varToCode($this->filt['tag']).",$limit)$sub";
   }
 
   public function getOrCreateModel(Model $parent = null) {
     $model = $parent->hamleRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
       $this->sortlimit['limit'], $this->sortlimit['offset']);
-    if(!$model->valid()) {
-      if(!$parent instanceof Hamle\WriteModel)
-        throw new \Exception('Cant create model, ' . get_class($parent) . ' must implement Hamle\\WriteModel.');
+    if (!$model->valid()) {
+      if (!$parent instanceof Hamle\WriteModel)
+        throw new \Exception('Cant create model, '.get_class($parent).' must implement Hamle\\WriteModel.');
       $model = $parent->current()->hamleCreateRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
         $this->sortlimit['limit'], $this->sortlimit['offset']);
     }
-    if($this->sub)
+    if ($this->sub)
       return $this->sub->getOrCreateModel($model)->current();
     return $model->current();
   }

php/hamle/Text/Filter.php

Spacing +21 added lines, -21 removed lines

@@ -41,47 +41,47 @@ 
   protected $chained;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
+    if (preg_match("/^([a-z]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
-      if(isset($m['chained']) && strlen($m['chained'])) {
-        $this->chained = new Filter($m['chained'],$what);
+      foreach ($this->vars as $k=>$v)
+        $this->vars[$k] = str_replace("&comma;", ',', $v);
+      if (isset($m['chained']) && strlen($m['chained'])) {
+        $this->chained = new Filter($m['chained'], $what);
       }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(method_exists(Filter::class, $this->filter)) {
+    if (method_exists(Filter::class, $this->filter)) {
       $this->filter = "Seufert\\Hamle\\Text\\Filter::{$this->filter}";
-    } elseif(!in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst', 'json'])) {
+    } elseif (!in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst', 'json'])) {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
     $mapFilter = ['json'=>'json_encode'];
-    if(isset($mapFilter[$this->filter]))
+    if (isset($mapFilter[$this->filter]))
       $this->filter = $mapFilter[$this->filter];
     $this->what = $what;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
+    if ($this->chained)
       $pre = $this->chained->toPHPpre();
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
+    if ($this->chained)
       $post = $this->chained->toPHPpost();
     $o = '';
-    foreach($this->vars as $v)
+    foreach ($this->vars as $v)
       $o .= ','.$this->varToCode($v);
     return "$o)$post";
   }
@@ -96,24 +96,24 @@ 
 
   static function itersplit($v, $sep = ",") {
     $o = [];
-    foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+    foreach (explode($sep, $v) as $k=>$i) {
+      if ($i)
+        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k, 'key'=>$k];
     }
     return new WrapArray($o);
   }
 
   static function newlinebr($v) {
-    return str_replace("\n","<br />\n",$v);
+    return str_replace("\n", "<br />\n", $v);
   }
 
   static function replace($v, $src, $dst) {
-    return str_replace($src,$dst,$v);
+    return str_replace($src, $dst, $v);
   }
 
   static function ascents($v) {
-    $v = str_replace(['$',' ',','],'', $v);
-    return (int) round($v * 100,0);
+    $v = str_replace(['$', ' ', ','], '', $v);
+    return (int) round($v * 100, 0);
   }
 
 }
\ No newline at end of file