Merge branch '3.2'

fabpot · fabpot · commit 1a957100c2d4 · 2017-03-02T13:35:04.000-08:00
* 3.2:
  [Config] removed obsolete code
  [Form] Improve rounding precision
  [Routing] Ignore hidden directories when loading routes from annotations
  fixed CS
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
-class CustomPathBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class CustomPathBundle extends Bundle
 {
     public function getPath()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
-class TestBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TestBundle extends Bundle
 {
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -242,7 +242,8 @@ private function round($number)
         if (null !== $this->scale && null !== $this->roundingMode) {
             // shift number to maintain the correct scale during rounding
             $roundingCoef = pow(10, $this->scale);
-            $number *= $roundingCoef;
+            // string representation to avoid rounding errors, similar to bcmul()
+            $number = (string) ($number * $roundingCoef);
 
             switch ($this->roundingMode) {
                 case self::ROUND_CEILING:
diff --git a/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php b/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php
@@ -11,9 +11,11 @@
 
 namespace Symfony\Component\Form\Extension\Validator\Util;
 
+use Symfony\Component\Form\Util\ServerParams as BaseServerParams;
+
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ServerParams extends \Symfony\Component\Form\Util\ServerParams
+class ServerParams extends BaseServerParams
 {
 }
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -14,8 +14,9 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
+use Symfony\Component\Form\Test\FormIntegrationTestCase;
 
-abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormIntegrationTestCase
+abstract class AbstractLayoutTest extends FormIntegrationTestCase
 {
     protected $csrfTokenManager;
     protected $testableFeatures = array();
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php b/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use Symfony\Component\Form\Test\FormPerformanceTestCase;
+
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase
+class CompoundFormPerformanceTest extends FormPerformanceTestCase
 {
     /**
      * Create a compound form multiple times, as happens in a collection form.
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -305,6 +305,8 @@ public function reverseTransformWithRoundingProvider()
             array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
             array(1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
             array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
+            array(2, '37.37', 37.37, NumberToLocalizedStringTransformer::ROUND_DOWN),
+            array(2, '2.01', 2.01, NumberToLocalizedStringTransformer::ROUND_DOWN),
             // round halves (.5) to the next even number
             array(0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
             array(0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase;
+
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+abstract class BaseTypeTest extends TypeTestCase
 {
     public function testPassDisabledAsOption()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -12,8 +12,9 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Test\TypeTestCase;
 
-class CheckboxTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+class CheckboxTypeTest extends TypeTestCase
 {
     public function testDataIsFalseByDefault()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\Form\Tests\Fixtures\Author;
 
-class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+class CollectionTypeTest extends TypeTestCase
 {
     public function testContainsNoChildByDefault()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+use Symfony\Component\Form\Test\TypeTestCase;
+
+class FileTypeTest extends TypeTestCase
 {
     // https://github.com/symfony/symfony/pull/5028
     public function testSetData()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-class PasswordTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+use Symfony\Component\Form\Test\TypeTestCase;
+
+class PasswordTypeTest extends TypeTestCase
 {
     public function testEmptyIfNotSubmitted()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-class RepeatedTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+use Symfony\Component\Form\Test\TypeTestCase;
+
+class RepeatedTypeTest extends TypeTestCase
 {
     protected $form;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -12,8 +12,9 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Test\TypeTestCase;
 
-class TimezoneTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
+class TimezoneTypeTest extends TypeTestCase
 {
     public function testTimezonesAreSelectable()
     {
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
@@ -38,7 +38,15 @@ public function load($path, $type = null)
 
         $collection = new RouteCollection();
         $collection->addResource(new DirectoryResource($dir, '/\.php$/'));
-        $files = iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir), \RecursiveIteratorIterator::LEAVES_ONLY));
+        $files = iterator_to_array(new \RecursiveIteratorIterator(
+            new \RecursiveCallbackFilterIterator(
+                new \RecursiveDirectoryIterator($dir),
+                function (\SplFileInfo $current) {
+                    return '.' !== substr($current->getBasename(), 0, 1);
+                }
+            ),
+            \RecursiveIteratorIterator::LEAVES_ONLY
+        ));
         usort($files, function (\SplFileInfo $a, \SplFileInfo $b) {
             return (string) $a > (string) $b ? 1 : -1;
         });
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -40,6 +40,22 @@ public function testLoad()
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
     }
 
+    public function testLoadIgnoresHiddenDirectories()
+    {
+        $this->expectAnnotationsToBeReadFrom(array(
+            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\FooClass',
+        ));
+
+        $this->reader
+            ->expects($this->any())
+            ->method('getMethodAnnotations')
+            ->will($this->returnValue(array()))
+        ;
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
+    }
+
     public function testSupports()
     {
         $fixturesDir = __DIR__.'/../Fixtures';
@@ -50,4 +66,13 @@ public function testSupports()
         $this->assertTrue($this->loader->supports($fixturesDir, 'annotation'), '->supports() checks the resource type if specified');
         $this->assertFalse($this->loader->supports($fixturesDir, 'foo'), '->supports() checks the resource type if specified');
     }
+
+    private function expectAnnotationsToBeReadFrom(array $classes)
+    {
+        $this->reader->expects($this->exactly(count($classes)))
+            ->method('getClassAnnotation')
+            ->with($this->callback(function (\ReflectionClass $class) use ($classes) {
+                return in_array($class->getName(), $classes);
+            }));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests;`
`13`	`13`
`14`		`-class CustomPathBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle`
	`14`	`+use Symfony\Component\HttpKernel\Bundle\Bundle;`
	`15`	`+`
	`16`	`+class CustomPathBundle extends Bundle`
`15`	`17`	`{`
`16`	`18`	`public function getPath()`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests;`
`13`	`13`
`14`		`-class TestBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle`
	`14`	`+use Symfony\Component\HttpKernel\Bundle\Bundle;`
	`15`	`+`
	`16`	`+class TestBundle extends Bundle`
`15`	`17`	`{`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Extension\Validator\Util;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Util\ServerParams as BaseServerParams;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`16`	`18`	`*/`
`17`		`-class ServerParams extends \Symfony\Component\Form\Util\ServerParams`
	`19`	`+class ServerParams extends BaseServerParams`
`18`	`20`	`{`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Test\TypeTestCase;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`16`	`18`	`*/`
`17`		`-abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase`
	`19`	`+abstract class BaseTypeTest extends TypeTestCase`
`18`	`20`	`{`
`19`	`21`	`public function testPassDisabledAsOption()`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,9 @@`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\CallbackTransformer;`
	`15`	`+use Symfony\Component\Form\Test\TypeTestCase;`
`15`	`16`
`16`		`-class CheckboxTypeTest extends \Symfony\Component\Form\Test\TypeTestCase`
	`17`	`+class CheckboxTypeTest extends TypeTestCase`
`17`	`18`	`{`
`18`	`19`	`public function testDataIsFalseByDefault()`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Test\TypeTestCase;`
`14`	`15`	`use Symfony\Component\Form\Tests\Fixtures\Author;`
`15`	`16`
`16`		`-class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase`
	`17`	`+class CollectionTypeTest extends TypeTestCase`
`17`	`18`	`{`
`18`	`19`	`public function testContainsNoChildByDefault()`
`19`	`20`	`{`