Merge pull request #101 from WyriHaximus/4.x-94

readOrFail for App.encoding
cakephp · Dec 17, 2018 · a5ec666 · a5ec666
2 parents 54d69c1 + 8dd9f5a
commit a5ec666
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/View/TwigView.php b/src/View/TwigView.php
@@ -80,7 +80,7 @@ protected function resolveConfig()
     {
         $config = [
             'cache' => CACHE . 'twigView' . DS,
-            'charset' => strtolower(Configure::read('App.encoding')),
+            'charset' => strtolower(Configure::readOrFail('App.encoding')),
             'auto_reload' => Configure::read('debug'),
             'debug' => Configure::read('debug'),
         ];

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -25,7 +25,8 @@
 Cake\Core\Configure::write(
 	'App',
 	[
-		'namespace' => 'App'
+		'namespace' => 'App',
+        'encoding' => 'utf-8',
 	]
 );