Commit Graph

20460 Commits

Author SHA1 Message Date
Fabien Potencier
70ba475156 bug #13785 [VarDumper] Workaround stringy numeric keys (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Workaround stringy numeric keys

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13784
| License       | MIT
| Doc PR        | -

Commits
-------

46bea3a [VarDumper] Workaround stringy numeric keys
2015-02-25 09:36:14 +01:00
Fabien Potencier
ab7b3a8119 bug #13769 [Form] NativeRequestHandler file handling fix (mpajunen)
This PR was squashed before being merged into the 2.3 branch (closes #13769).

Discussion
----------

[Form] NativeRequestHandler file handling fix

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13746
| License       | MIT
| Doc PR        | n/a

`NativeRequestHandler` reused the local variable for the form name `$name` as a loop variable for processing the `$_FILES` array. A separate variable is now used.

Two new test cases are included:
- Handling a request with multiple files
- Handling a request with file upload and a nameless form

Both tests fail without the fix. The test cases could probably be better though.

Commits
-------

9b3421f [Form] NativeRequestHandler file handling fix
2015-02-25 09:33:53 +01:00
Mikael Pajunen
9b3421f18a [Form] NativeRequestHandler file handling fix 2015-02-25 09:33:49 +01:00
Nicolas Grekas
46bea3ab30 [VarDumper] Workaround stringy numeric keys 2015-02-25 09:21:12 +01:00
Nicolas Grekas
0ebcf639c3 [HttpKernel] Throw double-bounce exceptions 2015-02-24 20:09:42 +01:00
Nicolas Grekas
2777e965ed Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:49 +01:00
Nicolas Grekas
9f5a2caf3a Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:32 +01:00
Fabien Potencier
cea862935c bug #13779 [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] silence E_USER_DEPRECATED in insulated clients

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

7558c23 [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 18:38:20 +01:00
Nicolas Grekas
7558c232af [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients 2015-02-24 17:59:59 +01:00
Fabien Potencier
f206dfd9e4 bug #13745 Fixed absolute_url for absolute paths (florianv)
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed absolute_url for absolute paths

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/13724
| License       | MIT

The issue is that `asset()` and `absolute_url()` cannot be composed because `asset()` already returns an absolute path (using the `PathPackage`) and `absolute_url()` still prepends the base path. So the resulting url contains the base path twice.

So this PR removes appending the base path to absolute paths (starting with `/`) passed to `absolute_url()`.

Commits
-------

08aa7bc Fixed absolute_url for absolute paths
2015-02-24 17:24:16 +01:00
Nicolas Grekas
65e4a5aaf4 Merge branch '2.6' into 2.7
* 2.6:
  [minor] composer.json fix
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:41:26 +01:00
Nicolas Grekas
76e736eeb7 [minor] composer.json fix 2015-02-24 14:39:59 +01:00
Nicolas Grekas
decd82eef7 Merge branch '2.3' into 2.6
* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:39:25 +01:00
Nicolas Grekas
4a638a4269 [minor] composer.json fix 2015-02-24 14:38:15 +01:00
florianv
08aa7bc223 Fixed absolute_url for absolute paths 2015-02-24 13:11:45 +01:00
Nicolas Grekas
d4802aa92b Merge branch '2.6' into 2.7
* 2.6:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  [PropertyAccess] unify and fix doc
  Enforce UTF-8 charset for core controllers
  Fix the toolbar JS for IE

Conflicts:
	.travis.yml
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bridge/Propel1/composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bridge/Swiftmailer/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/DebugBundle/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Bundle/WebProfilerBundle/composer.json
	src/Symfony/Component/Asset/Exception/ExceptionInterface.php
	src/Symfony/Component/Asset/Exception/LogicException.php
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/composer.json
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/Acl/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Templating/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
2015-02-24 13:09:34 +01:00
Nicolas Grekas
2f3692aca7 Merge branch '2.3' into 2.6
* 2.3:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  Enforce UTF-8 charset for core controllers

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 12:52:21 +01:00
Nicolas Grekas
4a63bde710 Minor hot fix 2015-02-24 12:41:28 +01:00
Fabien Potencier
98bf339673 minor #13772 [2.3] require-dev PHPUnit bridge (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] require-dev PHPUnit bridge

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

8b02796 [2.3] require-dev PHPUnit bridge
2015-02-24 12:37:24 +01:00
Fabien Potencier
463b24b27c bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

Enforce UTF-8 charset for core controllers

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7532
| License       | MIT
| Doc PR        | -

See https://github.com/symfony/symfony/issues/7617 and https://github.com/symfony/symfony/pull/7532 for the context of this PR.

Commits
-------

3032014 Enforce UTF-8 charset for core controllers
2015-02-24 12:31:58 +01:00
Fabien Potencier
500a6b65cd bug #13768 [Debug] Deprecations exception for Symfony internals (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Deprecations exception for Symfony internals

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13764
| License       | MIT
| Doc PR        | -

Allowing 1st level check of the `Symfony\` namespace prevents trigerring deprecation notices for internal things, but keeps notices enabled for `Symfony\Cmf\` classes

Commits
-------

323e957 [Debug] Deprecations exception for Symfony internals
2015-02-24 12:24:48 +01:00
Fabien Potencier
c475704c8f bug #13683 [PROCESS] make sure /dev/tty is readable (staabm)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13683).

Discussion
----------

[PROCESS] make sure /dev/tty is readable

When using Process from Web-SAPI it is likely that the webserver user
doesn't has rights to use /dev/tty

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13261
| License       | MIT
| Doc PR        | -

Commits
-------

935afe6 [PROCESS] make sure /dev/tty is readable
2015-02-24 12:07:24 +01:00
Markus Staab
935afe650a [PROCESS] make sure /dev/tty is readable
When using Process from Web-SAPI it is likely that the webserver user
doesn't has rights to use /dev/tty
2015-02-24 12:07:24 +01:00
Fabien Potencier
cae6de6f43 minor #13771 [2.3] Update CONTRIBUTING.md (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Update CONTRIBUTING.md

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

6726a40 [2.3] Update CONTRIBUTING.md
2015-02-24 11:55:28 +01:00
Fabien Potencier
238eaccdbb minor #13776 [2.3][FrameworkBundle] Fixed Shell logo (francisbesset)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][FrameworkBundle] Fixed Shell logo

This PR fix #12565.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

d7f008d [FrameworkBundle] Fixed Shell logo
2015-02-24 11:50:34 +01:00
Fabien Potencier
b6148e27fe minor #13777 [PhpUnitBridge] Allow PHP 5.3.3 to use with Symfony 2.3 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PhpUnitBridge] Allow PHP 5.3.3 to use with Symfony 2.3

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

25aa12d [PhpUnitBridge] Allow PHP 5.3.3 to use with Symfony 2.3
2015-02-24 11:40:16 +01:00
Nicolas Grekas
25aa12d53c [PhpUnitBridge] Allow PHP 5.3.3 to use with Symfony 2.3 2015-02-24 11:26:59 +01:00
Nicolas Grekas
8b02796e9e [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00
Francis Besset
d7f008d692 [FrameworkBundle] Fixed Shell logo 2015-02-24 11:23:15 +01:00
Nicolas Grekas
6726a40654 [2.3] Update CONTRIBUTING.md 2015-02-24 10:01:10 +01:00
Fabien Potencier
7fb03e0942 bug #13733 [2.3][Process] Fixed PhpProcess::getCommandLine() result (francisbesset)
This PR was squashed before being merged into the 2.3 branch (closes #13733).

Discussion
----------

[2.3][Process] Fixed PhpProcess::getCommandLine() result

The `PhpProcess::getCommandLine()` return `null` if `PhpProcess::start()` was not called.

```php
$process = new PhpProcess(<<<PHP
<?php echo "foobar";
PHP
);

$process->getCommandLine(); // return null
$process->start();
$process->getCommandLine(); // return the PHP binary path
```

This PR fix the problem.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | -

Commits
-------

d0f1d32 [2.3][Process] Fixed PhpProcess::getCommandLine() result
2015-02-24 09:27:08 +01:00
Francis Besset
d0f1d3236c [2.3][Process] Fixed PhpProcess::getCommandLine() result 2015-02-24 09:27:06 +01:00
Fabien Potencier
ed8f5c819c bug #13729 Fix the toolbar JS for IE (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix the toolbar JS for IE

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | n/a

- fix the binding of listeners on XMLHttpRequest to always use the addEventListener method. It does not make sense to change it to attachEvent as it is about binding listeners on DOM elements.
- fix the feature detection for the event binding on DOM elements:
    - the attachEvent and addEventListener methods are on DOM elements, not on the document object
    - the standard method should be preferred in IE versions supporting both methods
- avoid JS errors when XMLHttpRequest is not defined by avoiding to override its open method when the object is not there (old IE versions will still not intercept ajax calls though)

this is the complete fix for the code submitted in #13636 (the fix in https://github.com/symfony/symfony/pull/13684 was incomplete).

Commits
-------

b7aa171 Fix the toolbar JS for IE
2015-02-24 09:23:43 +01:00
Fabien Potencier
075002a29a minor #13754 [PropertyAccess] unify and fix doc (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[PropertyAccess] unify and fix doc

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | -

Commits
-------

d1c8c5d [PropertyAccess] unify and fix doc
2015-02-24 09:20:19 +01:00
Nicolas Grekas
323e957b37 [Debug] Deprecations exception for Symfony internals 2015-02-23 16:12:01 +01:00
Fabien Potencier
c0dcbed7a5 minor #13755 [Console] assertion for ArgvInput::getFirstArgument() with no arguments (nanocom)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] assertion for ArgvInput::getFirstArgument() with no arguments

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| License       | MIT

Commits
-------

11b2a9b [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
2015-02-23 12:51:48 +01:00
Fabien Potencier
4fd9792d02 minor #13758 [PhpUnitBridge] Tweak and fix deprecation notices (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PhpUnitBridge] Tweak and fix deprecation notices

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

4ef3610 [PhpUnitBridge] Tweak and fix deprecation notices
2015-02-22 12:50:58 +01:00
Nicolas Grekas
4ef3610d78 [PhpUnitBridge] Tweak and fix deprecation notices 2015-02-22 12:48:16 +01:00
Fabien Potencier
346f347aff Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] move Routing dep up to make tests pass

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-02-22 12:46:06 +01:00
Fabien Potencier
51a22406a7 minor #13753 [FrameworkBundle] move Routing dep up to make tests pass (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] move Routing dep up to make tests pass

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Ping @Tobion

Commits
-------

c71e2d5 [FrameworkBundle] move Routing dep up to make tests pass
2015-02-22 12:43:34 +01:00
Arnaud Kleinpeter
11b2a9bfde [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments 2015-02-21 18:28:56 +01:00
Tobias Schultze
d1c8c5d22f [PropertyAccess] unify and fix doc 2015-02-21 16:36:02 +01:00
Nicolas Grekas
c71e2d529d [FrameworkBundle] move Routing dep up to make tests pass 2015-02-21 15:54:50 +01:00
Tobias Schultze
bbd4a1e2ce Merge branch '2.6' into 2.7
Conflicts:
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2015-02-21 14:05:27 +01:00
Tobias Schultze
f9ddaebe09 [PropertyAccess] use data provider for isReadable/isWritable tests 2015-02-21 13:54:33 +01:00
Tobias Schultze
eabad39dd5 Merge branch '2.3' into 2.6
Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
2015-02-21 13:49:08 +01:00
Fabien Potencier
9a4f3e134b feature #13398 [PhpUnit] new PhpUnit bridge (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PhpUnit] new PhpUnit bridge

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13644
| License       | MIT
| Doc PR        | -

From the proposed README:

PHPUnit Bridge
==============

Provides utilities for PHPUnit, especially user deprecation notices management.

It comes with the following features:

 * disable the garbage collector;
 * auto-register `class_exists` to load Doctrine annotations;
 * print a user deprecation notices summary at the end of the test suite.

Handling user deprecation notices is sensitive to the SYMFONY_DEPRECATIONS_HELPER
environment variable. This env var configures 3 behaviors depending on its value:

 * when set to `strict`, all but legacy-tagged deprecation notices will make tests
   fail. This is the recommended mode for best forward compatibility.
 * `weak` on the contrary will make tests ignore all deprecation notices.
   This is the recommended mode for legacy projects that must use deprecated
   interfaces for backward compatibility reasons.
 * any other value will respect the current error reporting level.

All three modes will display a summary of deprecation notices at the end of the
test suite, split in two groups:

 * **Legacy** deprecation notices denote tests that explicitly test some legacy
   interfaces. In all 3 modes, deprecation notices triggered in a legacy-tagged
   test do never make a test fail. There are four ways to mark a test as legacy:
    - make its class start with the `Legacy` prefix;
    - make its method start with `testLegacy`;
    - make its data provider start with `provideLegacy` or `getLegacy`;
    - add the `@group legacy` annotation to its class or method.
 * **Remaining/Other** deprecation notices are all other (non-legacy)
   notices, grouped by message, test class and method.

Usage
-----

Add this bridge to the `require-dev` section of your composer.json file
(not in `require`) with e.g.
`composer require --dev "symfony/phpunit-bridge"`.

When running `phpunit`, you will see a summary of deprecation notices at the end
of the test suite.

Deprecation notices in the **Remaining/Other** section need some thought.
You have to decide either to:

 * update your code to not use deprecated interfaces anymore, thus gaining better
   forward compatibility;
 * or move them to the **Legacy** section (by using one of the above way).

After reviewing them, you should silence deprecations in the **Legacy** section
if you think they are triggered by tests dedicated to testing deprecated
interfaces. To do so, add the following line at the beginning of your legacy
test case or in the `setUp()` method of your legacy test class:
`$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`

Last but not least, you should then configure your C.I. to the reporting mode
that is appropriated to your project by setting SYMFONY_DEPRECATIONS_HELPER to
`strict`, `weak` or empty. It is recommended to start with `weak` mode, upgrade
your code as described above, then when the *Remaining/Other* sections are empty,
move to `strict` to keep forward compatibility on the long run.

Commits
-------

acac734 [PhpUnitBridge] new bridge for testing with PHPUnit
2015-02-21 09:37:54 +01:00
Fabien Potencier
2d6fbc5984 minor #13738 [Security] Fix expectation in a test. (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security] Fix expectation in a test.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This is related to #13466, which worked perfectly fine in 2.3. It breaks in 2.6 since we've changed the way we check for master request.

Commits
-------

8299a44 [Security] Fix expectation in a test.
2015-02-21 09:14:03 +01:00
Guilherme Blanco
a10844587b Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder). 2015-02-21 09:10:28 +01:00
Fabien Potencier
7b9bc804e7 minor #13742 [PropertyAccess] refactor type checks (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] refactor type checks

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | -

#13735 for 2.3

Commits
-------

9cacecb [PropertyAccess] the property path constructor already implements the type check
4e11c07 [PropertyAccess] refactor type checks to remove duplicate logic
2015-02-21 09:06:16 +01:00