Skip to content

Commit 8060715

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: [HttpFoundation] Fix UPSERT for PgSql >= 9.5 [Form] fixed DateTime transformers [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't
2 parents b3dbc56 + 37d39c6 commit 8060715

File tree

9 files changed

+69
-53
lines changed

9 files changed

+69
-53
lines changed

‎src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ private function getMergeSql()
243243
return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
244244
case 'postgresql' === $platform && version_compare($this->con->getServerVersion(), '9.5', '>='):
245245
return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
246-
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (:data, :time) WHERE $this->idCol = :id";
246+
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->timeCol)";
247247
}
248248
}
249249
}

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public function __construct($inputTimezone = null, $outputTimezone = null, array
5656
* @return array Localized date.
5757
*
5858
* @throws TransformationFailedException If the given value is not an
59-
* instance of \DateTime or if the
60-
* output timezone is not supported.
59+
* instance of \DateTime or \DateTimeInterface
6160
*/
6261
public function transform($dateTime)
6362
{
@@ -81,11 +80,7 @@ public function transform($dateTime)
8180
$dateTime = clone $dateTime;
8281
}
8382

84-
try {
85-
$dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
86-
} catch (\Exception $e) {
87-
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
88-
}
83+
$dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
8984
}
9085

9186
$result = array_intersect_key(array(
@@ -118,8 +113,6 @@ public function transform($dateTime)
118113
*
119114
* @throws TransformationFailedException If the given value is not an array,
120115
* if the value could not be transformed
121-
* or if the input timezone is not
122-
* supported.
123116
*/
124117
public function reverseTransform($value)
125118
{

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $date
7575
* @return string|array Localized date string/array.
7676
*
7777
* @throws TransformationFailedException If the given value is not an instance
78-
* of \DateTime or if the date could not
79-
* be transformed.
78+
* of \DateTime or \DateTimeInterface or
79+
* if the date could not be transformed.
8080
*/
8181
public function transform($dateTime)
8282
{
@@ -105,8 +105,7 @@ public function transform($dateTime)
105105
* @return \DateTime Normalized date
106106
*
107107
* @throws TransformationFailedException if the given value is not a string,
108-
* if the date could not be parsed or
109-
* if the input timezone is not supported
108+
* if the date could not be parsed
110109
*/
111110
public function reverseTransform($value)
112111
{
@@ -132,11 +131,7 @@ public function reverseTransform($value)
132131
}
133132

134133
if ('UTC' !== $this->inputTimezone) {
135-
try {
136-
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
137-
} catch (\Exception $e) {
138-
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
139-
}
134+
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
140135
}
141136

142137
return $dateTime;

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@
1919
class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
2020
{
2121
/**
22-
* {@inheritdoc}
22+
* Transforms a normalized date into a localized date.
23+
*
24+
* @param \DateTime|\DateTimeInterface $dateTime A DateTime object
25+
*
26+
* @return string The formatted date.
27+
*
28+
* @throws TransformationFailedException If the given value is not an
29+
* instance of \DateTime or \DateTimeInterface
2330
*/
2431
public function transform($dateTime)
2532
{
@@ -32,15 +39,25 @@ public function transform($dateTime)
3239
}
3340

3441
if ($this->inputTimezone !== $this->outputTimezone) {
35-
$dateTime = clone $dateTime;
42+
if (!$dateTime instanceof \DateTimeImmutable) {
43+
$dateTime = clone $dateTime;
44+
}
45+
3646
$dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
3747
}
3848

3949
return preg_replace('/\+00:00$/', 'Z', $dateTime->format('c'));
4050
}
4151

4252
/**
43-
* {@inheritdoc}
53+
* Transforms a formatted string following RFC 3339 into a normalized date.
54+
*
55+
* @param string $rfc3339 Formatted string
56+
*
57+
* @return \DateTime Normalized date
58+
*
59+
* @throws TransformationFailedException If the given value is not a string,
60+
* if the value could not be transformed
4461
*/
4562
public function reverseTransform($rfc3339)
4663
{
@@ -58,12 +75,8 @@ public function reverseTransform($rfc3339)
5875
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
5976
}
6077

61-
if ($this->outputTimezone !== $dateTime->getTimezone()->getName()) {
62-
try {
63-
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
64-
} catch (\Exception $e) {
65-
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
66-
}
78+
if ($this->inputTimezone !== $dateTime->getTimezone()->getName()) {
79+
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
6780
}
6881

6982
if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $rfc3339, $matches)) {

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,35 +86,30 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $form
8686
* Transforms a DateTime object into a date string with the configured format
8787
* and timezone.
8888
*
89-
* @param \DateTime|\DateTimeInterface $value A DateTime object
89+
* @param \DateTime|\DateTimeInterface $dateTime A DateTime object
9090
*
9191
* @return string A value as produced by PHP's date() function
9292
*
93-
* @throws TransformationFailedException If the given value is not a \DateTime
94-
* instance or if the output timezone
95-
* is not supported.
93+
* @throws TransformationFailedException If the given value is not an
94+
* instance of \DateTime or \DateTimeInterface
9695
*/
97-
public function transform($value)
96+
public function transform($dateTime)
9897
{
99-
if (null === $value) {
98+
if (null === $dateTime) {
10099
return '';
101100
}
102101

103-
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
102+
if (!$dateTime instanceof \DateTime && !$dateTime instanceof \DateTimeInterface) {
104103
throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.');
105104
}
106105

107-
if (!$value instanceof \DateTimeImmutable) {
108-
$value = clone $value;
106+
if (!$dateTime instanceof \DateTimeImmutable) {
107+
$dateTime = clone $dateTime;
109108
}
110109

111-
try {
112-
$value = $value->setTimezone(new \DateTimeZone($this->outputTimezone));
113-
} catch (\Exception $e) {
114-
throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
115-
}
110+
$dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
116111

117-
return $value->format($this->generateFormat);
112+
return $dateTime->format($this->generateFormat);
118113
}
119114

120115
/**
@@ -125,8 +120,7 @@ public function transform($value)
125120
* @return \DateTime An instance of \DateTime
126121
*
127122
* @throws TransformationFailedException If the given value is not a string,
128-
* if the date could not be parsed or
129-
* if the input timezone is not supported.
123+
* or could not be transformed
130124
*/
131125
public function reverseTransform($value)
132126
{

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,19 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
2929
* @return int A timestamp
3030
*
3131
* @throws TransformationFailedException If the given value is not an instance
32-
* of \DateTime or if the output
33-
* timezone is not supported.
32+
* of \DateTime or \DateTimeInterface
3433
*/
35-
public function transform($value)
34+
public function transform($dateTime)
3635
{
37-
if (null === $value) {
36+
if (null === $dateTime) {
3837
return;
3938
}
4039

41-
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
40+
if (!$dateTime instanceof \DateTime && !$dateTime instanceof \DateTimeInterface) {
4241
throw new TransformationFailedException('Expected a \DateTime or \DateTimeInterface.');
4342
}
4443

45-
return $value->getTimestamp();
44+
return $dateTime->getTimestamp();
4645
}
4746

4847
/**
@@ -53,7 +52,7 @@ public function transform($value)
5352
* @return \DateTime A \DateTime object
5453
*
5554
* @throws TransformationFailedException If the given value is not a timestamp
56-
* or if the given timestamp is invalid.
55+
* or if the given timestamp is invalid
5756
*/
5857
public function reverseTransform($value)
5958
{

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ private function getMergeSql()
678678
return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
679679
case 'pgsql' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '9.5', '>='):
680680
return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
681-
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (:data, :lifetime, :time) WHERE $this->idCol = :id";
681+
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->lifetimeCol, EXCLUDED.$this->timeCol)";
682682
}
683683
}
684684

‎src/Symfony/Component/PropertyAccess/PropertyAccessor.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,17 @@ private function getWriteAccessInfo($class, $property, $value)
714714
// we call the getter and hope the __call do the job
715715
$access[self::ACCESS_TYPE] = self::ACCESS_TYPE_MAGIC;
716716
$access[self::ACCESS_NAME] = $setter;
717+
} elseif (null !== $methods = $this->findAdderAndRemover($reflClass, $singulars)) {
718+
$access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
719+
$access[self::ACCESS_NAME] = sprintf(
720+
'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
721+
'the new value must be an array or an instance of \Traversable, '.
722+
'"%s" given.',
723+
$property,
724+
$reflClass->name,
725+
implode('()", "', $methods),
726+
is_object($value) ? get_class($value) : gettype($value)
727+
);
717728
} else {
718729
$access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
719730
$access[self::ACCESS_NAME] = sprintf(

‎src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,15 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
194194

195195
$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes', $axes));
196196
}
197+
198+
/**
199+
* @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
200+
* expectedExceptionMessageRegExp /The property "axes" in class "Mock_PropertyAccessorCollectionTest_Car[^"]*" can be defined with the methods "addAxis()", "removeAxis()" but the new value must be an array or an instance of \Traversable, "string" given./
201+
*/
202+
public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
203+
{
204+
$car = $this->getMock(__CLASS__.'_Car');
205+
206+
$this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
207+
}
197208
}

0 commit comments

Comments
 (0)