From e883d184b7b0490a3d0313b13e239d6f7661e999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sun, 28 Jun 2020 19:30:38 +0200
Subject: [PATCH] MAPG-187 refactor view parsing and linking

---
 src/View/Linker.php | 27 ++++++++++++---------------
 src/View/Parser.php |  4 ++--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/View/Linker.php b/src/View/Linker.php
index b92fed3..b9e237b 100644
--- a/src/View/Linker.php
+++ b/src/View/Linker.php
@@ -108,7 +108,7 @@ class Linker
     private function generateAssets(ParsedFragment $fragment, array &$sections)
     {
         foreach ($fragment->getCss() as $cssFile) {
-            $asset = $this->parseAsset($cssFile, 'css');
+            $asset = $this->parseAsset($cssFile);
             if (isset($asset['code'])) {
                 $sections['inlineCss'] .= '<style>' . PHP_EOL;
                 $sections['inlineCss'] .= $asset['code'];
@@ -119,7 +119,7 @@ class Linker
         }
 
         foreach ($fragment->getJs() as $jsFile) {
-            $asset = $this->parseAsset($jsFile, 'js');
+            $asset = $this->parseAsset($jsFile);
             if (isset($asset['code'])) {
                 $sections['inlineJs'] .= '<script>' . PHP_EOL;
                 $sections['inlineJs'] .= $asset['code'];
@@ -130,24 +130,21 @@ class Linker
         }
     }
 
-    private function parseAsset(string $asset, string $type): array
+    private function parseAsset(string $asset): array
     {
         $output = [];
 
-        eval('$asset = ' . $asset . ';');
-
-        if (
-            empty($_ENV['DEV']) &&
-            preg_match('/^' . $type . '\/.*/', $asset) &&
-            filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
-        ) {
-            $output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
-        } else {
-            if (!preg_match('/^http(s)?/', $asset)) {
-                $output['file'] = $_ENV['STATIC_ROOT'] .  '/' . $asset . '?rev=<?= REVISION ?>';
+        if (preg_match('/^[\w\/\.]+$/', $asset)) {
+            if (
+                empty($_ENV['DEV']) &&
+                filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
+            ) {
+                $output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
             } else {
-                $output['file'] = $asset;
+                $output['file'] = '<?= $_ENV[\'STATIC_ROOT\'] ?>/' . $asset . '?rev=<?= REVISION ?>';
             }
+        } else {
+            $output['file'] = $asset;
         }
 
         return $output;
diff --git a/src/View/Parser.php b/src/View/Parser.php
index 0356027..7802a7a 100644
--- a/src/View/Parser.php
+++ b/src/View/Parser.php
@@ -126,7 +126,7 @@ class Parser
 
     private function matchExtends(string $line): ?string
     {
-        if (preg_match('/^\s*@extends\(\'([\w\/]+)\'\)\s*$/', $line, $matches)) {
+        if (preg_match('/^\s*@extends\(([\w\/]+)\)\s*$/', $line, $matches)) {
             return $matches[1];
         }
 
@@ -135,7 +135,7 @@ class Parser
 
     private function matchSection(string $line): ?string
     {
-        if (preg_match('/^\s*@section\(\'(\w+)\'\)\s*$/', $line, $matches)) {
+        if (preg_match('/^\s*@section\((\w+)\)\s*$/', $line, $matches)) {
             return $matches[1];
         }