Add DateTimeImmutable support

KnpLabs · Jul 11, 2016 · c44c151 · c44c151
1 parent ad6e513
commit c44c151
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,6 @@ env:
     - TWIG_VERSION=""
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

diff --git a/DateTimeFormatter.php b/DateTimeFormatter.php
@@ -3,7 +3,7 @@
 namespace Knp\Bundle\TimeBundle;
 
 use Symfony\Component\Translation\TranslatorInterface;
-use Datetime;
+use DatetimeInterface;
 
 class DateTimeFormatter
 {
@@ -22,12 +22,12 @@ public function __construct(TranslatorInterface $translator)
     /**
      * Returns a formatted diff for the given from and to datetimes
      *
-     * @param  Datetime $from
-     * @param  Datetime $to
+     * @param  DateTimeInterface $from
+     * @param  DateTimeInterface $to
      *
      * @return string
      */
-    public function formatDiff(Datetime $from, Datetime $to)
+    public function formatDiff(DateTimeInterface $from, DateTimeInterface $to)
     {
         static $units = array(
             'y' => 'year',

diff --git a/Templating/Helper/TimeHelper.php b/Templating/Helper/TimeHelper.php
@@ -5,6 +5,7 @@
 use Symfony\Component\Templating\Helper\Helper;
 use Knp\Bundle\TimeBundle\DateTimeFormatter;
 use DateTime;
+use DateTimeInterface;
 
 class TimeHelper extends Helper
 {
@@ -37,11 +38,11 @@ public function diff($from, $to = null)
      *
      * @param  mixed $datetime
      *
-     * @return DateTime
+     * @return DateTimeInterface
      */
     public function getDatetimeObject($datetime = null)
     {
-        if ($datetime instanceof DateTime) {
+        if ($datetime instanceof DateTimeInterface) {
             return $datetime;
         }
 

diff --git a/Tests/DateTimeFormatterTest.php b/Tests/DateTimeFormatterTest.php
@@ -8,7 +8,7 @@ class DateTimeFormatterTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $translator = $this->getMock('Symfony\Component\Translation\Translator', array(), array(), '', false);
+        $translator = $this->createMock('Symfony\Component\Translation\Translator', array(), array(), '', false);
         $translator->expects($this->any())
             ->method('trans')
             ->will($this->returnArgument(0));
@@ -38,7 +38,7 @@ public function testFormatDiff()
         );
 
         foreach ($tests as $test) {
-            $from = new \Datetime(date('Y-m-d H:i:s', strtotime($test[0])));
+            $from = new \DatetimeImmutable(date('Y-m-d H:i:s', strtotime($test[0])));
             $to = new \Datetime(date('Y-m-d H:i:s', strtotime($test[1])));
 
             $this->assertEquals($test[2], $this->formatter->formatDiff($from, $to));

diff --git a/Tests/Templating/Helper/TimeHelperTest.php b/Tests/Templating/Helper/TimeHelperTest.php
@@ -8,7 +8,7 @@ class TimeHelperTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->helper = new TimeHelper($this->getMock('Knp\Bundle\TimeBundle\DateTimeFormatter', array(), array(), '', false));
+        $this->helper = new TimeHelper($this->createMock('Knp\Bundle\TimeBundle\DateTimeFormatter', array(), array(), '', false));
     }
 
     public function testGetDatetimeObject()

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     ],
 
     "require": {
-        "php":                          ">=5.3.3",
+        "php":                          ">=5.5",
         "symfony/dependency-injection": "~2.3|~3.0",
         "symfony/templating":           "~2.3|~3.0",
         "symfony/translation":          "~2.3|~3.0",