Merge pull request #13 from borschphp/minor-improvments

Switch between dev/prod + PDO MySQL example env file

.gitignore

@@ -7,6 +7,9 @@ index.php
 composer.phar
 /vendor/
 
+### Cache ###
+/storage/cache/views/*.php
+
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 composer.lock

bootstrap/env.php

@@ -12,7 +12,7 @@
 $dotenv = Dotenv\Dotenv::createImmutable(app_path());
 $environment = $dotenv->load();
 
-// In production, save the environment in a file so that it wont be necessary to parse and load .env file at every call.
+// In production, save the environment in a file so that it won't be necessary to parse and load .env file at every call.
 if (env('APP_ENV') == 'production') {
     $file = new SplFileObject($environment_file, 'w');
     $file->fwrite('<?php'.PHP_EOL.PHP_EOL.'return '.var_export($environment, true).';'.PHP_EOL);

composer.json

@@ -64,6 +64,18 @@
     ],
     "optimize": "composer install --prefer-dist --optimize-autoloader --no-dev",
     "test": "./vendor/bin/pest tests",
-    "test-win": ".\\vendor\\bin\\pest tests"
+    "test-win": ".\\vendor\\bin\\pest tests",
+    "prod": "composer production",
+    "dev": "composer development",
+    "production": [
+      "rm -f config/environment.php storage/cache/routes.cache.php",
+      "sed -i \"s|APP_ENV=.*|APP_ENV=production|g\" .env",
+      "sed -i \"s|APP_DEBUG=.*|APP_DEBUG=false|g\" .env"
+    ],
+    "development": [
+      "rm -f config/environment.php storage/cache/routes.cache.php",
+      "sed -i \"s|APP_ENV=.*|APP_ENV=development|g\" .env",
+      "sed -i \"s|APP_DEBUG=.*|APP_DEBUG=true|g\" .env"
+    ]
   }
 }

config/container.php

@@ -81,6 +81,13 @@
  */
 
 $container->set(PDO::class, function () {
+    // For MySQL with connexion information from .env file
+    //$pdo = new PDO(
+    //    'mysql:host='.env('DB_HOST').';port='.env('DB_PORT').';dbname='.env('DB_DATABASE').';charset=utf8mb4',
+    //    env('DB_USERNAME'),
+    //    env('DB_PASSWORD')
+    //);
+
     $pdo = new PDO('sqlite:'.storage_path('database.sqlite'));
     $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     $pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);

src/Template/BasicTemplateEngine.php

@@ -79,7 +79,7 @@ public function render(string $template, array $context = []): string
 
                     $code = preg_replace(
                         [
-                            '~\{\s*\*.+?\*\s*}~',  // comments
+                            '~\{\*[\s\S]+?\*}~',  // comments
                             '~\{%\s*(.+?)\s*}~',   // commands (foreach(): endforeach;)
                             '~\{!!\s*(.+?)\s*}~',  // unescaped vars
                             '~\{\s*(.+?)\s*}~'     // escaped vars (default)
@@ -88,18 +88,21 @@ public function render(string $template, array $context = []): string
                             '',
                             '<?php $1 ?>',
                             '<?php echo $1 ?>',
-                            '<?php echo htmlspecialchars($1, ENT_QUOTES) ?>'
+                            '<?php echo htmlspecialchars($1, ENT_QUOTES|ENT_SUBSTITUTE, \'UTF-8\') ?>'
                         ],
                         $code
                     );
 
                     file_put_contents($cache_file, $code);
                 }
 
-                extract($this->parameters);
-
                 ob_start();
-                include $cache_file;
+
+                (function ($file) {
+                    extract($this->parameters);
+                    include $file;
+                })($cache_file);
+
                 return ob_get_clean();
             }
         }