Edit twig annotation regex to look for query ending (#367)

fjgarlin · pmelab · commit ded7454a7f19 · 2017-10-10T13:53:42.000+02:00
* #366 Edit annotation regex to look for query ending. * #366 Make regex non-greedy instead of searching for query end.
diff --git a/modules/graphql_twig/src/GraphQLTwigEnvironment.php b/modules/graphql_twig/src/GraphQLTwigEnvironment.php
@@ -21,7 +21,7 @@ class GraphQLTwigEnvironment extends TwigEnvironment {
    *
    * @var string
    */
-  public static $GRAPHQL_ANNOTATION_REGEX = '/{#graphql\s+(?<query>.*)\s+#\}/s';
+  public static $GRAPHQL_ANNOTATION_REGEX = '/{#graphql\s+(?<query>.*?)\s+#\}/s';
 
   public function compileSource($source, $name = NULL) {
     if ($source instanceof \Twig_Source) {
@@ -65,4 +65,4 @@ public function replaceAnnotation($code) {
     return preg_replace(static::$GRAPHQL_ANNOTATION_REGEX, '{% graphql %}$1{% endgraphql %}', $code);
   }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class GraphQLTwigEnvironment extends TwigEnvironment {`
`21`	`21`	`*`
`22`	`22`	`* @var string`
`23`	`23`	`*/`
`24`		`- public static $GRAPHQL_ANNOTATION_REGEX = '/{#graphql\s+(?<query>.*)\s+#\}/s';`
	`24`	`+ public static $GRAPHQL_ANNOTATION_REGEX = '/{#graphql\s+(?<query>.*?)\s+#\}/s';`
`25`	`25`
`26`	`26`	`public function compileSource($source, $name = NULL) {`
`27`	`27`	`if ($source instanceof \Twig_Source) {`
`@@ -65,4 +65,4 @@ public function replaceAnnotation($code) {`
`65`	`65`	`return preg_replace(static::$GRAPHQL_ANNOTATION_REGEX, '{% graphql %}$1{% endgraphql %}', $code);`
`66`	`66`	`}`
`67`	`67`
`68`		`-}`
	`68`	`+}`