Merge 0802a43 into d2c55d3

TYPO3 · Mar 10, 2020 · 7f83235 · 7f83235
2 parents d2c55d3 + 0802a43
commit 7f83235
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 39 deletions.
diff --git a/src/Domain/Clock/ClockInterface.php b/src/Domain/Clock/ClockInterface.php
@@ -11,24 +11,9 @@
 
 interface ClockInterface
 {
-    /**
-     * @return int
-     */
-    public function currentTime();
+    public function currentTime(): int;
 
-    /**
-     * @param string $string
-     * @param int $time
-     *
-     * @return int
-     */
-    public function stringToTime($string, $time = null);
+    public function stringToTime(string $string, int $time = null): int;
 
-    /**
-     * @param string $format
-     * @param string $time
-     *
-     * @return int
-     */
-    public function createTimestampFromFormat($format, $time);
+    public function createTimestampFromFormat(string $format, string $time): int;
 }
diff --git a/src/Domain/Clock/SystemClock.php b/src/Domain/Clock/SystemClock.php
@@ -13,24 +13,14 @@
 
 final class SystemClock implements ClockInterface
 {
-    /**
-     * @return int
-     */
-    public function currentTime()
+    public function currentTime(): int
     {
         return time();
     }
 
-    /**
-     * @param string $string
-     * @param int $time
-     *
-     * @return false|int
-     * @throws ClockException
-     */
-    public function stringToTime($string, $time = null)
+    public function stringToTime(string $string, int $time = null): int
     {
-        $time = $time ?? time();
+        $time = $time ?? $this->currentTime();
         $timestamp = strtotime($string, $time);
 
         if ($timestamp === false) {
@@ -40,14 +30,7 @@ public function stringToTime($string, $time = null)
         return $timestamp;
     }
 
-    /**
-     * @param string $format
-     * @param string $time
-     *
-     * @return int
-     * @throws ClockException
-     */
-    public function createTimestampFromFormat($format, $time)
+    public function createTimestampFromFormat(string $format, string $time): int
     {
         $datetime = DateTime::createFromFormat($format, $time);
 

diff --git a/tests/Unit/Domain/Clock/SystemClockTest.php b/tests/Unit/Domain/Clock/SystemClockTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace TYPO3\Surf\Tests\Unit\Domain\Clock;
+
+/*
+ * This file is part of TYPO3 Surf.
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+use PHPUnit\Framework\TestCase;
+use TYPO3\Surf\Domain\Clock\ClockException;
+use TYPO3\Surf\Domain\Clock\SystemClock;
+
+class SystemClockTest extends TestCase
+{
+    /**
+     * @var SystemClock
+     */
+    protected $subject;
+
+    protected function setUp()
+    {
+        $this->subject = new SystemClock();
+    }
+
+    /**
+     * @test
+     */
+    public function currentTime(): void
+    {
+        $this->assertInternalType('int', $this->subject->currentTime());
+    }
+
+    /**
+     * @test
+     */
+    public function stringToTime(): void
+    {
+        $this->assertInternalType('int', $this->subject->stringToTime('yesterday'));
+    }
+
+    /**
+     * @test
+     */
+    public function stringToTimeThrowsException(): void
+    {
+        $this->expectException(ClockException::class);
+        $this->subject->stringToTime('foobarbaz');
+    }
+
+    /**
+     * @test
+     */
+    public function createTimestampFromFormat(): void
+    {
+        $this->assertInternalType('int', $this->subject->createTimestampFromFormat('d.m.Y', '20.12.2002'));
+    }
+
+    /**
+     * @test
+     */
+    public function createTimestampFromFormatThrowsException(): void
+    {
+        $this->expectException(ClockException::class);
+        $this->assertInternalType('int', $this->subject->createTimestampFromFormat('d.m.Y', 'foobarbaz'));
+    }
+}