cseufert / hamle

php/hamle/Setup.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     if (!is_dir($dir)) {
       mkdir($dir);
     }
-    return $dir . $f;
+    return $dir.$f;
   }
 
   /**

php/hamle/Parse.php

Indentation -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                };
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          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;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

Switch Indentation -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                };
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          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;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

Spacing -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                };
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          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;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

Braces -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                };
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          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;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

Upper-Lower-Casing -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      };
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                };
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          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;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

php/hamle/Text.php

Spacing +25 added lines, -25 removed lines

@@ -122,7 +122,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'])
     ) {
@@ -138,7 +138,7 @@ 
     }
     $args = join(
       ',',
-      array_map(function ($v) {
+      array_map(function($v) {
         if (is_array($v) && $v['type'] ?? false === 'expr') {
           return self::renderExpr($v);
         } else {
@@ -147,9 +147,9 @@ 
       }, $filter['args']),
     );
     if (strlen($args)) {
-      $args = ',' . $args;
+      $args = ','.$args;
     }
-    $o = "$func($o" . $args . ')';
+    $o = "$func($o".$args.')';
     if ($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
     }
@@ -158,21 +158,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;
   }
@@ -180,7 +180,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;
@@ -190,11 +190,11 @@ 
   {
     $r = $rel === 'child' ? Hamle::REL_CHILD : Hamle::REL_PARENT;
     $o =
-      $o .
-      '->hamleRel(' .
-      self::varToCode($r) .
-      ',' .
-      self::queryParams($query, true) .
+      $o.
+      '->hamleRel('.
+      self::varToCode($r).
+      ','.
+      self::queryParams($query, true).
       ')';
     return $o;
   }
@@ -256,7 +256,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset),
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   static function renderQuery($n)
@@ -277,7 +277,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']);
@@ -304,7 +304,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']);
@@ -324,16 +324,16 @@ 
           }
           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;
@@ -362,7 +362,7 @@ 
           $out[] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -370,7 +370,7 @@ 
 
   function doEval()
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var)
@@ -378,9 +378,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';
@@ -391,7 +391,7 @@ 
     if ($var instanceof Text) {
       return $var->toPHP();
     }
-    return "'" . str_replace(['$', "'"], ['$', "\\'"], $var) . "'";
+    return "'".str_replace(['$', "'"], ['$', "\\'"], $var)."'";
   }
 
   /**

php/hamle/Field/Button.php

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 
   function isClicked()
   {
-    return isset($_REQUEST[$this->form . '_' . $this->name]);
+    return isset($_REQUEST[$this->form.'_'.$this->name]);
   }
 }

php/hamle/Field/Checkbox.php

Spacing +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
     if (!is_null($this->setValue)) {
       return $this->setValue;
     }
-    if (isset($_REQUEST[$this->form . '__submit'])) {
-      return isset($_REQUEST[$this->form . '_' . $this->name]);
+    if (isset($_REQUEST[$this->form.'__submit'])) {
+      return isset($_REQUEST[$this->form.'_'.$this->name]);
     }
     return $this->opt['default'];
   }

php/hamle/TextNode/ScopeName.php

Spacing +1 added lines, -1 removed lines

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

php/hamle/TextNode/ModelParam.php

Spacing +1 added lines, -1 removed lines

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

php/hamle/TextNode/FilterFunc.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     $this->chain = $chain;
     $this->args = $args;
     if (method_exists(Filter::class, $func)) {
-      $this->func = Filter::class . '::' . $func;
+      $this->func = Filter::class.'::'.$func;
     } elseif (
       in_array($func, ['round', 'strtoupper', 'strtolower', 'ucfirst'])
     ) {
@@ -48,7 +48,7 @@ 
       $this->args,
     );
     array_unshift($args, $out);
-    $o = "{$this->func}(" . join(',', $args) . ')';
+    $o = "{$this->func}(".join(',', $args).')';
     if ($this->chain) {
       $o = $this->chain->apply($o);
     }

php/hamle/TextNode/RelQuery.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
     $this->filters = $filters;
   }
 
-  static function for(string $rel, array $filters)
+  static function for (string $rel, array $filters)
   {
     return new self(
       $rel === '>' ? Hamle::REL_CHILD : Hamle::REL_PARENT,
@@ -31,9 +31,9 @@ 
   public function apply(string $s): string
   {
     $s =
-      $s .
-      "->hamleRel({$this->rel}," .
-      Query::queryParams($this->filters, true) .
+      $s.
+      "->hamleRel({$this->rel},".
+      Query::queryParams($this->filters, true).
       ')';
     if ($this->chain) {
       $s = $this->chain->apply($s);