diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Form] fixed DateTime transformers

Browse Source
This commit is contained in:
Jules Pietri 2016-04-14 17:57:13 +02:00 committed by Fabien Potencier
parent d7e466ac23
commit b91008fb57
5 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
View File

@ -56,8 +56,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
* @return array Localized date. * @return array Localized date.
* *
* @throws TransformationFailedException If the given value is not an * @throws TransformationFailedException If the given value is not an
* instance of \DateTime or if the * instance of \DateTime or \DateTimeInterface
* output timezone is not supported.
*/ */
public function transform($dateTime) public function transform($dateTime)
{ {
@ -81,11 +80,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
$dateTime = clone $dateTime; $dateTime = clone $dateTime;
} }
try { $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
$dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
} catch (\Exception $e) {
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
}
} }
$result = array_intersect_key(array( $result = array_intersect_key(array(
@ -118,8 +113,6 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
* *
* @throws TransformationFailedException If the given value is not an array, * @throws TransformationFailedException If the given value is not an array,
* if the value could not be transformed * if the value could not be transformed
* or if the input timezone is not
* supported.
*/ */
public function reverseTransform($value) public function reverseTransform($value)
{ {

13
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
View File

@ -75,8 +75,8 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
* @return string|array Localized date string/array. * @return string|array Localized date string/array.
* *
* @throws TransformationFailedException If the given value is not an instance * @throws TransformationFailedException If the given value is not an instance
* of \DateTime or if the date could not * of \DateTime or \DateTimeInterface or
* be transformed. * if the date could not be transformed.
*/ */
public function transform($dateTime) public function transform($dateTime)
{ {
@ -105,8 +105,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
* @return \DateTime Normalized date * @return \DateTime Normalized date
* *
* @throws TransformationFailedException if the given value is not a string, * @throws TransformationFailedException if the given value is not a string,
* if the date could not be parsed or * if the date could not be parsed
* if the input timezone is not supported
*/ */
public function reverseTransform($value) public function reverseTransform($value)
{ {
@ -132,11 +131,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
} }
if ('UTC' !== $this->inputTimezone) { if ('UTC' !== $this->inputTimezone) {
try { $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
} catch (\Exception $e) {
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
}
} }
return $dateTime; return $dateTime;

31
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php
View File

@ -19,7 +19,14 @@ use Symfony\Component\Form\Exception\TransformationFailedException;
class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
{ {
/** /**
* {@inheritdoc} * Transforms a normalized date into a localized date.
*
* @param \DateTime|\DateTimeInterface $dateTime A DateTime object
*
* @return string The formatted date.
*
* @throws TransformationFailedException If the given value is not an
* instance of \DateTime or \DateTimeInterface
*/ */
public function transform($dateTime) public function transform($dateTime)
{ {
@ -32,7 +39,10 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
} }
if ($this->inputTimezone !== $this->outputTimezone) { if ($this->inputTimezone !== $this->outputTimezone) {
$dateTime = clone $dateTime; if (!$dateTime instanceof \DateTimeImmutable) {
$dateTime = clone $dateTime;
}
$dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone)); $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
} }
@ -40,7 +50,14 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
} }
/** /**
* {@inheritdoc} * Transforms a formatted string following RFC 3339 into a normalized date.
*
* @param string $rfc3339 Formatted string
*
* @return \DateTime Normalized date
*
* @throws TransformationFailedException If the given value is not a string,
* if the value could not be transformed
*/ */
public function reverseTransform($rfc3339) public function reverseTransform($rfc3339)
{ {
@ -58,12 +75,8 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e); throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
} }
if ($this->outputTimezone !== $dateTime->getTimezone()->getName()) { if ($this->inputTimezone !== $dateTime->getTimezone()->getName()) {
try { $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
} catch (\Exception $e) {
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
}
} }
if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $rfc3339, $matches)) { if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $rfc3339, $matches)) {

28
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
View File

@ -86,35 +86,30 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
* Transforms a DateTime object into a date string with the configured format * Transforms a DateTime object into a date string with the configured format
* and timezone. * and timezone.
* *
* @param \DateTime|\DateTimeInterface $value A DateTime object * @param \DateTime|\DateTimeInterface $dateTime A DateTime object
* *
* @return string A value as produced by PHP's date() function * @return string A value as produced by PHP's date() function
* *
* @throws TransformationFailedException If the given value is not a \DateTime * @throws TransformationFailedException If the given value is not an
* instance or if the output timezone * instance of \DateTime or \DateTimeInterface
* is not supported.
*/ */
public function transform($value) public function transform($dateTime)
{ {
if (null === $value) { if (null === $dateTime) {
return ''; return '';
} }
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$dateTime instanceof \DateTime && !$dateTime instanceof \DateTimeInterface) {
throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.'); throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.');
} }
if (!$value instanceof \DateTimeImmutable) { if (!$dateTime instanceof \DateTimeImmutable) {
$value = clone $value; $dateTime = clone $dateTime;
} }
try { $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
$value = $value->setTimezone(new \DateTimeZone($this->outputTimezone));
} catch (\Exception $e) {
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
}
return $value->format($this->generateFormat); return $dateTime->format($this->generateFormat);
} }
/** /**
@ -125,8 +120,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
* @return \DateTime An instance of \DateTime * @return \DateTime An instance of \DateTime
* *
* @throws TransformationFailedException If the given value is not a string, * @throws TransformationFailedException If the given value is not a string,
* if the date could not be parsed or * or could not be transformed
* if the input timezone is not supported.
*/ */
public function reverseTransform($value) public function reverseTransform($value)
{ {

13
src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php
View File

@ -29,20 +29,19 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
* @return int A timestamp * @return int A timestamp
* *
* @throws TransformationFailedException If the given value is not an instance * @throws TransformationFailedException If the given value is not an instance
* of \DateTime or if the output * of \DateTime or \DateTimeInterface
* timezone is not supported.
*/ */
public function transform($value) public function transform($dateTime)
{ {
if (null === $value) { if (null === $dateTime) {
return; return;
} }
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$dateTime instanceof \DateTime && !$dateTime instanceof \DateTimeInterface) {
throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.'); throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.');
} }
return $value->getTimestamp(); return $dateTime->getTimestamp();
} }
/** /**
@ -53,7 +52,7 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
* @return \DateTime A \DateTime object * @return \DateTime A \DateTime object
* *
* @throws TransformationFailedException If the given value is not a timestamp * @throws TransformationFailedException If the given value is not a timestamp
* or if the given timestamp is invalid. * or if the given timestamp is invalid
*/ */
public function reverseTransform($value) public function reverseTransform($value)
{ {