diff --git a/bin/queue-status b/bin/queue-status index ac27e0e..1a1d38f 100755 --- a/bin/queue-status +++ b/bin/queue-status @@ -9,7 +9,7 @@ use jc21\CliTable; $timeAgo = new Westsworld\TimeAgo(); /** @var QueueService $queueService */ -$queueService = App::Instance()->get(QueueService::class); +$queueService = App::DI(QueueService::class); while(true) { $data = []; diff --git a/bin/worker b/bin/worker index 0f3a2fc..2a31f94 100755 --- a/bin/worker +++ b/bin/worker @@ -56,7 +56,7 @@ echo "Starting {$workerClass} with {$threads} threads.\n"; if($threads == 1){ /** @var AbstractQueueWorker $worker */ - $worker = App::Instance()->get($workerClass); + $worker = App::DI($workerClass); $worker->setCliArguments($args); $worker->run(); }else { @@ -65,7 +65,7 @@ if($threads == 1){ for ($i = 0; $i < $threads; $i++) { $fork->call(function () use ($workerClass, $args) { /** @var AbstractQueueWorker $worker */ - $worker = App::Instance()->get($workerClass); + $worker = App::DI($workerClass); $worker->setCliArguments($args); $worker->run(); }); diff --git a/src/App.php b/src/App.php index 9c3edd8..b26ac51 100644 --- a/src/App.php +++ b/src/App.php @@ -307,6 +307,18 @@ class App return self::$instance; } + /** + * Convenience function to get objects out of the Dependency Injection Container. + * + * @param string $key + * + * @return mixed + */ + public static function DI(string $key) + { + return self::Instance()->get($key); + } + public function getApp() { return $this->app; diff --git a/src/Middlewares/EnvironmentHeadersOnResponse.php b/src/Middlewares/EnvironmentHeadersOnResponse.php index 2b6ebdb..efaf576 100644 --- a/src/Middlewares/EnvironmentHeadersOnResponse.php +++ b/src/Middlewares/EnvironmentHeadersOnResponse.php @@ -77,7 +77,7 @@ class EnvironmentHeadersOnResponse $response = $response->withJson($json, null, JSON_PRETTY_PRINT); } else { /** @var Twig $twig */ - $twig = App::Instance()->get('view'); + $twig = App::DI('view'); $response->getBody()->rewind(); $response = $twig->render($response, 'api/explorer.html.twig', [ 'page_name' => 'API Explorer',