Skip to content

Commit ea1a57a

Browse files
committed
Merge branch '3.2'
* 3.2: [Config] removed obsolete code [Form] Improve rounding precision [Routing] Ignore hidden directories when loading routes from annotations fixed CS
2 parents b759f94 + c272c22 commit ea1a57a

File tree

12 files changed

+30
-11
lines changed

12 files changed

+30
-11
lines changed

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ private function round($number)
242242
if (null !== $this->scale && null !== $this->roundingMode) {
243243
// shift number to maintain the correct scale during rounding
244244
$roundingCoef = pow(10, $this->scale);
245-
$number *= $roundingCoef;
245+
// string representation to avoid rounding errors, similar to bcmul()
246+
$number = (string) ($number * $roundingCoef);
246247

247248
switch ($this->roundingMode) {
248249
case self::ROUND_CEILING:

Extension/Validator/Util/ServerParams.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111

1212
namespace Symfony\Component\Form\Extension\Validator\Util;
1313

14+
use Symfony\Component\Form\Util\ServerParams as BaseServerParams;
15+
1416
/**
1517
* @author Bernhard Schussek <bschussek@gmail.com>
1618
*/
17-
class ServerParams extends \Symfony\Component\Form\Util\ServerParams
19+
class ServerParams extends BaseServerParams
1820
{
1921
}

Tests/AbstractLayoutTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
use Symfony\Component\Form\FormError;
1515
use Symfony\Component\Form\FormView;
1616
use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
17+
use Symfony\Component\Form\Test\FormIntegrationTestCase;
1718

18-
abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormIntegrationTestCase
19+
abstract class AbstractLayoutTest extends FormIntegrationTestCase
1920
{
2021
protected $csrfTokenManager;
2122
protected $testableFeatures = array();

Tests/CompoundFormPerformanceTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use Symfony\Component\Form\Test\FormPerformanceTestCase;
15+
1416
/**
1517
* @author Bernhard Schussek <bschussek@gmail.com>
1618
*/
17-
class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase
19+
class CompoundFormPerformanceTest extends FormPerformanceTestCase
1820
{
1921
/**
2022
* Create a compound form multiple times, as happens in a collection form.

Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ public function reverseTransformWithRoundingProvider()
305305
array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
306306
array(1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
307307
array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
308+
array(2, '37.37', 37.37, NumberToLocalizedStringTransformer::ROUND_DOWN),
309+
array(2, '2.01', 2.01, NumberToLocalizedStringTransformer::ROUND_DOWN),
308310
// round halves (.5) to the next even number
309311
array(0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
310312
array(0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),

Tests/Extension/Core/Type/BaseTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
1416
/**
1517
* @author Bernhard Schussek <bschussek@gmail.com>
1618
*/
17-
abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
19+
abstract class BaseTypeTest extends TypeTestCase
1820
{
1921
public function testPassDisabledAsOption()
2022
{

Tests/Extension/Core/Type/CheckboxTypeTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\CallbackTransformer;
15+
use Symfony\Component\Form\Test\TypeTestCase;
1516

16-
class CheckboxTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
17+
class CheckboxTypeTest extends TypeTestCase
1718
{
1819
public function testDataIsFalseByDefault()
1920
{

Tests/Extension/Core/Type/CollectionTypeTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14+
use Symfony\Component\Form\Test\TypeTestCase;
1415
use Symfony\Component\Form\Tests\Fixtures\Author;
1516

16-
class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
17+
class CollectionTypeTest extends TypeTestCase
1718
{
1819
public function testContainsNoChildByDefault()
1920
{

Tests/Extension/Core/Type/FileTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14-
class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
16+
class FileTypeTest extends TypeTestCase
1517
{
1618
// https://github.com/symfony/symfony/pull/5028
1719
public function testSetData()

Tests/Extension/Core/Type/PasswordTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14-
class PasswordTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
16+
class PasswordTypeTest extends TypeTestCase
1517
{
1618
public function testEmptyIfNotSubmitted()
1719
{

0 commit comments

Comments
 (0)