diff options
32 files changed, 48 insertions, 48 deletions
diff --git a/app/controllers/course/courseware.php b/app/controllers/course/courseware.php index 395b042..820315b 100644 --- a/app/controllers/course/courseware.php +++ b/app/controllers/course/courseware.php @@ -288,7 +288,7 @@ class Course_CoursewareController extends CoursewareController } } - $encoder = studipApp(\Neomerx\JsonApi\Contracts\Encoder\EncoderInterface::class); + $encoder = app(\Neomerx\JsonApi\Contracts\Encoder\EncoderInterface::class); $data = [ 'units' => $encoder->encodeData($units), diff --git a/app/controllers/settings/notification.php b/app/controllers/settings/notification.php index d2891a6..0fd2c4e 100644 --- a/app/controllers/settings/notification.php +++ b/app/controllers/settings/notification.php @@ -71,7 +71,7 @@ class Settings_NotificationController extends Settings_SettingsController ->withProps([ 'store-url' => $this->storeURL(), 'modules' => collect( - studipApp(ModulesNotification::class)->registered_notification_modules + app(ModulesNotification::class)->registered_notification_modules )->map( fn(array $module, int $id): array => array_merge($module, ['id' => $id]) )->values(), @@ -86,7 +86,7 @@ class Settings_NotificationController extends Settings_SettingsController ->withVuexStore( 'MyCoursesStore', 'mycoursesnotificationstore', - studipApp(MyCoursesHelper::class)->createVueAppData('') + app(MyCoursesHelper::class)->createVueAppData('') ) ); } diff --git a/cli/Commands/Checks/HelpTours.php b/cli/Commands/Checks/HelpTours.php index 309dfda..b0c201a 100644 --- a/cli/Commands/Checks/HelpTours.php +++ b/cli/Commands/Checks/HelpTours.php @@ -59,7 +59,7 @@ class HelpTours extends Command $plugin = new $plugin_info['class'](); if ($result[1]) { - $dispatcher = studipApp(\Trails\Dispatcher::class); + $dispatcher = app(\Trails\Dispatcher::class); $dispatcher->trails_root = $GLOBALS['ABSOLUTE_PATH_STUDIP'] . $plugin->getPluginPath(); $dispatcher->trails_uri = rtrim(\PluginEngine::getLink($plugin, [], null, true), '/'); $dispatcher->default_controller = 'index'; @@ -71,7 +71,7 @@ class HelpTours extends Command } } } elseif (match_route('dispatch.php/*', $step->route)) { - $dispatcher = studipApp(\Trails\Dispatcher::class); + $dispatcher = app(\Trails\Dispatcher::class); $parsed = $dispatcher->parse(substr($step->route, strlen('dispatch.php') + 1)); $controller = $dispatcher->load_controller($parsed[0]); if ($parsed[1] && !$controller->has_action($parsed[1])) { @@ -18,7 +18,7 @@ $application->run(); function loadCoreCommands(): array { $commands = require __DIR__ . '/commands.php'; - return array_map(fn($command) => studipApp($command), $commands); + return array_map(fn($command) => app($command), $commands); } function loadPluginCommands(Application $application): array @@ -77,7 +77,7 @@ function getPluginCommands(Application $application, array $manifest): array foreach ($commandsFn($application) as $class => $path) { require_once $path; - $commands[] = studipApp($class); + $commands[] = app($class); } return $commands; 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; diff --git a/public/assets.php b/public/assets.php index 1d8ff88..886886b 100644 --- a/public/assets.php +++ b/public/assets.php @@ -19,7 +19,7 @@ use Slim\Factory\AppFactory; require_once __DIR__ .'/../lib/bootstrap.php'; // Build PHP_DI Container -$container = studipApp(); +$container = app(); // Instantiate the app AppFactory::setContainer($container); diff --git a/public/dispatch.php b/public/dispatch.php index f82835d..d2ebdaf 100644 --- a/public/dispatch.php +++ b/public/dispatch.php @@ -20,7 +20,7 @@ require '../lib/bootstrap.php'; URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']); // Build PHP_DI Container -$container = studipApp(); +$container = app(); // Instantiate the app AppFactory::setContainer($container); @@ -28,7 +28,7 @@ $app = AppFactory::create(); $container->set(App::class, $app); $app->setBasePath($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'] . 'dispatch.php'); -$studip_dispatcher = studipApp(\Trails\Dispatcher::class); +$studip_dispatcher = app(\Trails\Dispatcher::class); $route_callable = $studip_dispatcher->getRouteCallable(Request::pathInfo()); $app->any(Request::pathInfo(), $route_callable); diff --git a/public/jsonapi.php b/public/jsonapi.php index c394082..392b8b0 100644 --- a/public/jsonapi.php +++ b/public/jsonapi.php @@ -10,7 +10,7 @@ require __DIR__ . '/../lib/bootstrap.php'; URLHelper::setBaseUrl($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP']); // Instantiate the app -$container = studipApp(); +$container = app(); AppFactory::setContainer($container); $app = AppFactory::create(); $container->set(\Slim\App::class, $app); diff --git a/public/plugins.php b/public/plugins.php index 61e93ef..ae30118 100644 --- a/public/plugins.php +++ b/public/plugins.php @@ -15,7 +15,7 @@ require '../lib/bootstrap.php'; URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']); // Build PHP_DI Container -$container = studipApp(); +$container = app(); // Instantiate the app AppFactory::setContainer($container); diff --git a/public/web_migrate.php b/public/web_migrate.php index 2fe1b9a..4f2102a 100644 --- a/public/web_migrate.php +++ b/public/web_migrate.php @@ -37,6 +37,6 @@ $GLOBALS['template_factory'] = new Flexi\Factory('../templates/'); # get plugin class from request $dispatch_to = Request::pathInfo() ?: ''; -$dispatcher = studipApp(\Trails\Dispatcher::class); +$dispatcher = app(\Trails\Dispatcher::class); $dispatcher->trails_uri = $_SERVER['SCRIPT_NAME']; $dispatcher->dispatch("web_migrate/{$dispatch_to}"); diff --git a/templates/layouts/base.php b/templates/layouts/base.php index 992899c..8ae32ce 100644 --- a/templates/layouts/base.php +++ b/templates/layouts/base.php @@ -17,7 +17,7 @@ $getJsonApiSchemas = function () { array_unique( array_map( fn($class) => $class::TYPE, - studipApp('json-api-integration-schemas') + app('json-api-integration-schemas') ) ) ); @@ -122,7 +122,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); <?php if (Studip\Debug\DebugBar::isActivated()) { - echo studipApp()->get(\DebugBar\DebugBar::class)->getJavascriptRenderer()->render(); + echo app()->get(\DebugBar\DebugBar::class)->getJavascriptRenderer()->render(); } ?> </body> diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php index 6f822a1..9bc68f5 100644 --- a/tests/unit/_bootstrap.php +++ b/tests/unit/_bootstrap.php @@ -167,5 +167,5 @@ function app($entryId = null, $parameters = []) function sess() { - return studipApp()->get('Studip\Session\Manager'); + return app()->get('Studip\Session\Manager'); } diff --git a/tests/unit/lib/classes/MarkupClassTest.php b/tests/unit/lib/classes/MarkupClassTest.php index 7dec6c1..7342a4a 100644 --- a/tests/unit/lib/classes/MarkupClassTest.php +++ b/tests/unit/lib/classes/MarkupClassTest.php @@ -77,7 +77,7 @@ class MarkupClassTest extends \Codeception\Test\Unit })); Config::set($configStub); - studipApp()->set('Studip\Session\Manager', new StudipSessionManager()); + app()->set('Studip\Session\Manager', new StudipSessionManager()); # exceptions $namespace = 'Studip\MarkupPrivate\MediaProxy\\'; $invalidInternalLink = $namespace . 'InvalidInternalLinkException'; |