Unify CLI commands

bin/azuracast.php

@@ -21,14 +21,4 @@ $di = $app->getContainer();
 
 /** @var \Azura\Console\Application $cli */
 $cli = $di[\Azura\Console\Application::class];
-
-/** @var \App\Version $version */
-$version = $di[\App\Version::class];
-
-/** @var \Azura\Settings $settings */
-$settings = $di['settings'];
-
-$cli->setName($settings[\Azura\Settings::APP_NAME].' Command Line Tools ('.$settings[\Azura\Settings::APP_ENV].')');
-$cli->setVersion($version->getVersion());
-
 $cli->run();

bin/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env php
+<?php
+include('azuracast.php');

config/services.php

@@ -209,6 +209,19 @@ return function (\Azura\Container $di)
         return $dispatcher;
     });
 
+    $di->extend(\Azura\Console\Application::class, function(\Azura\Console\Application $console, $di) {
+        /** @var \App\Version $version */
+        $version = $di[\App\Version::class];
+
+        /** @var \Azura\Settings $settings */
+        $settings = $di['settings'];
+
+        $console->setName($settings[\Azura\Settings::APP_NAME].' Command Line Tools ('.$settings[\Azura\Settings::APP_ENV].')');
+        $console->setVersion($version->getVersion());
+
+        return $console;
+    });
+
     $di[\App\MessageQueue::class] = function($di) {
         // Build QueueFactory
         /** @var \Redis $redis */

util/cli.php

@@ -21,14 +21,4 @@ $di = $app->getContainer();
 
 /** @var \Azura\Console\Application $cli */
 $cli = $di[\Azura\Console\Application::class];
-
-/** @var \App\Version $version */
-$version = $di[\App\Version::class];
-
-/** @var \Azura\Settings $settings */
-$settings = $di['settings'];
-
-$cli->setName($settings[\Azura\Settings::APP_NAME].' Command Line Tools ('.$settings[\Azura\Settings::APP_ENV].')');
-$cli->setVersion($version->getVersion());
-
 $cli->run();