Tweak error output and confirm with test

ngrdanjski · Apr 14, 2020 · 09a7ce7 · 09a7ce7
1 parent 752f5e2
commit 09a7ce7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/Helper.php b/lib/Helper.php
@@ -200,7 +200,7 @@ public static function error_log( $error ) {
 		if ( is_object($error) || is_array($error) ) {
 			$error = print_r($error, true);
 		}
-		return error_log('[ Timber ]'.$error);
+		return error_log('[ Timber ] '.$error);
 	}
 
 	/**

diff --git a/lib/Timber.php b/lib/Timber.php
@@ -333,7 +333,10 @@ public static function compile( $filenames, $data = array(), $expires = false, $
 
 			$output = $loader->render($file, $data, $expires, $cache_mode);
 		} else {
-			Helper::error_log( 'Error loading your template file, make sure the file exists.' );
+			if ( is_array($filenames) ) {
+				$filenames = implode(", ", $filenames);
+			}
+			Helper::error_log( 'Error loading your template files: '.$filenames.'. Make sure one of these files exists.' );
 		}
 
 		do_action('timber_compile_done');

diff --git a/tests/test-timber-loader.php b/tests/test-timber-loader.php
@@ -21,6 +21,11 @@ function testBogusTemplates() {
 			$this->assertFalse($str);
 		}
 
+		function testTemplateChainWithMissingTwigFiles() {
+			$str = Timber::compile( array('assets/lonestar.twig', 'assets/single.twig') );
+			$this->assertEquals('I am single.twig', trim($str));
+		}
+
 		function testWhitespaceTrimForTemplate(){
 			$str = Timber::compile('assets/single.twig ', array());
 			$this->assertEquals('I am single.twig', trim($str));