summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-12-28 10:51:41 +0100
committerGitHub <noreply@github.com>2017-12-28 10:51:41 +0100
commit46958e4c3f2b44ee6acfd95a94bee0f3be19f00a (patch)
tree0bff8540ef12ccaa93a33ac0254aafef22492a79
parente37fa60784f94abb6715704ffcbd479c05938e3a (diff)
parent735b9fb81a83ae182bf9c005f1fbbbcce12d9b64 (diff)
downloadnextcloud-server-46958e4c3f2b44ee6acfd95a94bee0f3be19f00a.tar.gz
nextcloud-server-46958e4c3f2b44ee6acfd95a94bee0f3be19f00a.zip
Merge pull request #7608 from nextcloud/pimp_timestampformatter
Fixes for TimestampFormatter
-rw-r--r--lib/private/Console/TimestampFormatter.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php
index 66dd38e6ac3..9ced9e18b31 100644
--- a/lib/private/Console/TimestampFormatter.php
+++ b/lib/private/Console/TimestampFormatter.php
@@ -31,6 +31,9 @@ class TimestampFormatter implements OutputFormatterInterface {
/** @var IConfig */
protected $config;
+ /** @var OutputFormatterInterface */
+ protected $formatter;
+
/**
* @param IConfig $config
* @param OutputFormatterInterface $formatter
@@ -75,7 +78,7 @@ class TimestampFormatter implements OutputFormatterInterface {
* @return bool
*/
public function hasStyle($name) {
- $this->formatter->hasStyle($name);
+ return $this->formatter->hasStyle($name);
}
/**
@@ -83,6 +86,7 @@ class TimestampFormatter implements OutputFormatterInterface {
*
* @param string $name
* @return OutputFormatterStyleInterface
+ * @throws \InvalidArgumentException When style isn't defined
*/
public function getStyle($name) {
return $this->formatter->getStyle($name);