1 files changed, 10 insertions, 0 deletions
diff --git a/tests/config_php_file_test.php b/tests/config_php_file_test.php
index c2e4eb21c7..c319678108 100644
--- a/tests/config_php_file_test.php
+++ b/tests/config_php_file_test.php
@@ -17,6 +17,7 @@ class phpbb_config_php_file_test extends phpbb_test_case
 	{
 		$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php');
 		$this->assertSame('bar', $config_php->get('foo'));
+		$this->assertNull($config_php->get('bar'));
 		$this->assertSame(array('foo' => 'bar', 'foo_foo' => 'bar bar'), $config_php->get_all());
 	}
 
@@ -25,6 +26,15 @@ class phpbb_config_php_file_test extends phpbb_test_case
 		$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php');
 		$config_php->set_config_file(dirname( __FILE__ ) . '/fixtures/config_other.php');
 		$this->assertSame('foo', $config_php->get('bar'));
+		$this->assertNull($config_php->get('foo'));
 		$this->assertSame(array('bar' => 'foo', 'bar_bar' => 'foo foo'), $config_php->get_all());
 	}
+
+	public function test_non_existent_file()
+	{
+		$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/non_existent/', 'php');
+		$this->assertNull($config_php->get('bar'));
+		$this->assertNull($config_php->get('foo'));
+		$this->assertSame(array(), $config_php->get_all());
+	}
 }