Browse Source

DateTimeHelper: renamed intervalToIso() to iso()

Fabian Peter Hammerle 7 years ago
parent
commit
f5723d85b4
3 changed files with 15 additions and 15 deletions
  1. 2 2
      DateTimeHelper.php
  2. 1 1
      HtmlHelper.php
  3. 12 12
      tests/DateTimeHelperTest.php

+ 2 - 2
DateTimeHelper.php

@@ -107,7 +107,7 @@ class DateTimeHelper
      * @param \DateInterval|null $i
      * @return string|null
      */
-    public static function intervalToIso(\DateInterval $i = null)
+    public static function iso(\DateInterval $i = null)
     {
         if(is_null($i)) {
             return null;
@@ -156,7 +156,7 @@ class DateTimeHelper
             // \DatePeriod::getDateInterval() is available from php 5.6.5.
             // \DatePeriod::$interval returned an invalid \DatePeriod instance
             // in php 7.0.8
-            $interval_iso = self::intervalToIso(get_object_vars($p)['interval']);
+            $interval_iso = self::iso(get_object_vars($p)['interval']);
             switch($repetitions) {
                 case -1:
                     // no valid date within period

+ 1 - 1
HtmlHelper.php

@@ -87,7 +87,7 @@ class HtmlHelper
         if($dt instanceof \DateTime) {
             $attr = $dt->format(\DateTime::W3C);
         } elseif($dt instanceof \DateInterval) {
-            $attr = DateTimeHelper::intervalToIso($dt);
+            $attr = DateTimeHelper::iso($dt);
         } else {
             $attr = $dt;
         }

+ 12 - 12
tests/DateTimeHelperTest.php

@@ -313,7 +313,7 @@ class DateTimeHelperTest extends \PHPUnit_Framework_TestCase
         }
     }
 
-    public function intervalToIsoProvider()
+    public function isoProvider()
     {
         return [
             [null, null],
@@ -321,14 +321,14 @@ class DateTimeHelperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @dataProvider intervalToIsoProvider
+     * @dataProvider isoProvider
      */
-    public function testIntervalToIso($interval, $iso)
+    public function testIso($interval, $iso)
     {
-        $this->assertSame($iso, DateTimeHelper::intervalToIso($interval));
+        $this->assertSame($iso, DateTimeHelper::iso($interval));
     }
 
-    public function intervalToIsoReinitProvider()
+    public function isoReinitIntervalProvider()
     {
         return [
             [new DI('P1Y')],
@@ -342,15 +342,15 @@ class DateTimeHelperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @dataProvider intervalToIsoReinitProvider
+     * @dataProvider isoReinitIntervalProvider
      */
-    public function testIntervalToIsoReinit($interval)
+    public function testIsoReinitInterval($interval)
     {
-        $iso = DateTimeHelper::intervalToIso($interval);
+        $iso = DateTimeHelper::iso($interval);
         $this->assertEquals($interval, new DI($iso));
     }
 
-    public function intervalToIsoReinitUnsupportedProvider()
+    public function isoUnsupportedProvider()
     {
         return [
             [DI::createFromDateString('-2 years')],
@@ -365,12 +365,12 @@ class DateTimeHelperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @dataProvider intervalToIsoReinitUnsupportedProvider
+     * @dataProvider isoUnsupportedProvider
      * @expectedException \Exception
      */
-    public function testIntervalToIsoReinitUnsupported($interval)
+    public function testIsoUnsupported($interval)
     {
-        DateTimeHelper::intervalToIso($interval);
+        DateTimeHelper::iso($interval);
     }
 
     public function periodToIsoProvider()