Add configurable datetime object support. Bump nette php-generator ve…

…rsion. Drop php5.4 and php5.5 support, add php7.1 tests

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 cache:

composer.json

@@ -12,7 +12,7 @@
   "require": {
     "php": ">=5.4",
     "doctrine/annotations": "~1.2",
-    "nette/php-generator": "~2.3",
+    "nette/php-generator": "~2.6",
     "symfony/finder": "~2.7|~3.0",
     "symfony/console": "~2.7|~3.0"
   },

src/Skrz/Meta/BaseModule.php

@@ -205,17 +205,8 @@ public function onGenerate(AbstractMetaSpec $spec, MetaSpecMatcher $matcher, Typ
 				$hash->addBody("{$indent}hash_update(\$ctx, (string){$objectPath});");
 
 			} elseif ($baseType instanceof Type) {
-				$datetimeType = false;
-
-				for ($t = $baseType; $t; $t = $t->getParentClass()) {
-					if ($t->getName() === "DateTime") {
-						$datetimeType = true;
-						break;
-					}
-				}
-
-				if ($datetimeType) {
-					$hash->addBody("{$indent}hash_update(\$ctx, {$objectPath} instanceof \\DateTime ? {$objectPath}->format(\\DateTime::ISO8601) : '');");
+				if ($baseType->isDateTime()) {
+                    $hash->addBody("{$indent}hash_update(\$ctx, {$objectPath} instanceof \\DateTimeInterface ? {$objectPath}->format(\\DateTime::ISO8601) : '');");
 				} else {
 					$propertyTypeMetaClassName = $spec->createMetaClassName($baseType);
 					$namespace->addUse($propertyTypeMetaClassName, null, $propertyTypeMetaClassNameAlias);

src/Skrz/Meta/DateTimeFormattingSerializer.php

@@ -12,12 +12,19 @@ class DateTimeFormattingSerializer implements PropertySerializerInterface
 	/** @var string */
 	private $format;
 
+	/** @var string */
+	private $dateTimeClass;
+
 	/** @var string[] */
 	private $groups = null;
 
-	public function __construct($format)
+	public function __construct($format, $dateTimeClass = DateTime::class)
 	{
 		$this->format = $format;
+		$this->dateTimeClass = $dateTimeClass;
+		if (!substr($dateTimeClass, 0, 1) != "\\") {
+		    $this->dateTimeClass = "\\" . $this->dateTimeClass;
+        }
 	}
 
 	public function addGroup($group)
@@ -36,8 +43,8 @@ public function matches(Property $property, $group)
 
 		return
 			($this->groups === null || in_array($group, $this->groups)) &&
-			$baseType instanceof Type &&
-			strtolower($baseType->getName()) === "datetime";
+			$baseType instanceof Type && $baseType->isDateTime();
+
 	}
 
 	public function matchesSerialize(Property $property, $group)
@@ -55,14 +62,14 @@ public function serialize(Property $property, $group, $inputExpression)
 		return StatementAndExpressionVO::withStatementAndExpression(
 			"if ({$inputExpression} === null) {\n" .
 			"\t\$datetimeStringReturn = null;\n" .
-			"} elseif ({$inputExpression} instanceof \\DateTime) {\n" .
+			"} elseif ({$inputExpression} instanceof \\DateTimeInterface) {\n" .
 			"\t\$datetimeStringReturn = {$inputExpression}->format(" . var_export($this->format, true) . ");\n" .
 			"} elseif (is_numeric({$inputExpression})) {\n" .
-			"\t\$datetimeStringReturn = (new \\DateTime('@' . intval({$inputExpression})))->format(" . var_export($this->format, true) . ");\n" .
+			"\t\$datetimeStringReturn = (new " . $this->dateTimeClass . "('@' . intval({$inputExpression})))->format(" . var_export($this->format, true) . ");\n" .
 			"} elseif (is_string({$inputExpression})) {\n" .
-			"\t\$datetimeStringReturn = (new \\DateTime({$inputExpression}))->format(" . var_export($this->format, true) . ");\n" .
+			"\t\$datetimeStringReturn = (new " . $this->dateTimeClass . "({$inputExpression}))->format(" . var_export($this->format, true) . ");\n" .
 			"} elseif (is_array({$inputExpression}) && isset({$inputExpression}['date'])) {\n" .
-			"\t\$datetimeStringReturn = (new \\DateTime({$inputExpression}['date']))->format(" . var_export($this->format, true) . ");\n" .
+			"\t\$datetimeStringReturn = (new " . $this->dateTimeClass . "({$inputExpression}['date']))->format(" . var_export($this->format, true) . ");\n" .
 			"} else {\n" .
 			"\tthrow new \\InvalidArgumentException('Could not serialize date of format ' . " . var_export($this->format, true) . " . '.');\n" .
 			"}",
@@ -73,18 +80,18 @@ public function serialize(Property $property, $group, $inputExpression)
 	public function deserialize(Property $property, $group, $inputExpression)
 	{
 		return StatementAndExpressionVO::withStatementAndExpression(
-			"if ({$inputExpression} instanceof \\DateTime) {\n" .
+			"if ({$inputExpression} instanceof \\DateTimeInterface) {\n" .
 			"\t\$datetimeInstanceReturn = {$inputExpression};\n" .
 			"} elseif (is_numeric({$inputExpression})) {\n" .
-			"\t\$datetimeInstanceReturn = new \\DateTime('@' . intval({$inputExpression}));\n" .
+			"\t\$datetimeInstanceReturn = new " . $this->dateTimeClass . "('@' . intval({$inputExpression}));\n" .
 			"} elseif (is_string({$inputExpression})) {\n" .
 			"\tif ({$inputExpression} === '0000-00-00 00:00:00') {\n" .
 			"\t\t\$datetimeInstanceReturn = null;\n" .
 			"\t} else {\n" .
 			"\t\t\$datetimeInstanceReturn = \\DateTime::createFromFormat(" . var_export($this->format, true) . ", {$inputExpression});\n" .
 			"\t}\n" .
 			"} elseif (is_array({$inputExpression}) && isset({$inputExpression}['date'])) {\n" .
-			"\t\$datetimeInstanceReturn = new \\DateTime({$inputExpression}['date']);\n" .
+			"\t\$datetimeInstanceReturn = new " . $this->dateTimeClass . "({$inputExpression}['date']);\n" .
 			"} elseif ({$inputExpression} === null) {\n" .
 			"\t\$datetimeInstanceReturn = null;\n" .
 			"} else {\n" .

src/Skrz/Meta/Reflection/Type.php

@@ -879,4 +879,20 @@ public function __toString()
 		return $this->getName();
 	}
 
+	public function isDateTime()
+    {
+        if ($this->getName() === \DateTime::class
+            || $this->getName() === \DateTimeImmutable::class
+        ) {
+            return true;
+        }
+        for ($t = $this; $t; $t = $t->getParentClass()) {
+            if (in_array(\DateTimeInterface::class, $t->getInterfaces())) {
+                return true;
+                break;
+            }
+        }
+        return false;
+    }
+
 }

test/Skrz/Meta/Fixtures/PHP/PhpMetaSpec.php

@@ -8,7 +8,7 @@
 class PhpMetaSpec extends AbstractMetaSpec
 {
 
-	protected function configure()
+	protected function configure($dateTimeObject = \DateTime::class)
 	{
 		$this->match("Skrz\\Meta\\Fixtures\\PHP\\ClassWith*")
 			->addModule($phpModule = new PhpModule());