diff options
Diffstat (limited to 'lib/classes')
| -rw-r--r-- | lib/classes/JsonApi/Middlewares/Authentication.php | 2 | ||||
| -rw-r--r-- | lib/classes/JsonApi/Routes/Feedback/RangeTypeAware.php | 2 | ||||
| -rw-r--r-- | lib/classes/Log.php | 2 | ||||
| -rw-r--r-- | lib/classes/LtiLink.php | 2 | ||||
| -rw-r--r-- | lib/classes/OAuth2/NegotiatesWithPsr7.php | 4 | ||||
| -rw-r--r-- | lib/classes/StudipController.php | 6 | ||||
| -rw-r--r-- | lib/classes/VueApp.php | 4 |
7 files changed, 11 insertions, 11 deletions
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); } |