Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit abec679cafe4 · 2016-11-02T11:48:28.000+01:00
* 3.1:
  [SecurityBundle] Fix term width in UserPasswordEncoderCommandTest
  remove dead code
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -20,14 +20,10 @@
 use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
-use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
-use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
-use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
 use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 
 abstract class DoctrineType extends AbstractType
 {
@@ -36,11 +32,6 @@ abstract class DoctrineType extends AbstractType
      */
     protected $registry;
 
-    /**
-     * @var ChoiceListFactoryInterface
-     */
-    private $choiceListFactory;
-
     /**
      * @var IdReader[]
      */
@@ -108,15 +99,9 @@ public function getQueryBuilderPartsForCachingHash($queryBuilder)
         return false;
     }
 
-    public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)
+    public function __construct(ManagerRegistry $registry)
     {
         $this->registry = $registry;
-        $this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(
-            new PropertyAccessDecorator(
-                new DefaultChoiceListFactory(),
-                $propertyAccessor
-            )
-        );
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -140,7 +140,7 @@ public function testEncodePasswordNoConfigForGivenUserClass()
 
     protected function setUp()
     {
-        putenv('COLUMNS=120');
+        putenv('COLUMNS='.(119 + strlen(PHP_EOL)));
         $kernel = $this->createKernel(array('test_case' => 'PasswordEncode'));
         $kernel->boot();
 

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function testEncodePasswordNoConfigForGivenUserClass()`
`140`	`140`
`141`	`141`	`protected function setUp()`
`142`	`142`	`{`
`143`		`- putenv('COLUMNS=120');`
	`143`	`+ putenv('COLUMNS='.(119 + strlen(PHP_EOL)));`
`144`	`144`	`$kernel = $this->createKernel(array('test_case' => 'PasswordEncode'));`
`145`	`145`	`$kernel->boot();`
`146`	`146`