Accepting DateTimeInterface for Date and DateTime Literals (foreign c…

…ode by @madbob). (#9) * Accepting DateTimeInterface for Date and DateTime Literals. Author: @madbob Source: https://github.com/madbob/easyrdf/tree/datetimeinterface Added/made a few refinements (coding styles, PHPStan related) * fixed undefined class constant ATOM error when using PHP 7.1 or below, constant ATOM is not available for DateTimeInterface. * More stable workaround for "undefined class constant error" * fixed coding style issue
sweetrdf · May 6, 2021 · c690f70 · c690f70
1 parent 628d1dc
commit c690f70
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 12 deletions.
diff --git a/lib/Literal/Date.php b/lib/Literal/Date.php
@@ -36,6 +36,8 @@
  * @copyright  Copyright (c) 2009-2014 Nicholas J Humfrey
  * @license    https://www.opensource.org/licenses/bsd-license.php
  */
+
+use DateTimeInterface;
 use EasyRdf\Literal;
 
 /**
@@ -50,7 +52,7 @@ class Date extends Literal
 {
     /** Constructor for creating a new date literal
      *
-     * If the value is a DateTime object, then it will be converted to the xsd:date format.
+     * If the value is a DateTimeInterface object, then it will be converted to the xsd:date format.
      * If no value is given or is is null, then the current date is used.
      *
      * @see \DateTime
@@ -72,8 +74,8 @@ public function __construct($value = null, $lang = null, $datatype = null)
             $value = new \DateTime('today');
         }
 
-        // Convert DateTime object into string
-        if ($value instanceof \DateTime) {
+        // Convert DateTimeInterface object into string
+        if ($value instanceof DateTimeInterface) {
             $value = $value->format('Y-m-d');
         }
 

diff --git a/lib/Literal/DateTime.php b/lib/Literal/DateTime.php
@@ -2,6 +2,8 @@
 
 namespace EasyRdf\Literal;
 
+use DateTimeInterface;
+
 /*
  * EasyRdf
  *
@@ -36,7 +38,6 @@
  * @copyright  Copyright (c) 2009-2014 Nicholas J Humfrey
  * @license    https://www.opensource.org/licenses/bsd-license.php
  */
-use EasyRdf\Literal;
 
 /**
  * Class that represents an RDF Literal of datatype xsd:dateTime
@@ -50,7 +51,7 @@ class DateTime extends Date
 {
     /** Constructor for creating a new date and time literal
      *
-     * If the value is a DateTime object, then it will be converted to the xsd:dateTime format.
+     * If the value is a DateTimeInterface object, then it will be converted to the xsd:dateTime format.
      * If no value is given or is is null, then the current time is used.
      *
      * @see \DateTime
@@ -72,9 +73,16 @@ public function __construct($value = null, $lang = null, $datatype = null)
             $value = new \DateTime('now');
         }
 
+        // workaround for PHP < 7.2: if not used, script will throw "Undefined class constant 'ATOM'"
+        if (\defined('\DateTimeInterface::ATOM')) {
+            $format = DateTimeInterface::ATOM;
+        } else {
+            $format = \DateTime::ATOM;
+        }
+
         // Convert DateTime objects into string
-        if ($value instanceof \DateTime) {
-            $atom = $value->format(\DateTime::ATOM);
+        if ($value instanceof DateTimeInterface) {
+            $atom = $value->format($format);
             $value = preg_replace('/[\+\-]00(\:?)00$/', 'Z', $atom);
         }
 

diff --git a/test/EasyRdf/Literal/DateTest.php b/test/EasyRdf/Literal/DateTest.php
@@ -63,6 +63,17 @@ public function testConstructFromDateTime()
         $this->assertSame('xsd:date', $literal->getDatatype());
     }
 
+    public function testConstructFromDateTimeImmutable()
+    {
+        $dt = new \DateTimeImmutable('2011-07-18');
+        $literal = new Date($dt);
+        $this->assertStringEquals('2011-07-18', $literal);
+        $this->assertClass('DateTime', $literal->getValue());
+        $this->assertEquals($dt, $literal->getValue());
+        $this->assertStringEquals('', $literal->getLang());
+        $this->assertSame('xsd:date', $literal->getDatatype());
+    }
+
     public function testConstructNoValue()
     {
         // Would be very unlucky if this ran at midnight and failed

diff --git a/test/EasyRdf/Literal/DateTimeTest.php b/test/EasyRdf/Literal/DateTimeTest.php
@@ -2,6 +2,7 @@
 
 namespace Test\EasyRdf\Literal;
 
+use DateTimeImmutable;
 use EasyRdf\Literal\DateTime;
 use Test\TestCase;
 
@@ -45,6 +46,11 @@ class DateTimeTest extends TestCase
     /** @var DateTime */
     private $dt;
 
+    protected function setUp()
+    {
+        $this->dt = new DateTime('2010-09-08T07:06:05Z');
+    }
+
     public function testConstruct()
     {
         $literal = new DateTime('2011-07-18T18:45:43Z');
@@ -84,6 +90,17 @@ public function testConstructFromDateTimeUTC()
         $this->assertSame('xsd:dateTime', $literal->getDatatype());
     }
 
+    public function testConstructFromDateTimeImmutableUTC()
+    {
+        $dt = new DateTimeImmutable('2010-09-08T07:06:05Z');
+        $literal = new DateTime($dt);
+        $this->assertStringEquals('2010-09-08T07:06:05Z', $literal);
+        $this->assertClass('DateTime', $literal->getValue());
+        $this->assertEquals($dt, $literal->getValue());
+        $this->assertStringEquals('', $literal->getLang());
+        $this->assertSame('xsd:dateTime', $literal->getDatatype());
+    }
+
     public function testParseUTC()
     {
         $literal = DateTime::parse('Mon 18 Jul 2011 18:45:43 UTC');
@@ -102,11 +119,6 @@ public function testParseBST()
         $this->assertSame('xsd:dateTime', $literal->getDatatype());
     }
 
-    protected function setUp()
-    {
-        $this->dt = new DateTime('2010-09-08T07:06:05Z');
-    }
-
     public function testFormat()
     {
         $this->assertSame(