Ensure single digits are still treated as numbers

duncan3dc · Jul 24, 2017 · 08bfbbd · 08bfbbd
1 parent 602b6ea
commit 08bfbbd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ Changelog
 
 --------
 
+## 1.2.1 - 2017-07-24
+
+### Added
+
+* [Support] Add support for PHP 7.2
+
+### Fixed
+
+* [DateTime] Ensure single digits are treated as numbers by format().
+
+--------
+
 ## 1.2.0 - 2017-03-05
 
 ### Added

diff --git a/src/Traits/Formatting.php b/src/Traits/Formatting.php
@@ -53,7 +53,7 @@ public function format($format)
         $return = $this->string($format);
 
         # If the result looks like a number then return it as an int
-        if (preg_match("/^[1-9][0-9]+$/", $return)) {
+        if (preg_match("/^[1-9][0-9]*$/", $return)) {
             # Only attempt to cast a number in the range supported by this install
             if ($return < \PHP_INT_MAX) {
                 $return = (int) $return;

diff --git a/tests/DateTimeTest.php b/tests/DateTimeTest.php
@@ -55,6 +55,11 @@ public function testFormat4()
         $date = DateTime::mktime(4, 22, 33, 1, 18, 2016);
         $this->assertSame("042233", $date->format("His"));
     }
+    public function testFormat5()
+    {
+        $date = DateTime::mktime(4, 22, 33, 1, 18, 2016);
+        $this->assertSame(1, $date->format("n"));
+    }
     public function testNumeric()
     {
         $unix = time();