Merge pull request #3 from cherry-framework/features/short-prints

ABGEO · web-flow · commit 1fe4edf99911 · 2019-05-11T22:51:35.000+04:00
Features/short prints
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Markup with PHP:
     <title>Hello, World!</title>
 </head>
 <body>
-    <h1>Hello, <?php echo $name; ?>!</h1>
+    <h1>Hello, {{ name }}!</h1>
 </body>
 </html>
 ```
diff --git a/examples/templates/index.templater.php b/examples/templates/index.templater.php
@@ -5,6 +5,6 @@
     <title>Hello, World!</title>
 </head>
 <body>
-    <h1>Hello, <?php echo $name; ?>!</h1>
+    <h1>Welcome, {{ name }} {{ surname }}!</h1>
 </body>
 </html>
diff --git a/examples/test.php b/examples/test.php
@@ -10,5 +10,6 @@
 $templateEngine = new Templater(__DIR__ . '/../examples/templates');
 
 echo $templateEngine->render('index', [
-    'name' => 'Temuri'
+    'name' => 'Temuri',
+    'surname' => 'Takalandze'
 ]);
diff --git a/src/Templating/Templater.php b/src/Templating/Templater.php
@@ -117,6 +117,30 @@ private function _readeTemplate($template)
         return $content;
     }
 
+    /**
+     * Prepare template content for caching.
+     *
+     * @param string $content Template content.
+     *
+     * @return string
+     */
+    private function _normalizeContent($content)
+    {
+        // Check if content has short prints ( {{ variableToPrint }} )
+        if (preg_match_all('/{{(.*?)}}/', $content, $matches)) {
+            // Get all short pints and replace to php echo
+            foreach ($matches[0] as $k => $v) {
+                $changeMe = $matches[0][$k];
+                $changeTo = '<?php echo $' . trim($matches[1][$k]) . '; ?>';
+
+                // Replace txt in content
+                $content = str_replace($changeMe, $changeTo, $content);
+            }
+        }
+
+        return $content;
+    }
+
     /**
      * Cache given template.
      *
@@ -130,7 +154,7 @@ private function _cacheTemplate($content)
 
         file_put_contents(
             $this->_cachedTemplatesDir . '/' . $contentHash . '.php',
-            $content
+            $this->_normalizeContent($content)
         );
     }
 }
