Merge CodeIgniter 3 support

2 files changed, 4 insertions, 4 deletions

diff --git a/application/test/tests/api_v2/test_file_upload.php b/application/test/tests/api_v2/test_file_upload.php
index cb2f81b74..e8717b074 100644
--- a/application/test/tests/api_v2/test_file_upload.php
+++ b/application/test/tests/api_v2/test_file_upload.php
@@ -50,8 +50,8 @@ class test_file_upload extends common {
 			$data[] = $this->SendHTTPRequest("GET", $url, '');
 		}
 		$this->t->ok($data[0] !== $data[1], 'Returned file contents should differ');
-		$this->t->ok($data[0] === file_get_contents("data/tests/message1.bin"), "Returned correct data for file 1");
-		$this->t->ok($data[1] === file_get_contents("data/tests/message2.bin"), "Returned correct data for file 2");
+		$this->t->is($data[0], file_get_contents("data/tests/message1.bin"), "Returned correct data for file 1");
+		$this->t->is($data[1], file_get_contents("data/tests/message2.bin"), "Returned correct data for file 2");
 	}
 
 	public function test_upload_uploadNothing()
diff --git a/application/test/tests/test_service_multipaste_queue.php b/application/test/tests/test_service_multipaste_queue.php
index 0427425a0..cab53e335 100644
--- a/application/test/tests/test_service_multipaste_queue.php
+++ b/application/test/tests/test_service_multipaste_queue.php
@@ -38,7 +38,7 @@ class test_service_multipaste_queue extends \test\Test {
 
 	public function test_get()
 	{
-		$this->session->shouldReceive('userdata')->with("multipaste_queue")->once()->andReturn(false);
+		$this->session->shouldReceive('userdata')->with("multipaste_queue")->once()->andReturn(null);
 		$this->t->is_deeply($this->m->get(), [], "Fresh queue is empty");
 	}
 
@@ -54,7 +54,7 @@ class test_service_multipaste_queue extends \test\Test {
 
 	public function test_append()
 	{
-		$this->session->shouldReceive('userdata')->with("multipaste_queue")->once()->andReturn(false);
+		$this->session->shouldReceive('userdata')->with("multipaste_queue")->once()->andReturn(null);
 		$this->mfile->shouldReceive('valid_id')->with('abc')->times(2)->andReturn(true);
 		$this->session->shouldReceive('set_userdata')->with("multipaste_queue", ['abc'])->once();
 		$this->t->is($this->m->append(['abc']), null, "append([abc]) should succeed");