Cleaned up regex

README.md

@@ -20,6 +20,21 @@ If you are looking for a lightweight template engine to use with PHP, please
 fork the project and add your own customizations. I'd love you see what you
 come up with.
 
+# Support Control Structures Syntax
+
+This is the syntax for the control structures.
+
+```
+{if},{elseif},{else},{end}
+{for},{endfor}
+{foreach},{endforeach}
+{while},{endwhile}
+
+
+```
+
+
+
 # Render a string
 
 Create an instance of the class, assign a few variables, and then render the string.

src/SurfStack/Templating/Template_Engine.php

@@ -610,7 +610,7 @@ protected function stripTags($content)
         //$stripTags[] = '/'.$stripSpace.'\{\*(.[^\}\{]*?)\*\}'.$stripSpace.'/s';
 
         // Strip section tags and all space around
-        $stripTags[] = '/\s*\{\s*(section)\s*(.*?)\}(.*?)\{\/\s*section\s*\}\s*/si';
+        $stripTags[] = '/\s*\{(section)\s*(.*?)\}(.*?)\{\/section\s*\}\s*/si';
 
         return preg_replace($stripTags, '', $content);
     }
@@ -681,7 +681,7 @@ protected function updateEmbeddedFiles($content)
             'require',
         ) as $c)
         {
-            $regex['<?php '.$c.' $1; ?>'] = '/\{\s*'.$c.'\s+(.*?)\}/';
+            $regex['<?php '.$c.' $1; ?>'] = '/\{'.$c.'\s+(.*?)\}/';
         }
 
         // Embed files into templates
@@ -956,7 +956,7 @@ protected function modifyTemplateRegex($content)
                 'declare',
             ) as $c)
             {
-                $regex['/\{\s*'.$c.'\s*(.*?)\}/'] = '<?php '.$c.' $1: ?>';
+                $regex['/\{'.$c.'\s*(.*?)\}/'] = '<?php '.$c.' $1: ?>';
             }
 
             // Replace bottoms (semicolons)
@@ -969,20 +969,21 @@ protected function modifyTemplateRegex($content)
                 'endswitch',
                 'break',
                 'continue',
+                'dowhile',
             ) as $c)
             {
-                $regex['/\{\s*'.$c.'\s*(.*?)\}/'] = '<?php '.$c.'$1; ?>';
+                $regex['/\{'.$c.'\s*(.*?)\}/'] = '<?php '.$c.'$1; ?>';
             }
 
             // Replace the outliers
             $custom = array(
                 '/\{\*(.[^\}\{]*?)\*\}/s' => '/*$1*/',
                 '/\{=e\s*(.*?)\}/' => '<?php echo htmlentities($1, ENT_QUOTES, "UTF-8"); ?>',
                 '/\{=\s*(.*?)\}/' => '<?php echo $1; ?>',
-                '/\{\s*case\s*(.*?)\}/' => '<?php case $1: ?>',
-                '/\{\s*switch\s*(.[^'."\r\n".']*?)'."\r\n".'(.*?)\}/' => '<?php switch $1:'."\r\n".'$2: ?>',
-                '/\{\s*switch\s*(.[^'."\n".']*?)'."\n".'(.*?)\}/' => '<?php switch $1:'."\n".'$2: ?>',
-                '/\{\s*\$\s*(.*?)\}/' => '<?php $$1; ?>',
+                '/\{case\s*(.*?)\}/' => '<?php case $1: ?>',
+                '/\{switch\s*(.[^'."\r\n".']*?)'."\r\n".'(.*?)\}/' => '<?php switch $1:'."\r\n".'$2: ?>',
+                '/\{switch\s*(.[^'."\n".']*?)'."\n".'(.*?)\}/' => '<?php switch $1:'."\n".'$2: ?>',
+                '/\{\$\s*(.*?)\}/' => '<?php $$1; ?>',
             );
 
             // Replace the { tags with PHP tags