Merge branch '2.1'

* 2.1: (24 commits) updated license year Update src/Symfony/Component/HttpFoundation/Response.php [Form] Fixed inheritance of "error_bubbling" in RepeatedType [Form] Fixed DateType when used with the intl extension disabled. [HttpFoundation] fix return types and handling of zero in Response [HttpFoundation] better fix for non-parseable Expires header date Fixed missing plural message in portuguese validator Fix Expires when the header is -1 [DoctrineBridge] Allowing memcache port to be 0 to support memcache unix domain sockets. [Console] fixed unitialized properties (closes symfony#5935) [Process] Prevented test from failing when pcntl extension is not enabled. Revert "[DoctrineBridge] Improved performance of the EntityType when used with the "query_builder" option" [Form] Fixed failing tests for DateTimeToStringTransformer. [Locale] Fixed the StubLocaleTest for ICU versions lower than 4.8. [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener. [Form] Fixed test regression introduced in symfony#6440 [Tests] Fix namespaces Fixed php doc of GenericEvent::__construct HttpUtils must handle RequestMatcher too use preferred_choices in favor of preferred_query ... Conflicts:	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

Author: fabpot

CHANGELOG-2.0.md

@@ -7,6 +7,10 @@ in 2.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1
 
+* 2.0.21 (2012-12-21)
+
+ * b8e5689: [FrameworkBundle] fixed ESI calls
+
 * 2.0.20 (2012-12-20)
 
  * 532cc9a: [FrameworkBundle] added support for URIs as an argument to HttpKernel::render()

src/Symfony/Bridge/Doctrine/CHANGELOG.md

@@ -1,11 +1,6 @@
 CHANGELOG
 =========
 
-2.1.5
------
-
- * fixed caching of choice lists when EntityType is used with the "query_builder" option
-
 2.1.0
 -----
 

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -315,7 +315,7 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
  $memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%';
  $memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%';
  $memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.memcache_host').'%';
- $memcachePort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
+ $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
  $cacheDef = new Definition($memcacheClass);
  $memcacheInstance = new Definition($memcacheInstanceClass);
  $memcacheInstance->addMethodCall('connect', array(

src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php

@@ -11,53 +11,26 @@
 
 namespace Symfony\Bridge\Doctrine\Form\Type;
 
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 
 class EntityType extends DoctrineType
 {
- /**
- * @var array
- */
- private $loaderCache = array();
-
  /**
  * Return the default loader object.
  *
- * @param ObjectManager $manager
- * @param QueryBuilder|\Closure $queryBuilder
- * @param string $class
- *
+ * @param ObjectManager $manager
+ * @param mixed $queryBuilder
+ * @param string $class
  * @return ORMQueryBuilderLoader
- *
- * @throws UnexpectedTypeException If the passed $queryBuilder is no \Closure
- * and no QueryBuilder or if the closure
- * does not return a QueryBuilder.
  */
  public function getLoader(ObjectManager $manager, $queryBuilder, $class)
  {
- if ($queryBuilder instanceof \Closure) {
- $queryBuilder = $queryBuilder($manager->getRepository($class));
-
- if (!$queryBuilder instanceof QueryBuilder) {
- throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
- }
- } elseif (!$queryBuilder instanceof QueryBuilder) {
- throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder or \Closure');
- }
-
- // It is important to return the same loader for identical queries,
- // otherwise the caching mechanism in DoctrineType does not work
- // (which expects identical loaders for the cache to work)
- $hash = md5($queryBuilder->getQuery()->getDQL());
-
- if (!isset($this->loaderCache[$hash])) {
- $this->loaderCache[$hash] = new ORMQueryBuilderLoader($queryBuilder);
- }
-
- return $this->loaderCache[$hash];
+ return new ORMQueryBuilderLoader(
+ $queryBuilder,
+ $manager,
+ $class
+ );
  }
 
  public function getName()

src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Doctrine\Tests\Form\Type;
 
 use Symfony\Component\Form\Tests\FormPerformanceTestCase;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity;
 use Doctrine\ORM\Tools\SchemaTool;
 use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase;
@@ -37,9 +36,6 @@ protected function getExtensions()
  $manager->expects($this->any())
  ->method('getManager')
  ->will($this->returnValue($this->em));
- $manager->expects($this->any())
- ->method('getManagerForClass')
- ->will($this->returnValue($this->em));
 
  return array(
  new CoreExtension(),
@@ -114,26 +110,6 @@ public function testCollapsedEntityField()
  }
  }
 
- /**
- * @group benchmark
- */
- public function testCollapsedEntityFieldWithQueryBuilder()
- {
- $this->setMaxRunningTime(1);
-
- for ($i = 0; $i < 40; ++$i) {
- $form = $this->factory->create('entity', null, array(
- 'class' => self::ENTITY_CLASS,
- 'query_builder' => function (EntityRepository $repo) {
- return $repo->createQueryBuilder('e')->addOrderBy('e.id', 'DESC');
- }
- ));
-
- // force loading of the choice list
- $form->createView();
- }
- }
-
  /**
  * @group benchmark
  */

src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

@@ -11,8 +11,10 @@
 
 namespace Symfony\Bridge\Propel1\Form\ChoiceList;
 
+use \ModelCriteria;
 use \BaseObject;
 use \Persistent;
+
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\StringCastException;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
@@ -21,6 +23,7 @@
  * Widely inspired by the EntityChoiceList.
  *
  * @author William Durand <william.durand1@gmail.com>
+ * @author Toni Uebernickel <tuebernickel@gmail.com>
  */
 class ModelChoiceList extends ObjectChoiceList
 {
@@ -31,19 +34,28 @@ class ModelChoiceList extends ObjectChoiceList
  *
  * @var array
  */
- private $identifier = array();
+ protected $identifier = array();
+
+ /**
+ * The query to retrieve the choices of this list.
+ *
+ * @var ModelCriteria
+ */
+ protected $query;
 
  /**
- * Query
+ * The query to retrieve the preferred choices for this list.
+ *
+ * @var ModelCriteria
  */
- private $query = null;
+ protected $preferredQuery;
 
  /**
  * Whether the model objects have already been loaded.
  *
  * @var Boolean
  */
- private $loaded = false;
+ protected $loaded = false;
 
  /**
  * Whether to use the identifier for index generation
@@ -53,13 +65,20 @@ class ModelChoiceList extends ObjectChoiceList
  private $identifierAsIndex = false;
 
  /**
- * @param string $class
- * @param string $labelPath
- * @param array $choices
- * @param \ModelCriteria $queryObject
- * @param string $groupPath
+ * Constructor.
+ *
+ * @see Symfony\Bridge\Propel1\Form\Type\ModelType How to use the preferred choices.
+ *
+ * @param string $class The FQCN of the model class to be loaded.
+ * @param string $labelPath A property path pointing to the property used for the choice labels.
+ * @param array $choices An optional array to use, rather than fetching the models.
+ * @param ModelCriteria $queryObject The query to use retrieving model data from database.
+ * @param string $groupPath A property path pointing to the property used to group the choices.
+ * @param array|ModelCriteria $preferred The preferred items of this choice.
+ * Either an array if $choices is given,
+ * or a ModelCriteria to be merged with the $queryObject.
  */
- public function __construct($class, $labelPath = null, $choices = null, $queryObject = null, $groupPath = null)
+ public function __construct($class, $labelPath = null, $choices = null, $queryObject = null, $groupPath = null, $preferred = array())
  {
  $this->class = $class;
 
@@ -70,10 +89,15 @@ public function __construct($class, $labelPath = null, $choices = null, $queryOb
  $this->query = $queryObject ?: $query;
  $this->loaded = is_array($choices) || $choices instanceof \Traversable;
 
+ if ($preferred instanceof ModelCriteria) {
+ $this->preferredQuery = $preferred->mergeWith($this->query);
+ }
+
  if (!$this->loaded) {
  // Make sure the constraints of the parent constructor are
  // fulfilled
  $choices = array();
+ $preferred = array();
  }
 
  if (1 === count($this->identifier) && $this->isInteger(current($this->identifier))) {
@@ -328,10 +352,14 @@ private function load()
  {
  $models = (array) $this->query->find();
 
+ $preferred = array();
+ if ($this->preferredQuery instanceof ModelCriteria) {
+ $preferred = (array) $this->preferredQuery->find();
+ }
+
  try {
  // The second parameter $labels is ignored by ObjectChoiceList
- // The third parameter $preferredChoices is currently not supported
- parent::initialize($models, array(), array());
+ parent::initialize($models, array(), $preferred);
  } catch (StringCastException $e) {
  throw new StringCastException(str_replace('argument $labelPath', 'option "property"', $e->getMessage()), null, $e);
  }

src/Symfony/Bridge/Propel1/Form/Type/ModelType.php

@@ -22,6 +22,29 @@
  * ModelType class.
  *
  * @author William Durand <william.durand1@gmail.com>
+ * @author Toni Uebernickel <tuebernickel@gmail.com>
+ *
+ * Example using the preferred_choices option.
+ *
+ * <code>
+ * public function buildForm(FormBuilderInterface $builder, array $options)
+ * {
+ * $builder
+ * ->add('product', 'model', array(
+ * 'class' => 'Model\Product',
+ * 'query' => ProductQuery::create()
+ * ->filterIsActive(true)
+ * ->useI18nQuery($options['locale'])
+ * ->orderByName()
+ * ->endUse()
+ * ,
+ * 'preferred_choices' => ProductQuery::create()
+ * ->filterByIsTopProduct(true)
+ * ,
+ * ))
+ * ;
+ * }
+ * </code>
  */
 class ModelType extends AbstractType
 {
@@ -40,7 +63,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
  $options['property'],
  $options['choices'],
  $options['query'],
- $options['group_by']
+ $options['group_by'],
+ $options['preferred_choices']
  );
  };
 

src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php

@@ -70,6 +70,29 @@ public function testFlattenedChoices()
  $this->assertSame(array(1 => $item1, 2 => $item2), $choiceList->getChoices());
  }
 
+ public function testFlattenedPreferredChoices()
+ {
+ $item1 = new Item(1, 'Foo');
+ $item2 = new Item(2, 'Bar');
+
+ $choiceList = new ModelChoiceList(
+ self::ITEM_CLASS,
+ 'value',
+ array(
+ $item1,
+ $item2,
+ ),
+ null,
+ null,
+ array(
+ $item1
+ )
+ );
+
+ $this->assertSame(array(1 => $item1, 2 => $item2), $choiceList->getChoices());
+ $this->assertEquals(array(1 => new ChoiceView($item1, '1', 'Foo')), $choiceList->getPreferredViews());
+ }
+
  public function testNestedChoices()
  {
  $item1 = new Item(1, 'Foo');

src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php

@@ -19,7 +19,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * Sets the session on the request.
+ * Sets the session in the request.
  *
  * This will also start the session if it was already started during a previous
  * request.

src/Symfony/Component/Console/Input/Input.php

@@ -37,6 +37,8 @@ abstract class Input implements InputInterface
  public function __construct(InputDefinition $definition = null)
  {
  if (null === $definition) {
+ $this->arguments = array();
+ $this->options = array();
  $this->definition = new InputDefinition();
  } else {
  $this->bind($definition);