Permalink
Browse files

Merge branch '2.7'

* 2.7: (61 commits)
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  removed the last deprecation notice
  [Serializer] Silent deprecation notice
  removed deprecation notice
  [PropertyAccess] Show property path in all exception messages
  added deprecation notice for HttpCache::createEsi()
  added missing deprecation notice when using the form_enctype function
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  removed non-sense example
  Fixes small typo.
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Serializer] Use Serializer's LogicException when applicable
  [Serializer] Use autoloader for annotations in tests
  [Validator] fix DOS-style line endings
  Drop useless execution bit
  bumped Symfony version to 2.6.5
  [Serializer] update changelog
  ...

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.5.md
	CHANGELOG-2.6.md
	src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
  • Loading branch information...
2 parents 3c0b3b4 + 7b29baf commit fcf35dfbbeedcf24b2dc1b41d8e4dd0edc6ed84b @fabpot fabpot committed Feb 5, 2015
Showing with 2 additions and 2 deletions.
  1. +2 −2 Form/ChoiceList/ModelChoiceList.php
@@ -184,7 +184,7 @@ public function getChoicesForValues(array $values)
return array();
}
- /**
+ /*
* This performance optimization reflects a common scenario:
* * A simple select of a model entry.
* * The choice option "expanded" is set to false.
@@ -239,7 +239,7 @@ public function getValuesForChoices(array $models)
}
if (!$this->loaded) {
- /**
+ /*
* This performance optimization assumes the validation of the respective values will be done by other means.
*
* It correlates with the performance optimization in {@link ModelChoiceList::getChoicesForValues()}

0 comments on commit fcf35df

Please sign in to comment.