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 1/2] 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];
         }
 

From 8ac5d5c6e26ba49dad2598c751a350355a8d3917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sun, 28 Jun 2020 19:32:30 +0200
Subject: [PATCH 2/2] MAPG-187 adapt views to the new parser

---
 views/account/account.php             |  6 +++---
 views/account/delete.php              |  6 +++---
 views/account/google_authenticate.php |  8 ++++----
 views/admin/map_editor.php            | 26 +++++++++++++-------------
 views/error/404.php                   |  4 ++--
 views/game.php                        | 14 +++++++-------
 views/login/activate.php              |  4 ++--
 views/login/cancel.php                |  4 ++--
 views/login/google_login.php          |  4 ++--
 views/login/google_signup.php         |  6 +++---
 views/login/login.php                 |  4 ++--
 views/login/signup.php                |  6 +++---
 views/login/signup_success.php        |  4 ++--
 views/maps.php                        | 10 +++++-----
 views/templates/layout_full.php       |  4 ++--
 views/templates/layout_minimal.php    |  4 ++--
 views/templates/layout_normal.php     |  5 +++--
 17 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/views/account/account.php b/views/account/account.php
index f1452f6..5ace830 100644
--- a/views/account/account.php
+++ b/views/account/account.php
@@ -1,8 +1,8 @@
-@js('js/account/account.js')
+@js(js/account/account.js)
 
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Account</h2>
     <div class="box">
         <form id="accountForm" action="/account" method="post" data-observe-inputs="password_new,password_new_confirm">
diff --git a/views/account/delete.php b/views/account/delete.php
index da22d90..51f4c36 100644
--- a/views/account/delete.php
+++ b/views/account/delete.php
@@ -1,8 +1,8 @@
-@js('js/account/account.js')
+@js(js/account/account.js)
 
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Delete account</h2>
     <div class="box">
         <form id="deleteAccountForm" action="/account/delete" method="post" data-redirect-on-success="/">
diff --git a/views/account/google_authenticate.php b/views/account/google_authenticate.php
index 12f889f..e265437 100644
--- a/views/account/google_authenticate.php
+++ b/views/account/google_authenticate.php
@@ -1,8 +1,8 @@
-@js('js/account/google_authenticate.js')
+@js(js/account/google_authenticate.js)
 
-@extends('templates/layout_minimal')
+@extends(templates/layout_minimal)
 
-@section('main')
+@section(main)
     <h2>Authenticate with Google</h2>
     <?php if (!$success): ?>
     <div class="box">
@@ -18,7 +18,7 @@
     <?php endif; ?>
 @endsection
 
-@section('pageScript')
+@section(pageScript)
 <script>
     var success = <?= $success ? 'true' : 'false' ?>;
     <?php if (isset($authenticatedWithGoogleUntil)): ?>
diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index 1f4ca55..b8d3d83 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -1,16 +1,16 @@
-@css('node_modules/leaflet/dist/leaflet.css')
-@css('css/map_editor.css')
-@css('node_modules/leaflet.markercluster/dist/MarkerCluster.css')
-@css('node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css')
+@css(node_modules/leaflet/dist/leaflet.css)
+@css(css/map_editor.css)
+@css(node_modules/leaflet.markercluster/dist/MarkerCluster.css)
+@css(node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css)
 
-@js('node_modules/leaflet/dist/leaflet.js')
-@js('node_modules/leaflet.markercluster/dist/leaflet.markercluster.js')
-@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
-@js('js/map_editor.js')
+@js(node_modules/leaflet/dist/leaflet.js)
+@js(node_modules/leaflet.markercluster/dist/leaflet.markercluster.js)
+@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
+@js(js/map_editor.js)
 
-@extends('templates/layout_full')
+@extends(templates/layout_full)
 
-@section('subheader')
+@section(subheader)
            <span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
         --><span><!--
             <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
@@ -38,7 +38,7 @@
         --></span>
 @endsection
 
-@section('pagemodal')
+@section(pagemodal)
 <div id="metadata" class="modal">
     <h2>Edit map data</h2>
     <form id="metadataForm" class="marginTop" data-no-submit="true">
@@ -52,7 +52,7 @@
 </div>
 @endsection
 
-@section('main')
+@section(main)
     <div id="map"></div>
     <div id="panorama"></div>
     <div id="noPano">
@@ -68,7 +68,7 @@
     </div>
 @endsection
 
-@section('pageScript')
+@section(pageScript)
 <script>
     var tileUrl = '<?= $_ENV['LEAFLET_TILESERVER_URL'] ?>';
     var tileAttribution = '<?= $_ENV['LEAFLET_TILESERVER_ATTRIBUTION'] ?>';
diff --git a/views/error/404.php b/views/error/404.php
index 7564012..0baa91e 100644
--- a/views/error/404.php
+++ b/views/error/404.php
@@ -1,6 +1,6 @@
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>404 | Page not found</h2>
     <p>The requested URL was not found on this server. <a href="/" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
 @endsection
diff --git a/views/game.php b/views/game.php
index a76554a..c772f29 100644
--- a/views/game.php
+++ b/views/game.php
@@ -1,17 +1,17 @@
-@css('css/game.css')
+@css(css/game.css)
 
-@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
-@js('js/game.js')
+@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
+@js(js/game.js)
 
-@extends('templates/layout_full')
+@extends(templates/layout_full)
 
-@section('subheader')
+@section(subheader)
         <span id="mapName" class="bold"><?= $mapName ?></span><!--
         --><span>Round <span id="currentRound" class="bold"></span></span><!--
         --><span>Score <span id="currentScoreSum" class="bold"></span></span>
 @endsection
 
-@section('main')
+@section(main)
     <div id="panoCover"></div>
     <div id="panorama"></div>
     <div id="showGuessButtonContainer">
@@ -48,7 +48,7 @@
     </div>
 @endsection
 
-@section('pageScript')
+@section(pageScript)
 <script>
     var mapId = <?= $mapId ?>;
     var mapBounds = <?= json_encode($bounds) ?>;
diff --git a/views/login/activate.php b/views/login/activate.php
index e28c707..e8dc7dd 100644
--- a/views/login/activate.php
+++ b/views/login/activate.php
@@ -1,6 +1,6 @@
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Account activation</h2>
     <div class="box">
         <p class="error justify">Activation failed. Please check the link you entered or retry <a href="/signup" title="Sign up">sign up</a>!</p>
diff --git a/views/login/cancel.php b/views/login/cancel.php
index 980c125..d61a821 100644
--- a/views/login/cancel.php
+++ b/views/login/cancel.php
@@ -1,6 +1,6 @@
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Account cancellation</h2>
     <div class="box">
         <?php if ($success) : ?>
diff --git a/views/login/google_login.php b/views/login/google_login.php
index 7cdd78d..c438c42 100644
--- a/views/login/google_login.php
+++ b/views/login/google_login.php
@@ -1,6 +1,6 @@
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Login up with Google</h2>
     <div class="box">
         <p class="error justify">Authentication with Google failed. Please <a href="/login/google" title="Login with Google">try again</a>!</p>
diff --git a/views/login/google_signup.php b/views/login/google_signup.php
index dd7b498..172c2e1 100644
--- a/views/login/google_signup.php
+++ b/views/login/google_signup.php
@@ -1,8 +1,8 @@
-@js('js/login/google_signup.js')
+@js(js/login/google_signup.js)
 
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Sign up</h2>
     <div class="box">
         <form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="/">
diff --git a/views/login/login.php b/views/login/login.php
index e2eef46..aa60932 100644
--- a/views/login/login.php
+++ b/views/login/login.php
@@ -1,6 +1,6 @@
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Login</h2>
     <div class="box">
         <form id="loginForm" action="/login" method="post" data-redirect-on-success="/">
diff --git a/views/login/signup.php b/views/login/signup.php
index ef63f04..1e3ee61 100644
--- a/views/login/signup.php
+++ b/views/login/signup.php
@@ -1,8 +1,8 @@
-@js('js/login/signup.js')
+@js(js/login/signup.js)
 
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Sign up</h2>
     <div class="box">
         <form id="signupForm" action="/signup" method="post" data-redirect-on-success="/signup/success">
diff --git a/views/login/signup_success.php b/views/login/signup_success.php
index f2a42f1..ddfa371 100644
--- a/views/login/signup_success.php
+++ b/views/login/signup_success.php
@@ -1,6 +1,6 @@
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <h2>Sign up</h2>
     <div class="box">
         <p class="justify">Sign up was successful. Please check your email and click on the activation link to activate your account!</p>
diff --git a/views/maps.php b/views/maps.php
index 22ecc11..d7b7df1 100644
--- a/views/maps.php
+++ b/views/maps.php
@@ -1,11 +1,11 @@
-@css('css/maps.css')
-@js('js/maps.js')
+@css(css/maps.css)
+@js(js/maps.js)
 TODO: condition!
-@js('js/maps_admin.js')
+@js(js/maps_admin.js)
 
-@extends('templates/layout_normal')
+@extends(templates/layout_normal)
 
-@section('main')
+@section(main)
     <div id="mapContainer">
         <?php foreach ($maps as $map): ?>
             <div class="mapItem">
diff --git a/views/templates/layout_full.php b/views/templates/layout_full.php
index 4a8fd24..0db8ef5 100644
--- a/views/templates/layout_full.php
+++ b/views/templates/layout_full.php
@@ -1,6 +1,6 @@
-@extends('templates/mapguesser')
+@extends(templates/mapguesser)
 
-@section('content')
+@section(content)
 <header class="small">
     <h1>
         <a href="/" title="<?= $_ENV['APP_NAME'] ?>">
diff --git a/views/templates/layout_minimal.php b/views/templates/layout_minimal.php
index 62cec7d..41e17c5 100644
--- a/views/templates/layout_minimal.php
+++ b/views/templates/layout_minimal.php
@@ -1,6 +1,6 @@
-@extends('templates/mapguesser')
+@extends(templates/mapguesser)
 
-@section('content')
+@section(content)
 <header>
     <h1>
         <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
diff --git a/views/templates/layout_normal.php b/views/templates/layout_normal.php
index 1b5dd61..9d3d049 100644
--- a/views/templates/layout_normal.php
+++ b/views/templates/layout_normal.php
@@ -1,5 +1,6 @@
-@extends('templates/mapguesser')
-@section('content')
+@extends(templates/mapguesser)
+
+@section(content)
 <header>
     <h1>
         <a href="/" title="<?= $_ENV['APP_NAME'] ?>">