New function to exit the program

src/Module/Admin/PhpInfo.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\DI;
+use Friendica\Core\System;
 use Friendica\Module\BaseAdmin;
 
 class PhpInfo extends BaseAdmin
@@ -31,7 +31,6 @@ class PhpInfo extends BaseAdmin
 		self::checkAdminAccess();
 
 		phpinfo();
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/Attach.php

@@ -23,6 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Attach as MAttach;
 
@@ -72,8 +73,7 @@ class Attach extends BaseModule
 		}
 
 		echo $data;
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 		// NOTREACHED
 	}
 }

src/Module/Contact/Hovercard.php

@@ -24,6 +24,7 @@ namespace Friendica\Module\Contact;
 use Friendica\BaseModule;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -107,7 +108,6 @@ class Hovercard extends BaseModule
 		]);
 
 		echo $o;
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/Debug/ItemBody.php

@@ -22,6 +22,7 @@
 namespace Friendica\Module\Debug;
 
 use Friendica\BaseModule;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
@@ -48,8 +49,7 @@ class ItemBody extends BaseModule
 		if (!empty($item)) {
 			if (DI::mode()->isAjax()) {
 				echo str_replace("\n", '<br />', $item['body']);
-				DI::page()->logRuntime();
-				exit();
+				System::exit();
 			} else {
 				return str_replace("\n", '<br />', $item['body']);
 			}

src/Module/Group.php

@@ -360,8 +360,7 @@ class Group extends BaseModule
 		if ($change) {
 			$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
 			echo Renderer::replaceMacros($tpl, $context);
-			DI::page()->logRuntime();
-			exit();
+			System::exit();
 		}
 
 		return Renderer::replaceMacros($tpl, $context);

src/Module/HTTPException/PageNotFound.php

@@ -22,6 +22,7 @@
 namespace Friendica\Module\HTTPException;
 
 use Friendica\BaseModule;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Psr\Http\Message\ResponseInterface;
@@ -47,8 +48,7 @@ class PageNotFound extends BaseModule
 		$queryString = $this->server['QUERY_STRING'];
 		// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
 		if (!empty($queryString) && preg_match('/{[0-9]}/', $queryString) !== 0) {
-			DI::page()->logRuntime();
-			exit();
+			System::exit();
 		}
 
 		if (!empty($queryString) && ($queryString === 'q=internal_error.html') && isset($dreamhost_error_hack)) {

src/Module/Oembed.php

@@ -23,6 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
@@ -43,16 +44,14 @@ class Oembed extends BaseModule
 		if (DI::args()->getArgv()[1] == 'b2h') {
 			$url = ["", trim(hex2bin($_REQUEST['url']))];
 			echo Content\OEmbed::replaceCallback($url);
-			DI::page()->logRuntime();
-			exit();
+			System::exit();
 		}
 
 		// Unused form: /oembed/h2b?text=...
 		if (DI::args()->getArgv()[1] == 'h2b') {
 			$text = trim(hex2bin($_REQUEST['text']));
 			echo Content\OEmbed::HTML2BBCode($text);
-			DI::page()->logRuntime();
-			exit();
+			System::exit();
 		}
 
 		// @TODO: Replace with parameter from router
@@ -70,7 +69,6 @@ class Oembed extends BaseModule
 			echo $j->html;
 			echo '</body></html>';
 		}
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/PermissionTooltip.php

@@ -22,6 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\Core\Hook;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
@@ -164,8 +165,7 @@ class PermissionTooltip extends \Friendica\BaseModule
 		} else {
 			echo $o . $receivers;
 		}
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 
 	/**

src/Module/Photo.php

@@ -32,6 +32,7 @@ use Friendica\Model\Post;
 use Friendica\Model\Profile;
 use Friendica\Core\Storage\Type\ExternalResource;
 use Friendica\Core\Storage\Type\SystemResource;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
@@ -224,8 +225,7 @@ class Photo extends BaseModule
 				'output' => number_format($output, 3), 'rest' => number_format($rest, 3)]);
 		}
 
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 
 	private static function getPhotoByid(int $id, $type, $customsize)

src/Module/Proxy.php

@@ -202,7 +202,6 @@ class Proxy extends BaseModule
 		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
 		header('Cache-Control: max-age=31536000');
 		echo $img->asString();
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/RobotsTxt.php

@@ -22,7 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\DI;
+use Friendica\Core\System;
 
 /**
  * Return the default robots.txt
@@ -45,7 +45,6 @@ class RobotsTxt extends BaseModule
 		foreach ($allDisalloweds as $disallowed) {
 			echo 'Disallow: ' . $disallowed . PHP_EOL;
 		}
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/Settings/UserExport.php

@@ -23,6 +23,7 @@ namespace Friendica\Module\Settings;
 
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
@@ -112,8 +113,7 @@ class UserExport extends BaseSettings
 					self::exportContactsAsCSV(local_user());
 					break;
 			}
-			DI::page()->logRuntime();
-			exit();
+			System::exit();
 		}
 	}
 

src/Module/Theme.php

@@ -22,7 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\DI;
+use Friendica\Core\System;
 use Friendica\Util\Strings;
 
 /**
@@ -45,7 +45,6 @@ class Theme extends BaseModule
 		if (file_exists("view/theme/$theme/style.php")) {
 			require_once "view/theme/$theme/style.php";
 		}
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/ThemeDetails.php

@@ -49,7 +49,6 @@ class ThemeDetails extends BaseModule
 				'credits' => $credits,
 			]);
 		}
-		DI::page()->logRuntime();
-		exit();
+		System::exit();
 	}
 }

src/Module/Update/Network.php

@@ -31,8 +31,7 @@ class Network extends NetworkModule
 	protected function rawContent(array $request = [])
 	{
 		if (!isset($_GET['p']) || !isset($_GET['item'])) {
-			DI::page()->logRuntime();
-			exit();
+			System::exit();
 		}
 
 		$this->parseRequest($_GET);