Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1a95710

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 parents50b9126 +86675f3 commit1a95710

File tree

16 files changed

+70
-14
lines changed

16 files changed

+70
-14
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php‎

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

1212
namespaceSymfony\Bundle\FrameworkBundle\Tests;
1313

14-
class CustomPathBundleextends \Symfony\Component\HttpKernel\Bundle\Bundle
14+
useSymfony\Component\HttpKernel\Bundle\Bundle;
15+
16+
class CustomPathBundleextends Bundle
1517
{
1618
publicfunctiongetPath()
1719
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php‎

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

1212
namespaceSymfony\Bundle\FrameworkBundle\Tests;
1313

14-
class TestBundleextends \Symfony\Component\HttpKernel\Bundle\Bundle
14+
useSymfony\Component\HttpKernel\Bundle\Bundle;
15+
16+
class TestBundleextends Bundle
1517
{
1618
}

‎src/Symfony/Component/Form/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
caseself::ROUND_CEILING:

‎src/Symfony/Component/Form/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
namespaceSymfony\Component\Form\Extension\Validator\Util;
1313

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

‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php‎

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

18-
abstractclass AbstractLayoutTestextends\Symfony\Component\Form\Test\FormIntegrationTestCase
19+
abstractclass AbstractLayoutTestextends FormIntegrationTestCase
1920
{
2021
protected$csrfTokenManager;
2122
protected$testableFeatures =array();

‎src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php‎

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

1212
namespaceSymfony\Component\Form\Tests;
1313

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

‎src/Symfony/Component/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),

‎src/Symfony/Component/Form/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
namespaceSymfony\Component\Form\Tests\Extension\Core\Type;
1313

14+
useSymfony\Component\Form\Test\TypeTestCase;
15+
1416
/**
1517
* @author Bernhard Schussek <bschussek@gmail.com>
1618
*/
17-
abstractclass BaseTypeTestextends\Symfony\Component\Form\Test\TypeTestCase
19+
abstractclass BaseTypeTestextends TypeTestCase
1820
{
1921
publicfunctiontestPassDisabledAsOption()
2022
{

‎src/Symfony/Component/Form/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
namespaceSymfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
useSymfony\Component\Form\CallbackTransformer;
15+
useSymfony\Component\Form\Test\TypeTestCase;
1516

16-
class CheckboxTypeTestextends\Symfony\Component\Form\Test\TypeTestCase
17+
class CheckboxTypeTestextends TypeTestCase
1718
{
1819
publicfunctiontestDataIsFalseByDefault()
1920
{

‎src/Symfony/Component/Form/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
namespaceSymfony\Component\Form\Tests\Extension\Core\Type;
1313

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

16-
class CollectionTypeTestextends\Symfony\Component\Form\Test\TypeTestCase
17+
class CollectionTypeTestextends TypeTestCase
1718
{
1819
publicfunctiontestContainsNoChildByDefault()
1920
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp