Implement code review from nupplaphil

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 119624fa7dc32c3ba65950ef9bfb5b9800446ea3..390a6ef9c2ba852b8f7d213af2e496272f64b977 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -234,29 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
        define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
 }
 
-/**
- * @brief Retrieve the App structure
- *
- * Useful in functions which require it but don't get it passed to them
- *
- * @deprecated since version 2018.09
- * @see DI::app()
- * @return App
- */
-function get_app()
-{
-       return DI::app();
-}
-
-/**
- * @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.
  *
@@ -325,7 +302,7 @@ function notice($s)
                return;
        }
 
-       $a = \get_app();
+       $a = DI::app();
        if (empty($_SESSION['sysmsg'])) {
                $_SESSION['sysmsg'] = [];
        }
@@ -343,7 +320,7 @@ function notice($s)
  */
 function info($s)
 {
-       $a = \get_app();
+       $a = DI::app();
 
        if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
                return;
@@ -406,7 +383,7 @@ function feed_birthday($uid, $tz)
  */
 function is_site_admin()
 {
-       $a = \get_app();
+       $a = DI::app();
 
        $admin_email = Config::get('config', 'admin_email');
 
@@ -672,22 +649,3 @@ function validate_include(&$file)
        // Simply return flag
        return $valid;
 }
-
-/**
- * PHP 5 compatible dirname() with count parameter
- *
- * @see http://php.net/manual/en/function.dirname.php#113193
- *
- * @deprecated with PHP 7
- * @param string $path
- * @param int    $levels
- * @return string
- */
-function rdirname($path, $levels = 1)
-{
-       if ($levels > 1) {
-               return dirname(rdirname($path, --$levels));
-       } else {
-               return dirname($path);
-       }
-}