cseufert / hamle

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

php/hamle/Text/Func.php

Spacing +19 added lines, -19 removed lines

@@ -50,7 +50,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 \$ func in '$s'");
     if (trim($m[2]))
       $this->sub = new FuncSub($m[2]);
@@ -92,13 +92,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;
   }
@@ -116,25 +116,25 @@ 
    * @return string PHP Code
    */
   public function toPHP() {
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    if($this->scope instanceof Scope) {
-      return $this->scope->toPHP() . $sub;
-    } elseif($this->scope === true) {
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    if ($this->scope instanceof Scope) {
+      return $this->scope->toPHP().$sub;
+    } elseif ($this->scope === true) {
       return "Hamle\\Scope::get(0)$sub";
     }
-    $limit = Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
+    $limit = Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'];
     if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
-      Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+      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)
-        return "Hamle\\Run::modelId(" .
-        Text::varToCode(current($this->filt['id']['*'])) .
+        return "Hamle\\Run::modelId(".
+        Text::varToCode(current($this->filt['id']['*'])).
         ",$limit)$sub";
       else
-        return "Hamle\\Run::modelTypeId(" .
-        Text::varToCode($this->filt['id']) . ",$limit)$sub";
+        return "Hamle\\Run::modelTypeId(".
+        Text::varToCode($this->filt['id']).",$limit)$sub";
     return "";
   }
 
@@ -143,7 +143,7 @@ 
    * @return Model
    */
   public function getOrCreateModel(Model $parent = null) {
-    if($this->scope instanceof Scope) {
+    if ($this->scope instanceof Scope) {
       $parent = $this->scope->getOrCreateModel();
     } elseif ($this->scope === true)
       $parent = \Seufert\Hamle\Scope::get(0);
@@ -169,9 +169,9 @@ 
           $this->sortlimit['limit'],
           $this->sortlimit['offset']
         );
-    if($this->sub)
+    if ($this->sub)
       return $this->sub->getOrCreateModel($parent)->current();
-    if(!$parent)
+    if (!$parent)
       throw new \RuntimeException('Unable to create model with no relation');
     return $parent->current();
   }

php/hamle/Text/Complex.php

Spacing +12 added lines, -12 removed lines

@@ -37,9 +37,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 = preg_split("/-[>!]/", $s);
     // if(count($s) == 1) $s = explode("-!",$s[0]);
@@ -55,27 +55,27 @@ 
   }
 
   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() {
     if ($this->sel) {
       $sel = array();
       foreach ($this->sel as $s)
         $sel[] = "hamleGet('$s')";
-      return $this->func->toPHP() . "->" . implode('->', $sel);
+      return $this->func->toPHP()."->".implode('->', $sel);
     } else
       return $this->func->toPHP();
   }
 
   function getOrCreateModel(Model $parent = null) {
-    if($this->func instanceof Text\Scope)
+    if ($this->func instanceof Text\Scope)
       return $this->func->getOrCreateModel($parent);
-    if($this->func instanceof Text\Func)
+    if ($this->func instanceof Text\Func)
       return $this->func->getOrCreateModel($parent);
     throw new RuntimeException('Unsupported func type encountered:'.get_class($this->func));
   }
@@ -85,10 +85,10 @@ 
    * @return WriteModel
    */
   function setValue($value) {
-    if(!$this->sel || count($this->sel) != 1)
+    if (!$this->sel || count($this->sel) != 1)
       throw new RuntimeException('Can only set values, when one var name is present');
     $model = $this->getOrCreateModel();
-    if(!$model instanceof WriteModel)
+    if (!$model instanceof WriteModel)
       throw new RuntimeException('Can only set values on WriteModel, got '.get_class($model));
     $model->hamleSet($this->sel[0], $value);
     return $model;

php/hamle/Scope.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
       self::$namedScopes[$name] = $model;

     else

       self::$scopes[] = $model;

-    if(self::$scopeHook) {

+    if (self::$scopeHook) {

         (self::$scopeHook)($model);

     }

   }

@@ -73,7 +73,7 @@ 
       self::$namedScopes[$name]->rewind();

       return self::$namedScopes[$name];

     } else

-      if(self::$returnZeroOnNoScope)

+      if (self::$returnZeroOnNoScope)

         return new Model\Zero();

       throw new RunTime("Unable to find scope ($name)");

   }

php/hamle/Parse.php

Spacing +8 added lines, -8 removed lines

@@ -156,7 +156,7 @@ 
         $i = self::indentLevel($indent);
         unset($m[0]);
         switch (strlen($code) ? $code[0] : ($textcode ? $textcode : "")) {
-          case "|": //Control Tag
+          case "|" : //Control Tag
             if ($code == "|snippet")
               $hTag = new Tag\Snippet($text);
             elseif ($code == "|form")
@@ -196,7 +196,7 @@ 
             break;
           default:
             $attr = array();
-            if(isset($params[0]) && $params[0] == "[") {
+            if (isset($params[0]) && $params[0] == "[") {
               $param = substr($params, 1, -1);
               $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
 //              parse_str($param, $attr);
@@ -209,7 +209,7 @@ 
               if ($s[0] == ".") $class[] = substr($s, 1);
               if ($s[0] == "!") $ref = substr($s, 1);
             }
-            if($ref)
+            if ($ref)
               $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
             else
               $hTag = new Tag\Html($tag, $class, $attr, $id);
@@ -222,16 +222,16 @@ 
         else
           $this->root[] = $hTag;
       } else
-        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/".preg_last_error());
       $this->lineNo++;
     }
   }
 
   function parseQueryString($qs) {
     $out = [];
-    foreach(explode('&',$qs) as $s) {
-      $kv = explode('=',$s,2);
-      $out[urldecode($kv[0])] = isset($kv[1])?urldecode($kv[1]):null;
+    foreach (explode('&', $qs) as $s) {
+      $kv = explode('=', $s, 2);
+      $out[urldecode($kv[0])] = isset($kv[1]) ?urldecode($kv[1]) : null;
     }
     return $out;
   }
@@ -249,7 +249,7 @@ 
     $m = array();
     while ($this->lineNo + 1 < $this->lineCount &&
         (!trim($this->lines[$this->lineNo + 1]) ||
-            preg_match('/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
+            preg_match('/^(\s){'.$indent.'}((\s)+[^\s].*)$/',
                 $this->lines[$this->lineNo + 1], $m))) {
       if (trim($this->lines[$this->lineNo + 1]))
         $out[] = $m[2];

php/hamle/Field.php

Spacing +7 added lines, -7 removed lines

@@ -112,16 +112,16 @@ 
 
   function getValue() {
     if (!is_null($this->setValue)) return $this->setValue;
-    if (isset($_REQUEST[$this->form . "_" . $this->name])) {
-      return $_REQUEST[$this->form . "_" . $this->name];
+    if (isset($_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) {
@@ -139,8 +139,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']);
   }
 
@@ -148,7 +148,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/Text.php

Spacing +25 added lines, -25 removed lines

@@ -51,7 +51,7 @@ 
   const FIND_DOLLARVAR = 0x02;
   const FIND_BARDOLLAR = 0x04;
 
-  const START_RULE_MAP = [self::TOKEN_HTML => 'HtmlInput', self::TOKEN_CODE => 'CodeInput',self::TOKEN_CONTROL => 'ControlInput'];
+  const START_RULE_MAP = [self::TOKEN_HTML => 'HtmlInput', self::TOKEN_CODE => 'CodeInput', self::TOKEN_CONTROL => 'ControlInput'];
 
   protected $mode;
 
@@ -61,9 +61,9 @@ 
   {
 //    var_dump($s);
     $this->mode = $mode;
-    $this->tree = (new Parser())->parse($s,['startRule' => self::START_RULE_MAP[$mode]]);
+    $this->tree = (new Parser())->parse($s, ['startRule' => self::START_RULE_MAP[$mode]]);
 //    var_dump($this->tree);
-    if(!$this->tree instanceof Doc) {
+    if (!$this->tree instanceof Doc) {
       $this->tree = new Doc(is_array($this->tree) ? $this->tree : [$this->tree]);
     }
 //    $m = [];
@@ -114,7 +114,7 @@ 
   {
     $func = $filter['func'];
     if (method_exists(Filter::class, $func)) {
-      $func = Filter::class . '::' . $func;
+      $func = Filter::class.'::'.$func;
     } elseif (in_array($func, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
     } elseif ($func === 'json') {
       $func = 'json_encode';
@@ -124,14 +124,14 @@ 
       throw new ParseError("Unknown Filter Type \"{$func}\"");
     }
     $args = join(',', array_map(function($v) {
-      if(is_array($v) && $v['type'] ?? false === 'expr') {
+      if (is_array($v) && $v['type'] ?? false === 'expr') {
         return self::renderExpr($v);
       } else
         return self::varToCode($v);
     } , $filter['args']));
-    if(strlen($args)) $args = ','.$args;
-    $o = "$func($o" . $args . ")";
-    if($filter['chain'] ?? false) {
+    if (strlen($args)) $args = ','.$args;
+    $o = "$func($o".$args.")";
+    if ($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
     }
     return $o;
@@ -139,21 +139,21 @@ 
 
   static function renderScopeThis($n)
   {
-    $o = 'Hamle\Scope::get()->hamleGet(' . self::varToCode($n['name']) . ')';
+    $o = 'Hamle\Scope::get()->hamleGet('.self::varToCode($n['name']).')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
 
   static function renderScopeId($n)
   {
-    $o = 'Hamle\Scope::get(' . $n['id'] . ')';
+    $o = 'Hamle\Scope::get('.$n['id'].')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
 
   static function renderScopeName($n)
   {
-    $o = 'Hamle\Scope::getName(' . self::varToCode($n['name']) . ')';
+    $o = 'Hamle\Scope::getName('.self::varToCode($n['name']).')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
@@ -161,7 +161,7 @@ 
   static function addParams(string $o, array $params)
   {
     while ($params['type'] ?? null === 'sub') {
-      $o .= '->hamleGet(' . self::varToCode($params['name']) . ')';
+      $o .= '->hamleGet('.self::varToCode($params['name']).')';
       $params = $params['params'] ?? [];
     }
     return $o;
@@ -170,7 +170,7 @@ 
   static function addRel(string $o, array $query, string $rel): string
   {
     $r = $rel === 'child' ? Hamle::REL_CHILD : Hamle::REL_PARENT;
-    $o = $o . "->hamleRel(" . self::varToCode($r) . ',' . self::queryParams($query, true) . ')';
+    $o = $o."->hamleRel(".self::varToCode($r).','.self::queryParams($query, true).')';
     return $o;
   }
 
@@ -230,7 +230,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset)
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   static function renderQuery($n)
@@ -249,7 +249,7 @@ 
     } elseif ($id !== null) {
       $o = self::queryId($n['query']);
     } else {
-      $o = 'Hamle\Run::modelTypeTags(' . self::queryParams($n['query']) . ')';
+      $o = 'Hamle\Run::modelTypeTags('.self::queryParams($n['query']).')';
     }
     if ($n['sub'] ?? []) {
       $o = self::addRel($o, $n['sub'], $n['rel']);
@@ -276,7 +276,7 @@ 
         $o = self::renderQuery($expr['body']);
         break;
       default:
-        throw new \RuntimeException('Invalid Node: ' . $expr['body']['type']);
+        throw new \RuntimeException('Invalid Node: '.$expr['body']['type']);
     }
     if ($expr['body']['filter'] ?? false) {
       $o = self::addFilter($o, $expr['body']['filter']);
@@ -295,16 +295,16 @@ 
             $out .= $node['body'];
           break;
         case 'scopeName':
-          $out .= '<?=' . self::renderScopeName($node) . '?>';
+          $out .= '<?='.self::renderScopeName($node).'?>';
           break;
         case 'scopeThis':
-          $out .= '<?=' . self::renderScopeThis($node) . '?>';
+          $out .= '<?='.self::renderScopeThis($node).'?>';
           break;
         case 'expr':
-          $out .= '<?=' . self::renderExpr($node) . "?>";
+          $out .= '<?='.self::renderExpr($node)."?>";
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return $out;
@@ -332,7 +332,7 @@ 
           $out [] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -340,7 +340,7 @@ 
 
   function doEval()
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var)
@@ -348,9 +348,9 @@ 
     if (is_array($var)) {
       $code = [];
       foreach ($var as $key => $value) {
-        $code[] = self::varToCode($key) . '=>' . self::varToCode($value);
+        $code[] = self::varToCode($key).'=>'.self::varToCode($value);
       }
-      return 'array(' . implode(',', $code) . ')'; //remove unnecessary coma
+      return 'array('.implode(',', $code).')'; //remove unnecessary coma
     }
     if (is_bool($var)) {
       return ($var ? 'TRUE' : 'FALSE');
@@ -361,7 +361,7 @@ 
     if ($var instanceof Text) {
       return $var->toPHP();
     }
-    return "'" . str_replace(['$', "'"], ['$', "\\'"], $var) . "'";
+    return "'".str_replace(['$', "'"], ['$', "\\'"], $var)."'";
   }
 
   /**

php/hamle/TextNode/ScopeName.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 
 
   public function toPHP():string {
-    $o = "Hamle\\Scope::getName(" . Text::varToCode($this->name) . ")";
+    $o = "Hamle\\Scope::getName(".Text::varToCode($this->name).")";
     if ($this->immediate) $o = $this->immediate->apply($o);
-    if($this->chain) $o = $this->chain->apply($o);
+    if ($this->chain) $o = $this->chain->apply($o);
     return $o;
   }
 

php/hamle/TextNode/ModelParam.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 
   public function apply(string $out): string
   {
-    $o = "{$out}->hamleGet(" . Text::varToCode($this->name) . ")";
-    if($this->chain)
+    $o = "{$out}->hamleGet(".Text::varToCode($this->name).")";
+    if ($this->chain)
       $o = $this->chain->apply($o);
     return $o;
   }