remove dump and fix exception

This commit is contained in:
Julien Fastré 2018-04-24 21:43:02 +02:00
parent 19e30d90c5
commit e378a6d54f

View File

@ -30,7 +30,7 @@ class NativeDateIntervalType extends DateIntervalType
if ($value === null || $value instanceof \DateInterval) { if ($value === null || $value instanceof \DateInterval) {
return $value; return $value;
} }
dump($value);
try { try {
$strings = explode(' ', $value); $strings = explode(' ', $value);
@ -44,11 +44,9 @@ class NativeDateIntervalType extends DateIntervalType
$intervalSpec .= $this->convertEntry($strings); $intervalSpec .= $this->convertEntry($strings);
} while (next($strings) !== FALSE); } while (next($strings) !== FALSE);
dump($intervalSpec);
return new \DateInterval($intervalSpec); return new \DateInterval($intervalSpec);
} catch (\Exception $exception) { } catch (\Exception $exception) {
throw $this->createConversionException($value); throw $this->createConversionException($value, $exception);
} }
} }
@ -70,7 +68,7 @@ class NativeDateIntervalType extends DateIntervalType
$unit = 'D'; $unit = 'D';
break; break;
default: default:
throw $this->createConversionException($value); throw $this->createConversionException(implode('', $strings));
} }
return $current.$unit; return $current.$unit;
@ -86,7 +84,7 @@ class NativeDateIntervalType extends DateIntervalType
} }
} }
protected function createConversionException($value) protected function createConversionException($value, $exception = null)
{ {
return ConversionException::conversionFailedFormat($value, $this->getName(), 'xx year xx mons xx days 01:02:03', $exception); return ConversionException::conversionFailedFormat($value, $this->getName(), 'xx year xx mons xx days 01:02:03', $exception);
} }