Merge pull request #10 from magicoli/master

Fix #9 Unix timestamp string not detected
flack · Sep 8, 2022 · 3333620 · 3333620
2 parents 3e61e8b + 9cc0885
commit 3333620
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Ranger.php b/src/Ranger.php
@@ -234,14 +234,14 @@ private function prepare_date($input)
  if ($input instanceof DateTime) {
  return $input;
  }
- if (is_string($input)) {
- return new Datetime($input);
- }
- if (is_int($input)) {
+ if (is_numeric($input)) {
  $date = new Datetime;
- $date->setTimestamp($input);
+ $date->setTimestamp(intval($input));
  return $date;
  }
+ if (is_string($input)) {
+ return new Datetime($input);
+ }
  if ($input === null) {
  return new Datetime;
  }

diff --git a/test/RangerTest.php b/test/RangerTest.php
@@ -245,4 +245,13 @@ public function testIssue8()
  $result = $r->format('2022-05-04 20:00:00', '2022-05-04 20:00:00');
  $this->assertEquals('04.05.2022, 20:00', $result);
  }
+
+ public function testIssue9()
+ {
+ $r = new Ranger('en');
+ $this->assertEquals('Sep 5–12, 2022', $r->format(1662336000, 1662940800));
+ $this->assertEquals('Sep 5–12, 2022', $r->format(1662336000.5, 1662940800.5));
+ $this->assertEquals('Sep 5–12, 2022', $r->format("1662336000", "1662940800"));
+ $this->assertEquals('Sep 5–12, 2022', $r->format("1662336000.5", "1662940800.5"));
+ }
 }