Skip to content

Commit 69707f5

Browse files
Various fixes esp. on Windows
1 parent 3a08776 commit 69707f5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ChoiceList/Factory/CachingFactoryDecorator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function generateHash($value, $namespace = '')
6262
});
6363
}
6464

65-
return hash('sha256', $namespace.':'.json_encode($value));
65+
return hash('sha256', $namespace.':'.serialize($value));
6666
}
6767

6868
/**

Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ public function testTransformWithScale()
9292

9393
public function transformWithRoundingProvider()
9494
{
95-
// Since we test against "de_AT", we need the full implementation
96-
IntlTestHelper::requireFullIntl($this);
97-
98-
\Locale::setDefault('de_AT');
99-
10095
return array(
10196
// towards positive infinity (1.6 -> 2, -1.6 -> -1)
10297
array(0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING),
@@ -189,6 +184,11 @@ public function transformWithRoundingProvider()
189184
*/
190185
public function testTransformWithRounding($scale, $input, $output, $roundingMode)
191186
{
187+
// Since we test against "de_AT", we need the full implementation
188+
IntlTestHelper::requireFullIntl($this);
189+
190+
\Locale::setDefault('de_AT');
191+
192192
$transformer = new NumberToLocalizedStringTransformer($scale, null, $roundingMode);
193193

194194
$this->assertEquals($output, $transformer->transform($input));

0 commit comments

Comments
 (0)