From 244f440d97436e92836a95b207fb6737c12c9d0d Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Sat, 4 Jan 2020 23:43:13 +0100
Subject: [PATCH] Remove unused killme()

---
 boot.php                  | 9 ---------
 mod/photos.php            | 2 +-
 src/Core/System.php       | 1 -
 tests/include/ApiTest.php | 4 ++--
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/boot.php b/boot.php
index d54ee72a3d..f36e770da1 100644
--- a/boot.php
+++ b/boot.php
@@ -234,15 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
 	define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
 }
 
-/**
- * @brief Used to end the current process, after saving session state.
- * @deprecated
- */
-function killme()
-{
-	exit();
-}
-
 /**
  * @brief Returns the user id of locally logged in user or false.
  *
diff --git a/mod/photos.php b/mod/photos.php
index e763704c40..2ca6c6a37b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -814,7 +814,7 @@ function photos_post(App $a)
 
 	Hook::callAll('photo_post_end', $item_id);
 
-	// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+	// addon uploaders should call "exit()" within the photo_post_end hook
 	// if they do not wish to be redirected
 
 	DI::baseUrl()->redirect($_SESSION['photo_return']);
diff --git a/src/Core/System.php b/src/Core/System.php
index 709864492e..63767ebb34 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -283,7 +283,6 @@ class System
 
 	/// @todo Move the following functions from boot.php
 	/*
-	function killme()
 	function local_user()
 	function public_contact()
 	function remote_user()
diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 58e0adb99a..f702d70bca 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -3305,7 +3305,7 @@ class ApiTest extends DatabaseTest
 	 */
 	public function testApiOauthRequestToken()
 	{
-		$this->markTestIncomplete('killme() kills phpunit as well');
+		$this->markTestIncomplete('exit() kills phpunit as well');
 	}
 
 	/**
@@ -3315,7 +3315,7 @@ class ApiTest extends DatabaseTest
 	 */
 	public function testApiOauthAccessToken()
 	{
-		$this->markTestIncomplete('killme() kills phpunit as well');
+		$this->markTestIncomplete('exit() kills phpunit as well');
 	}
 
 	/**
-- 
2.39.5