Fix issue NightlyCommit#348

ericmorand · Jun 4, 2019 · 0210526 · 0210526
1 parent d7a3a33
commit 0210526
Show file tree

Hide file tree

Showing 42 changed files with 1,637 additions and 1,484 deletions.
diff --git a/src/core/filters/url-encode.ts b/src/core/filters/url-encode.ts
@@ -1,6 +1,8 @@
 import {isTraversable} from "../../helper/is-traversable";
 import {iteratorToHash} from "../../helper/iterator-to-hash";
 
+const http_build_query = require('locutus/php/url/http_build_query');
+
 /**
  * URL encodes (RFC 3986) a string as a path segment or a hash as a query string.
  *
@@ -9,8 +11,6 @@ import {iteratorToHash} from "../../helper/iterator-to-hash";
  * @returns {string} The URL encoded value
  */
 export function twingFilterUrlEncode(url: string | {}): string {
-    const http_build_query = require('locutus/php/url/http_build_query');
-
     if (typeof url !== 'string') {
         if (isTraversable(url)) {
             url = iteratorToHash(url);

diff --git a/src/environment.ts b/src/environment.ts
@@ -640,7 +640,7 @@ return module.exports;
      */
     compileSource(source: TwingSource): string {
         try {
-            return this.compile(this.parse(this.tokenize(source)));
+            return this.compile(this.parse(this.tokenize(source).toAst()));
         } catch (e) {
             if (e instanceof TwingError) {
                 throw e;

diff --git a/src/expression-parser.ts b/src/expression-parser.ts
diff --git a/src/extension/core.ts b/src/extension/core.ts
@@ -116,6 +116,7 @@ import {twingFunctionMax} from "../core/functions/max";
 import {twingFunctionMin} from "../core/functions/min";
 import {twingFunctionRange} from "../core/functions/range";
 import {twingFunctionConstant} from "../core/functions/constant";
+import {TwingTokenParserVerbatim} from "../token-parser/verbatim";
 
 export class TwingExtensionCore extends TwingExtension {
     private dateFormats: Array<string> = ['F j, Y H:i', '%d days'];
@@ -275,7 +276,8 @@ export class TwingExtensionCore extends TwingExtension {
             new TwingTokenParserWith(),
             new TwingTokenParserDeprecated(),
             new TwingTokenParserAutoEscape(),
-            new TwingTokenParserSandbox()
+            new TwingTokenParserSandbox(),
+            new TwingTokenParserVerbatim()
         ];
     }