diff --git a/src/PHPCensor/Application.php b/src/PHPCensor/Application.php
index 0c2af77d..a4c97605 100644
--- a/src/PHPCensor/Application.php
+++ b/src/PHPCensor/Application.php
@@ -119,6 +119,7 @@ class Application extends b8\Application
$controller->layout = new View('layout');
$controller->layout->title = 'PHP Censor';
$controller->layout->breadcrumb = [];
+ $controller->layout->version = trim(file_get_contents(ROOT_DIR . 'VERSION.md'));
return $controller;
}
diff --git a/src/PHPCensor/Console/Application.php b/src/PHPCensor/Console/Application.php
index 66310a02..f599913e 100644
--- a/src/PHPCensor/Console/Application.php
+++ b/src/PHPCensor/Console/Application.php
@@ -29,11 +29,21 @@ use Phinx\Config\Config as PhinxConfig;
/**
* Class Application
- *
+ *
* @package PHPCensor\Console
*/
class Application extends BaseApplication
{
+ const LOGO = <<<'LOGO'
+ ____ __ ______ ______
+ / __ \/ / / / __ \ / ____/__ ____ _________ _____
+ / /_/ / /_/ / /_/ / / / / _ \/ __ \/ ___/ __ \/ ___/
+ / ____/ __ / ____/ / /___/ __/ / / (__ ) /_/ / /
+/_/ /_/ /_/_/ \____/\___/_/ /_/____/\____/_/
+
+
+LOGO;
+
/**
* @param Config $applicationConfig
*
@@ -53,18 +63,20 @@ class Application extends BaseApplication
$logger = new Logger('php-censor', $loggerHandlers);
Handler::register($logger);
-
+
return $logger;
}
-
+
/**
* Constructor.
*
* @param string $name The name of the application
* @param string $version The version of the application
*/
- public function __construct($name = 'PHP Censor - Continuous Integration for PHP', $version = '')
+ public function __construct($name = 'PHP Censor', $version = 'UNKNOWN')
{
+ $version = trim(file_get_contents(ROOT_DIR . 'VERSION.md'));
+
parent::__construct($name, $version);
$applicationConfig = Config::getInstance();
@@ -89,7 +101,7 @@ class Application extends BaseApplication
],
];
}
-
+
if (!empty($databaseSettings['port'])) {
$phinxSettings['environments']['php-censor']['port'] = (integer)$databaseSettings['port'];
}
@@ -116,18 +128,18 @@ class Application extends BaseApplication
->setConfig($phinxConfig)
->setName('php-censor-migrations:status')
);
-
+
/** @var UserStore $userStore */
$userStore = Factory::getStore('User');
-
+
/** @var ProjectStore $projectStore */
$projectStore = Factory::getStore('Project');
-
+
/** @var BuildStore $buildStore */
$buildStore = Factory::getStore('Build');
$logger = $this->initLogger($applicationConfig);
-
+
$this->add(new RunCommand($logger));
$this->add(new RebuildCommand($logger));
$this->add(new InstallCommand());
@@ -137,4 +149,27 @@ class Application extends BaseApplication
$this->add(new RebuildQueueCommand($logger));
$this->add(new ScheduleBuildCommand($projectStore, $buildStore, new BuildService($buildStore)));
}
+
+ public function getHelp()
+ {
+ return self::LOGO . parent::getHelp();
+ }
+
+ /**
+ * Returns the long version of the application.
+ *
+ * @return string The long application version
+ */
+ public function getLongVersion()
+ {
+ if ('UNKNOWN' !== $this->getName()) {
+ if ('UNKNOWN' !== $this->getVersion()) {
+ return sprintf('%s v%s', $this->getName(), $this->getVersion());
+ }
+
+ return sprintf('%s', $this->getName());
+ }
+
+ return 'Console Tool';
+ }
}
diff --git a/src/PHPCensor/View/layout.phtml b/src/PHPCensor/View/layout.phtml
index 133af093..e5fba66b 100644
--- a/src/PHPCensor/View/layout.phtml
+++ b/src/PHPCensor/View/layout.phtml
@@ -58,7 +58,7 @@