Fix createFromMutable error (#298)

Author: dbrekelmans

.github/workflows/continuous-integration.yml

@@ -66,6 +66,9 @@ jobs:
       - name: "Install dependencies with composer in root directory"
         run: "composer install --no-interaction"
 
+      - name: "Run tests with phpunit/phpunit in root directory"
+        run: "vendor/bin/phpunit"
+
       - name: "Run tests with phpunit/phpunit in generator/ directory"
         run: "vendor/bin/phpunit"
         working-directory: "generator"

composer.json

@@ -104,7 +104,8 @@
     "require-dev": {
         "phpstan/phpstan": "^0.12",
         "thecodingmachine/phpstan-strict-rules": "^0.12",
-        "squizlabs/php_codesniffer": "^3.2"
+        "squizlabs/php_codesniffer": "^3.2",
+        "phpunit/phpunit": "^9.5"
     },
     "scripts": {
         "phpstan": "phpstan analyse lib -c phpstan.neon --level=max --no-progress -vvv",
@@ -116,4 +117,4 @@
             "dev-master": "0.1-dev"
         }
     }
-}
+}

lib/DateTimeImmutable.php

@@ -2,10 +2,6 @@
 
 namespace Safe;
 
-use DateInterval;
-use DateTime;
-use DateTimeInterface;
-use DateTimeZone;
 use Safe\Exceptions\DatetimeException;
 
 /**
@@ -23,7 +19,7 @@ class DateTimeImmutable extends \DateTimeImmutable
     /**
      * DateTimeImmutable constructor.
      * @param string $time
-     * @param DateTimeZone|null $timezone
+     * @param \DateTimeZone|null $timezone
      * @throws \Exception
      */
     public function __construct($time = 'now', $timezone = null)
@@ -52,7 +48,7 @@ public function getInnerDateTime(): \DateTimeImmutable
     /**
      * @param string $format
      * @param string $time
-     * @param DateTimeZone|null $timezone
+     * @param \DateTimeZone|null $timezone
      * @throws DatetimeException
      */
     public static function createFromFormat($format, $time, $timezone = null)
@@ -80,12 +76,12 @@ public function format($format): string
     }
 
     /**
-     * @param DateTimeInterface $datetime2
+     * @param \DateTimeInterface $datetime2
      * @param bool $absolute
-     * @return DateInterval
+     * @return \DateInterval
      * @throws DatetimeException
      */
-    public function diff($datetime2, $absolute = false): DateInterval
+    public function diff($datetime2, $absolute = false): \DateInterval
     {
         /** @var \DateInterval|false $result */
         $result = $this->innerDateTime->diff($datetime2, $absolute);
@@ -178,7 +174,7 @@ public function setTimestamp($unixtimestamp): self
     }
 
     /**
-     * @param DateTimeZone $timezone
+     * @param \DateTimeZone $timezone
      * @return DateTimeImmutable
      * @throws DatetimeException
      */
@@ -193,7 +189,7 @@ public function setTimezone($timezone): self
     }
 
     /**
-     * @param DateInterval $interval
+     * @param \DateInterval $interval
      * @return DateTimeImmutable
      * @throws DatetimeException
      */
@@ -224,7 +220,7 @@ public function getOffset(): int
     //overload getters to use the inner datetime immutable instead of itself
 
     /**
-     * @param DateInterval $interval
+     * @param \DateInterval $interval
      * @return DateTimeImmutable
      */
     public function add($interval): self
@@ -233,12 +229,14 @@ public function add($interval): self
     }
 
     /**
-     * @param DateTime $dateTime
+     * @param \DateTime $dateTime
      * @return DateTimeImmutable
      */
     public static function createFromMutable($dateTime): self
     {
-        return self::createFromRegular(parent::createFromMutable($dateTime));
+        $date = \DateTimeImmutable::createFromMutable($dateTime);
+
+        return self::createFromRegular($date);
     }
 
     /**
@@ -250,7 +248,7 @@ public static function __set_state($array): self
         return self::createFromRegular(parent::__set_state($array));
     }
 
-    public function getTimezone(): DateTimeZone
+    public function getTimezone(): \DateTimeZone
     {
         return $this->innerDateTime->getTimezone();
     }

phpunit.xml.dist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    colors="true"
+    bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="Main test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

tests/DateTimeImmutableTest.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
+
+final class DateTimeImmutableTest extends TestCase
+{
+    public function testCreateFromMutable(): void
+    {
+        $unsafeDate = new \DateTime('2021-10-16T12:30:16+00:00');
+        $safeImmutableDate = \Safe\DateTimeImmutable::createFromMutable($unsafeDate);
+
+        self::assertSame($unsafeDate->format(\DateTimeInterface::ATOM), $safeImmutableDate->format(\DateTimeInterface::ATOM));
+
+        $safeDate = new \Safe\DateTime('2021-10-16T12:30:16+00:00');
+        $safeImmutableDate = \Safe\DateTimeImmutable::createFromMutable($safeDate);
+
+        self::assertSame($safeDate->format(\DateTimeInterface::ATOM), $safeImmutableDate->format(\DateTimeInterface::ATOM));
+    }
+}