Rename studipApp back to appeloquent-demo

20 files changed, 31 insertions, 31 deletions

diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index da341cc..907749b 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -124,13 +124,13 @@ Assets::set_assets_url($GLOBALS['ASSETS_URL']);
 Assets::set_assets_path($GLOBALS['ASSETS_PATH']);
 
 // globale template factory anlegen
-$GLOBALS['template_factory'] = studipApp(Flexi\Factory::class);
+$GLOBALS['template_factory'] = app(Flexi\Factory::class);
 
 // set default pdo connection
 try {
     DBManager::getInstance()->setConnection(
         'studip',
-        studipApp(StudipPDO::class)
+        app(StudipPDO::class)
     );
 } catch (\PDOException $exception) {
     if (Studip\ENV === 'development') {
@@ -285,7 +285,7 @@ unset($mail_transporter);
 
 // Eloquent ORM Config --start--
 // should be moved to place like app providers or DB Providers
-$eloquentManager = studipApp(Illuminate\Database\Capsule\Manager::class);
+$eloquentManager = app(Illuminate\Database\Capsule\Manager::class);
 $eloquentManager->addConnection([
     'driver' => 'mysql',
     'host' =>  $GLOBALS['DB_STUDIP_HOST'],
diff --git a/lib/classes/JsonApi/Middlewares/Authentication.php b/lib/classes/JsonApi/Middlewares/Authentication.php
index 84727f1..de5c694 100644
--- a/lib/classes/JsonApi/Middlewares/Authentication.php
+++ b/lib/classes/JsonApi/Middlewares/Authentication.php
@@ -60,7 +60,7 @@ class Authentication
     // according to RFC 2616
     private function generateChallenges(array $guards): ResponseInterface
     {
-        $responseFactory = studipApp(ResponseFactoryInterface::class);
+        $responseFactory = app(ResponseFactoryInterface::class);
         $response = $responseFactory->createResponse(401);
 
         foreach ($guards as $guard) {
diff --git a/lib/classes/JsonApi/Routes/Feedback/RangeTypeAware.php b/lib/classes/JsonApi/Routes/Feedback/RangeTypeAware.php
index 912815c..88fd1b1 100644
--- a/lib/classes/JsonApi/Routes/Feedback/RangeTypeAware.php
+++ b/lib/classes/JsonApi/Routes/Feedback/RangeTypeAware.php
@@ -11,7 +11,7 @@ trait RangeTypeAware
 
     protected function preparePossibleRangeTypes(): void
     {
-        foreach (studipApp('json-api-integration-schemas') as $class => $schema) {
+        foreach (app('json-api-integration-schemas') as $class => $schema) {
             if (is_subclass_of($class, FeedbackRange::class) && is_subclass_of($class, SimpleORMap::class)) {
                 $this->possibleRangeTypes[$schema::TYPE] = $class;
             }
diff --git a/lib/classes/Log.php b/lib/classes/Log.php
index 7f6d360..4bb0e9d 100644
--- a/lib/classes/Log.php
+++ b/lib/classes/Log.php
@@ -39,7 +39,7 @@ class Log
     public static function getInstance(): LoggerInterface
     {
         if (!isset(static::$instance)) {
-            static::$instance = studipApp(LoggerInterface::class);
+            static::$instance = app(LoggerInterface::class);
         }
 
         return static::$instance;
diff --git a/lib/classes/LtiLink.php b/lib/classes/LtiLink.php
index f2153ec..5f2afd3 100644
--- a/lib/classes/LtiLink.php
+++ b/lib/classes/LtiLink.php
@@ -313,7 +313,7 @@ class LtiLink
         // posted form data will always use CR LF
         $launch_params = preg_replace("/\r?\n/", "\r\n", $launch_params);
 
-        $requestFactory = studipApp(ServerRequestFactoryInterface::class);
+        $requestFactory = app(ServerRequestFactoryInterface::class);
         $request = $requestFactory->createServerRequest('POST', $launch_url);
 
         return Studip\OAuth1::signRequest(
diff --git a/lib/classes/OAuth2/NegotiatesWithPsr7.php b/lib/classes/OAuth2/NegotiatesWithPsr7.php
index becbd8a..1f743ad 100644
--- a/lib/classes/OAuth2/NegotiatesWithPsr7.php
+++ b/lib/classes/OAuth2/NegotiatesWithPsr7.php
@@ -12,12 +12,12 @@ trait NegotiatesWithPsr7
 {
     protected function getPsrRequest(): ServerRequestInterface
     {
-        return studipApp(ServerRequestInterface::class);
+        return app(ServerRequestInterface::class);
     }
 
     protected function getPsrResponse(): ResponseInterface
     {
-        return studipApp(ResponseFactoryInterface::class)->createResponse();
+        return app(ResponseFactoryInterface::class)->createResponse();
     }
 
     protected function convertPsrResponse(ResponseInterface $response): TrailsResponse
diff --git a/lib/classes/StudipController.php b/lib/classes/StudipController.php
index 545e0ce..2956ac1 100644
--- a/lib/classes/StudipController.php
+++ b/lib/classes/StudipController.php
@@ -29,7 +29,7 @@ abstract class StudipController extends Trails\Controller
     {
         parent::__construct($dispatcher);
         if ($this->with_session) {
-            $slimapp = studipApp()->get(Slim\App::class);
+            $slimapp = app()->get(Slim\App::class);
             if ($slimapp) {
                 $slimapp->add(Studip\Middleware\SeminarOpenMiddleware::class);
                 $slimapp->add(Studip\Middleware\AuthenticationMiddleware::class);
@@ -525,7 +525,7 @@ abstract class StudipController extends Trails\Controller
         $this->response->add_header('Pragma', 'public');
 
         $this->render_text(
-            studipApp(Psr\Http\Message\StreamFactoryInterface::class)->createStreamFromFile($file)
+            app(Psr\Http\Message\StreamFactoryInterface::class)->createStreamFromFile($file)
         );
 
         if ($callback) {
@@ -682,7 +682,7 @@ abstract class StudipController extends Trails\Controller
     public function render_template($template_name, $layout = null)
     {
         if (Studip\Debug\DebugBar::isActivated()) {
-            $debugbar = studipApp()->get(Debugbar::class);
+            $debugbar = app()->get(Debugbar::class);
             if (!isset($debugbar['trails'])) {
                 $collector = new \Studip\Debug\TrailsCollector($this);
                 $debugbar->addCollector($collector);
diff --git a/lib/classes/VueApp.php b/lib/classes/VueApp.php
index d07d3ac..db65abc 100644
--- a/lib/classes/VueApp.php
+++ b/lib/classes/VueApp.php
@@ -217,7 +217,7 @@ final class VueApp implements Stringable
      */
     public function getTemplate(): Template
     {
-        $template = studipApp(Factory::class)->open('vue-app.php');
+        $template = app(Factory::class)->open('vue-app.php');
         $template->set_attributes(['app' => $this]);
         return $template;
     }
@@ -228,7 +228,7 @@ final class VueApp implements Stringable
     public function render(): string
     {
         if (Debug\DebugBar::isActivated()) {
-            $debugbar = studipApp()->get(\DebugBar\DebugBar::class);
+            $debugbar = app()->get(\DebugBar\DebugBar::class);
             $collector = new Debug\VueCollector($this);
             $debugbar->addCollector($collector);
         }
diff --git a/lib/functions.php b/lib/functions.php
index 6f51f96..df63256 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1051,7 +1051,7 @@ function get_route($route = '')
         $route = 'plugins.php/' . $pieces[0] . (!empty($pieces[1]) ? '/' . $pieces[1] : '') . (!empty($pieces[2]) ? '/' . $pieces[2] : '');
     } elseif (mb_strpos($route, 'dispatch.php/') !== false) {
         $trails = explode('dispatch.php/', $route);
-        $dispatcher = studipApp(\Trails\Dispatcher::class);
+        $dispatcher = app(\Trails\Dispatcher::class);
         $pieces = explode('/', $trails[1]);
         $trail = '';
         foreach ($pieces as $index => $piece) {
diff --git a/lib/helpers.php b/lib/helpers.php
index da143e5..9bfedb1 100644
--- a/lib/helpers.php
+++ b/lib/helpers.php
@@ -6,13 +6,13 @@ use Psr\Container\ContainerInterface;
  * This function returns the Dependency Injection container used.
  *
  * ```
- * $container = studipApp();
+ * $container = app();
  * ```
  *
  * You may pass an entry name, a class or interface name to resolve it from the container:
  *
  * ```
- * $logger = studipApp(LoggerInterface::class);
+ * $logger = app(LoggerInterface::class);
  * ```
  * @template T
  * @param T|class-string<T>|string|null $entryId    entry name or a class name
@@ -22,7 +22,7 @@ use Psr\Container\ContainerInterface;
  *
  * @return T|ContainerInterface|mixed either the DI container or the entry associated to the $entryId
  */
-function studipApp($entryId = null, $parameters = [])
+function app($entryId = null, $parameters = [])
 {
     $container = \Studip\DIContainer::getInstance();
     if (is_null($entryId)) {
@@ -37,7 +37,7 @@ function studipApp($entryId = null, $parameters = [])
  */
 function sess() : Studip\Session\Manager
 {
-    return studipApp()->get(Studip\Session\Manager::class);
+    return app()->get(Studip\Session\Manager::class);
 }
 
 /**
@@ -45,5 +45,5 @@ function sess() : Studip\Session\Manager
  */
 function auth() : Studip\Authentication\Manager
 {
-    return studipApp()->get(Studip\Authentication\Manager::class);
+    return app()->get(Studip\Authentication\Manager::class);
 }
diff --git a/lib/include/html_head.inc.php b/lib/include/html_head.inc.php
index cb619a8..a6321c8 100644
--- a/lib/include/html_head.inc.php
+++ b/lib/include/html_head.inc.php
@@ -23,7 +23,7 @@ $getJsonApiSchemas = function () {
         array_unique(
             array_map(
                 fn($class) => $class::TYPE,
-                studipApp('json-api-integration-schemas')
+                app('json-api-integration-schemas')
             )
         )
     );
diff --git a/lib/modules/EvaluationsWidget.php b/lib/modules/EvaluationsWidget.php
index f546ee1..21410e2 100644
--- a/lib/modules/EvaluationsWidget.php
+++ b/lib/modules/EvaluationsWidget.php
@@ -43,7 +43,7 @@ class EvaluationsWidget extends CorePlugin implements PortalPlugin
         }
 
         // include and show votes and tests
-        $controller = studipApp(AuthenticatedController::class, ['dispatcher' => studipApp(\Trails\Dispatcher::class)]);
+        $controller = app(AuthenticatedController::class, ['dispatcher' => app(\Trails\Dispatcher::class)]);
         $controller->suppress_empty_output = true;
         $response = $controller->relay('questionnaire/widget/start')->body;
 
diff --git a/lib/modules/MyCoursesWidget.php b/lib/modules/MyCoursesWidget.php
index ab2e654..25990ec 100644
--- a/lib/modules/MyCoursesWidget.php
+++ b/lib/modules/MyCoursesWidget.php
@@ -26,7 +26,7 @@ class MyCoursesWidget extends CorePlugin implements PortalPlugin
     public function getPortalTemplate()
     {
         // get the MyCoursesController in order to prepare the correct data for the overview
-        $controller = studipApp(MyCoursesController::class, ['dispatcher' => studipApp(\Trails\Dispatcher::class)]);
+        $controller = app(MyCoursesController::class, ['dispatcher' => app(\Trails\Dispatcher::class)]);
 
         return Studip\VueApp::create('my-courses/MyCourses')
             ->withVuexStore(
diff --git a/lib/modules/MyStudygroupsWidget.php b/lib/modules/MyStudygroupsWidget.php
index aa7a8cf..1709419 100644
--- a/lib/modules/MyStudygroupsWidget.php
+++ b/lib/modules/MyStudygroupsWidget.php
@@ -24,7 +24,7 @@ class MyStudygroupsWidget extends CorePlugin implements PortalPlugin
     {
         $template = $GLOBALS['template_factory']->open('start/my_studygroups');
 
-        $controller = studipApp(\Trails\Dispatcher::class)->load_controller('my_studygroups');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('my_studygroups');
         $response = $controller->relayWithRedirect('my_studygroups/index/true');
         $template->content = $response->body;
 
diff --git a/lib/modules/NewsWidget.php b/lib/modules/NewsWidget.php
index 056c259..1d390a3 100644
--- a/lib/modules/NewsWidget.php
+++ b/lib/modules/NewsWidget.php
@@ -25,7 +25,7 @@ class NewsWidget extends CorePlugin implements PortalPlugin
 
     function getPortalTemplate()
     {
-        $controller = studipApp(\Trails\Dispatcher::class)->load_controller('news');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('news');
         $response = $controller->relayWithRedirect('news/display/studip');
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;
diff --git a/lib/modules/RunningProcessesWidget.php b/lib/modules/RunningProcessesWidget.php
index 1200e3f..54a4bd4 100644
--- a/lib/modules/RunningProcessesWidget.php
+++ b/lib/modules/RunningProcessesWidget.php
@@ -16,7 +16,7 @@ class RunningProcessesWidget extends CorePlugin implements PortalPlugin
 
     function getPortalTemplate()
     {
-        $controller = studipApp(\Trails\Dispatcher::class)->load_controller('running_processes');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('running_processes');
         $response = $controller->relayWithRedirect('running_processes/widget');
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;
diff --git a/lib/modules/StudygroupWidget.php b/lib/modules/StudygroupWidget.php
index 2f4ba3f..beddd4f 100644
--- a/lib/modules/StudygroupWidget.php
+++ b/lib/modules/StudygroupWidget.php
@@ -25,7 +25,7 @@ class StudygroupWidget extends CorePlugin implements PortalPlugin
     {
         $template = $GLOBALS['template_factory']->open('start/studygroups');
 
-        $controller = studipApp(\Trails\Dispatcher::class)->load_controller('my_studygroups');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('my_studygroups');
         $response = $controller->relayWithRedirect('my_studygroups/proposals');
         $template->proposals = $response->body;
 
diff --git a/lib/modules/TerminWidget.php b/lib/modules/TerminWidget.php
index be7bd35..56f1ffd 100644
--- a/lib/modules/TerminWidget.php
+++ b/lib/modules/TerminWidget.php
@@ -26,7 +26,7 @@ class TerminWidget extends CorePlugin implements PortalPlugin
 
     public function getPortalTemplate()
     {
-        $controller = studipApp(\Trails\Dispatcher::class)->load_controller('calendar/contentbox');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('calendar/contentbox');
         $response = $controller->relay('calendar/contentbox/display/'.$GLOBALS['user']->id);
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;
diff --git a/lib/plugins/core/StudIPPlugin.php b/lib/plugins/core/StudIPPlugin.php
index ede37e7..8a9a09d 100644
--- a/lib/plugins/core/StudIPPlugin.php
+++ b/lib/plugins/core/StudIPPlugin.php
@@ -214,8 +214,8 @@ abstract class StudIPPlugin
         $action = $args[0] !== '' ? array_shift($args) . '_action' : 'show_action';
 
         return method_exists($this, $action)
-            ? studipApp(DefaultLegacyRouteStrategy::class)
-            : studipApp(TrailsLegacyRouteStrategy::class);
+            ? app(DefaultLegacyRouteStrategy::class)
+            : app(TrailsLegacyRouteStrategy::class);
     }
 
     /**
diff --git a/lib/plugins/engine/PluginManager.php b/lib/plugins/engine/PluginManager.php
index 195e2b3..c66949a 100644
--- a/lib/plugins/engine/PluginManager.php
+++ b/lib/plugins/engine/PluginManager.php
@@ -587,7 +587,7 @@ class PluginManager
         }
 
         if ($plugin_class) {
-            $plugin = studipApp()->get($class);
+            $plugin = app()->get($class);
         }
 
         return $this->plugin_cache[$class] = $plugin;