Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: symfony/symfony
...
head fork: symfony/symfony
Checking mergeability… Don't worry, you can still create the pull request.
Commits on May 16, 2011
@realmfoo realmfoo Calling supportsClass from vote to find out if we can vote 8519967
Commits on Jul 27, 2011
@heccjj heccjj Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/vali…
…dators.cn.xliff via GitHub
057cf2f
@yethee yethee [FrameworkBundle] Fixed the Chinese translations by @heccjj
Merge remote-tracking branch 'heccjj/patch-1' into cn_translations
62da90a
@yethee yethee [FrameworkBundle] Renamed validators.cn.xliff to validators.zh_CN.xliff e16ddcf
Commits on Jul 28, 2011
@mbontemps mbontemps Fix french spelling 377128e
@mbontemps mbontemps Add a french translation c43aba9
@asm89 asm89 [HttpFoundation] Fixed incorrect ServerBag comment cbbdceb
@mdavis1982 mdavis1982 Patched src/Symfony/Component/Form/Extension/Core/DataTransformer/Dat…
…eTimeToArrayTransformer.php to throw an exception when an invalid date is passed for transformation (e.g. 31st February)
df74f49
@stloyd stloyd [Form] Test covered fix for invalid date (13 month/31.02.2011 etc.) s…
…end to transformer. Closes #1755
d880db2
@yethee yethee [FrameworkBundle] Updated the Chinese translations by @heccjj cf598de
Commits on Jul 29, 2011
@fabpot fabpot merged branch yethee/cn_translations (PR #1853)
Commits
-------

cf598de [FrameworkBundle] Updated the Chinese translations by @heccjj
e16ddcf [FrameworkBundle] Renamed validators.cn.xliff to validators.zh_CN.xliff
62da90a [FrameworkBundle] Fixed the Chinese translations by @heccjj
057cf2f Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cn.xliff via GitHub

Discussion
----------

[FrameworkBundle] Updated the Chinese translations
34eb972
@fabpot fabpot merged branch mbontemps/spelling (PR #1847)
Commits
-------

377128e Fix french spelling

Discussion
----------

Fix french spelling
100eaf1
@fabpot fabpot merged branch mbontemps/translation (PR #1848)
Commits
-------

c43aba9 Add a french translation

Discussion
----------

Add a french translation
c639d8d
@fabpot fabpot merged branch asm89/master (PR #1849)
Commits
-------

cbbdceb [HttpFoundation] Fixed incorrect ServerBag comment

Discussion
----------

[HttpFoundation] Fixed incorrect ServerBag comment

.
5b5dc45
@weaverryan weaverryan Making the english smoother in command help description b8ee401
hirocaster updated translation of UPDATE file (Japanese RC5 added) ca41f8f
@ornicar ornicar [SwiftmailerBundle] Allow non-file spools
Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.
ee5b9ce
Commits on Jul 31, 2011
@Seldaek Seldaek [ClassLoader] Improve exception messages of the debug class loader c0571fc
Commits on Aug 01, 2011
@michelsalib michelsalib -- fix use of STDIN 1087792
Commits on Aug 02, 2011
@fabpot fabpot merged branch michelsalib/patch-1 (PR #1877)
Commits
-------

1087792 -- fix use of STDIN

Discussion
----------

Fix use of STDIN

As seen here : 07298ac#commitcomment-505409. The use of STDIN can be confluctual on some specific cases.
efba810
@fabpot fabpot merged branch Seldaek/ucl_exception (PR #1825)
Commits
-------

c0571fc [ClassLoader] Improve exception messages of the debug class loader

Discussion
----------

[ClassLoader] Improve exception messages of the debug class loader

---------------------------------------------------------------------------

by Seldaek at 2011/07/31 14:01:40 -0700

Ok, I updated this to just clarify the message, because when I got the issue after some serious copy-paste coding, I thought it was quite confusing - it seems to imply you mistyped the class name when using the class, and therefore it was not found, while the typo is in the class's file itself.
b463646
@fabpot fabpot merged branch hirocaster/japanese (PR #1867)
Commits
-------

ca41f8f updated translation of UPDATE file (Japanese RC5 added)

Discussion
----------

updated translation of UPDATE file (Japanese RC5 added)

translate added UPDATE.md
0bde3fa
@fabpot fabpot merged branch weaverryan/patch-1 (PR #1865)
Commits
-------

b8ee401 Making the english smoother in command help description

Discussion
----------

Making the english smoother in command help description

Pretty simple :)

Thanks!
e136718
@cordoval cordoval $node->hasAttribute('disabled') sf2 should not create disagreement be…
…tween implementation and practice for a crawler. If sahi real browser can find an element that is disabled, then sf2 should too.

https://github.com/Behat/Mink/pull/58#issuecomment-1712459
8a980bd
Commits on Aug 03, 2011
@gimler gimler fix https default port check 86f888f
Commits on Aug 04, 2011
@mvrhov mvrhov Fixed: Notice: Undefined index: enable_annotations in ... e78bc32
Commits on Aug 07, 2011
@hidenorigoto hidenorigoto [Validator] changed 'self' to 'static' for child class to override pa…
…ttern constant
275da0d
@stloyd stloyd [Console] Fix fixtures from failing tests 9f66263
@weaverryan weaverryan [DoctrineBundle] Adding a message in doctrine:generate:entities to no…
…tify people when a backup file is created
ba6a09d
@weaverryan weaverryan [FrameworkBundle] Adding information about exactly which cache is bei…
…ng cleared.
6738d2b
Commits on Aug 08, 2011
@fabpot fabpot [HttpKernel] fixed ControllerResolver when the controller is a class …
…name with an __invoke() method
be031f5
@fabpot fabpot [HttpKernel] made a small internal refactoring to ease extensibility 54999ef
@fabpot fabpot merged branch weaverryan/cache_clear_env_info (PR #1921)
Commits
-------

6738d2b [FrameworkBundle] Adding information about exactly which cache is being cleared.

Discussion
----------

[FrameworkBundle] Adding information about env being cleared

Hey guys!

I think the `cache:clear` confuses some people - they're expecting it to wipe out any and all cache (not just the cache for a specific env+debug mode). So, this adds details on *what* is being cleared, which should at least help.

I'll also put more information into the docs.

Thanks!

---------------------------------------------------------------------------

by jmikola at 2011/08/07 18:48:48 -0700

:+1: on dumping the environment at output. Does the debug option mean anything in this context, though?

---------------------------------------------------------------------------

by weaverryan at 2011/08/07 19:57:18 -0700

I can't think of a spot where it makes a difference, but of course it *could* theoretically make a difference. The command's "help" message seems to indicate that it should be treated like there's a difference, so I followed suit.

But yes, environment is the big concern, hopefully nobody gets too hung up on the debug - one of those things where I think we technically need it, but practically don't.

---------------------------------------------------------------------------

by brikou at 2011/08/08 00:44:00 -0700

@weaverryan it would also be interesting to display the env used also for router:debug and probably other commands

---------------------------------------------------------------------------

by stof at 2011/08/08 01:13:58 -0700

@weaverryan It does make a difference when warùing up the cache (which is done by default when clearing it): many service definitions change according to the debug flag, so dumping the debug container seems a weird idea (the first request will need to dump the non-debug container as they have different names). But bigger issue: some cache warmer depend of the debug state (the Doctrine one IIRC) so the warming-up would do weird things if you run the prod CLI in debug mode.
06517b9
@fabpot fabpot merged branch weaverryan/doctrine_generate_entities_output (PR #1920)
Commits
-------

ba6a09d [DoctrineBundle] Adding a message in doctrine:generate:entities to notify people when a backup file is created

Discussion
----------

[DoctrineBundle] Adding a message in doctrine:generate:entities to notify

Hey guys!

This adds a message to the doctrine:generate:entities command when a backup file is created. This is because the backup file causes confusion in some cases (where did it come from?) and in rare cases - for reasons I don't know yet - the backup file causes "Cannot redeclare class ..." errors.

This is a not a BC-break, but of course could potentially cause an issue if there's some edge case that line 112 doesn't consider. For that reason, I'm pulling against master instead of 2.0.

Thanks!
860ae77
@fabpot fabpot merged branch stloyd/console_fixtures (PR #1915)
Commits
-------

9f66263 [Console] Fix fixtures from failing tests

Discussion
----------

[Console] Fix fixtures from failing tests
9fd6b3c
@fabpot fabpot merged branch mvrhov/patch-1 (PR #1902)
Commits
-------

e78bc32 Fixed: Notice: Undefined index: enable_annotations in ...

Discussion
----------

Fixed: Notice: Undefined index: enable_annotations in ...

---------------------------------------------------------------------------

by stloyd at 2011/08/04 03:57:49 -0700

IMO `isset()` should be good enough here.

---------------------------------------------------------------------------

by stof at 2011/08/04 04:18:20 -0700

I don't see how such a notice could occur. There is a default value for this node so as soon as the validation node exists, there will be a value for this node. Could you give an example of configuration that causes the notice ?

---------------------------------------------------------------------------

by mvrhov at 2011/08/04 04:23:33 -0700

I don't have any validation node set up in my config in such a case it seems that sub nodes doesn't get build. So it seems that I found a bug in config builder.

---------------------------------------------------------------------------

by stof at 2011/08/04 04:54:05 -0700

This is in fact due to a hackish stuff in the DI extension. It changes the configuration after using the Config component to merge them in the case where you enable the forms without enabling the validator, to force enabling it.
db713ea
@Gregwar Gregwar [Various] Fixed errors on PHPDocs exception names (TransformationFail…
…edException)
a1810d6
Commits on Aug 09, 2011
@fabpot fabpot merged branch Gregwar/master (PR #1923)
Commits
-------

a1810d6 [Various] Fixed errors on PHPDocs exception names (TransformationFailedException)

Discussion
----------

[Various] Fixed errors on PHPDocs exception names (TransformationFailedException)

[Various] Fixed errors on PHPDocs exception names (TransformationFailedException)
4499d24
Commits on Aug 10, 2011
@realmfoo realmfoo merge from master f0a6ee5
@realmfoo realmfoo expanded namespaces within phpdoc (special for PhpStorm) 6e7439e
@realmfoo realmfoo The trace argument value could be string ("*DEEP NESTED ARRAY*") 4f9d229
@patashnik patashnik [DomCrawler] fix finding charset in addContent 81fb8e1
@hhamon hhamon [Validator] fixed phpdoc. d7c93ca
@martinmayer martinmayer [HttpFoundation] Do not save session in Session::__destroy() when sav…
…ed already
34a1b53
Commits on Aug 11, 2011
@Taluu Taluu got an if-condition out of unnecessary loops in Symfony\Component\Cla…
…ssLoader\UniversalClassLoader
7ec533e
Commits on Aug 12, 2011
@oncletom oncletom Added $format in serialize() method, to keep consistence and give a h…
…int to the normalizer.
ae55a98
Commits on Aug 13, 2011
@fabpot fabpot merged branch Taluu/patch-1 (PR #1942)
Commits
-------

7ec533e got an if-condition out of unnecessary loops in Symfony\Component\ClassLoader\UniversalClassLoader

Discussion
----------

[ClassLoader] Optimization: conditions that do not belong in some loops

Why are these foreachs outside the condition of verification of the namespace?

Should not it be better that the conditions are outside of these foreachs, since these conditions will always return the same result for any item covered by these foreachs?

Cheers
4dd599c
@fabpot fabpot [ClassLoader] fixed CS 7f3b6ba
@fabpot fabpot merged branch hhamon/validator_phpdoc_typo (PR #1936)
Commits
-------

d7c93ca [Validator] fixed phpdoc.

Discussion
----------

[Validator] fixed phpdoc.
6fd9b62
@fabpot fabpot merged branch patashnik/dom_crawler_charset (PR #1933)
Commits
-------

81fb8e1 [DomCrawler] fix finding charset in addContent

Discussion
----------

[DomCrawler] fix finding charset in addContent

According to http://www.ietf.org/rfc/rfc2045.txt content type can include other field after charset. So they should be cut.
ec529fb
@fabpot fabpot merged branch oncletom/patch-1 (PR #1947)
Commits
-------

ae55a98 Added $format in serialize() method, to keep consistence and give a hint to the normalizer.

Discussion
----------

Added $format in serialize() method, to keep consistence and give a hint

Added $format in serialize() method, to keep consistence and give a hint to the normalizer.

---------------------------------------------------------------------------

by Seldaek at 2011/08/12 02:06:19 -0700

:+1:
81c82fe
@fabpot fabpot merged branch realmfoo/master (PR #1932)
Commits
-------

4f9d229 The trace argument value could be string ("*DEEP NESTED ARRAY*")
6e7439e expanded namespaces within phpdoc (special for PhpStorm)
f0a6ee5 merge from master
8519967 Calling supportsClass from vote to find out if we can vote

Discussion
----------

The trace argument of an exception can be string (*DEEP NESTED ARRAY*) but with an array type specified

It leads to the exception of a foreach loop:

Invalid argument supplied for foreach() /.../vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php:103
941d05b
@fabpot fabpot merged branch gimler/master (PR #1894)
Commits
-------

86f888f fix https default port check

Discussion
----------

fix https default port check

---------------------------------------------------------------------------

by Abhoryo at 2011/08/03 03:26:15 -0700

I think it's better to delete $httpsPort variable from the prototype and use only $httpPort variable.

public function urlRedirectAction($path, $permanent = false, $scheme = null, $httpPort = 80)
...
        $port = '';
        if (('http' === $scheme && 80 != $httpPort)  || ('https' === $scheme && 443 != $httpPort)) {
            $port = ':'.$httpPort;
        }

But if this method is already used with the $httpsPort variable elsewhere, your change is ok with me.

---------------------------------------------------------------------------

by gimler at 2011/08/03 04:52:08 -0700

You can use different ports for http and https so when you call the function $scheme = null than it use the $request->getScheme() so you must add both ports so i think it is not a good idea to merge the http and https vars.

---------------------------------------------------------------------------

by gimler at 2011/08/03 04:53:17 -0700

damn sorry i have accidentally close the pull request ;(

---------------------------------------------------------------------------

by stof at 2011/08/03 05:13:24 -0700

I agree with @gimler. Merging them as a single parameter does not make sense here

---------------------------------------------------------------------------

by Abhoryo at 2011/08/03 05:33:12 -0700

I've juste think it's weird to set a useless parameter ($httpPort) when you want to use the last parameter ($httpsPort).
And I don't think someone want http protocole on 433 or https on 80 ?

---------------------------------------------------------------------------

by stof at 2011/08/03 05:35:16 -0700

@Abhoryo what if you are using this controller in a general way, without knowing by advance if the handled request is a secure one ? You need both parameters.
If you need to change the https port by keeping the default http port, you indeed need to pass it but blame PHP: it does not support named parameters.

---------------------------------------------------------------------------

by Abhoryo at 2011/08/03 06:02:18 -0700

Ok, right.
ef9439d
@fabpot fabpot merged branch ornicar/swiftmailerNonFileSpool (PR #1868)
Commits
-------

ee5b9ce [SwiftmailerBundle] Allow non-file spools

Discussion
----------

[SwiftmailerBundle] Allow non-file spools

Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.

---------------------------------------------------------------------------

by cystbear at 2011/07/29 16:36:04 -0700

Nice catch Thibault.
0ad6e42
@aboks aboks [Security] Fixed incorrect merge of two modifications (53f5c23 and 85…
…19967) to AclVoter
09c41d3
@pylebecq pylebecq [Form] Fixed a typo in AbstractType phpdoc e88ecbb
@lenar lenar Remove Content-Length header adding for now. Fixes #1846. 805a267
@fabpot fabpot merged branch lenar/content-length (PR #1955)
Commits
-------

805a267 Remove Content-Length header adding for now. Fixes #1846.

Discussion
----------

[HttpFoundation] Remove Content-Length header adding for now. Fixes #1846.
d036fec
@fabpot fabpot Revert "expanded namespaces within phpdoc (special for PhpStorm)"
This reverts commit 6e7439e.
283097d
@Abhoryo Abhoryo Search in others user providers when a user is not found in the first…
… user provider and throws the right exception.
3a64b08
@Abhoryo Abhoryo CS e9d2a67
Commits on Aug 14, 2011
@fabpot fabpot merged branch aboks/acl_voter (PR #1954)
Commits
-------

09c41d3 [Security] Fixed incorrect merge of two modifications (53f5c23 and 8519967) to AclVoter

Discussion
----------

[Security] Fixed incorrect merge of two modifications to AclVoter

It seems two modifications to `AclVoter` (53f5c23 and 8519967) have been merged incorrectly, leading to a method call on an object that is known to be `null` and a fatal error when running the tests
5d4b8a7
@fabpot fabpot [HttpFoundation] fixed a unit tests 0b5d87d
@krmcbride krmcbride [Form] Fixed a few PHPDoc comments e3cb39d
@fabpot fabpot merged branch pylebecq/master (PR #1958)
Commits
-------

e88ecbb [Form] Fixed a typo in AbstractType phpdoc

Discussion
----------

[Form] Fixed a typo in AbstractType phpdoc

This PR is a new version of PR #1862.

Original comment :
Hi,
Nothing really awesome, but I fixed a typo in some phpdoc of the AbstractType class.
3622691
@fabpot fabpot merged branch krmcbride/form-doc-fixes (PR #1959)
Commits
-------

e3cb39d [Form] Fixed a few PHPDoc comments

Discussion
----------

[Form] Fixed a few PHPDoc comments
d1ad47c
Commits on Aug 16, 2011
Grégoire Passault [Fix] Email() constraints now guess as 'email' field type 80d1718
Commits on Aug 18, 2011
@schmittjoh schmittjoh increased visibility of httpUtils property 3dcb238
@vicb vicb [SecurityBundle] Fix autoloading in tests (autoload.php overrides aut…
…oload.php.dist when it exists)
1515912
@vicb vicb [HttpKernel] Simplify test code 1518a81
@fabpot fabpot merged branch vicb/SecurityBundle/Tests/autoload (PR #1979)
Commits
-------

1515912 [SecurityBundle] Fix autoloading in tests (autoload.php overrides autoload.php.dist when it exists)

Discussion
----------

[SecurityBundle] Fix autoloading in tests

autoload.php should override autoload.php.dist when it exists
b24251a
@fabpot fabpot merged branch vicb/HttpKernel/Tests (PR #1978)
Commits
-------

1518a81 [HttpKernel] Simplify test code

Discussion
----------

[HttpKernel] Simplify test code

Get the `$request` from the client (removes a hack in test kernel)
edcb6ca
@schmittjoh schmittjoh fixes a bug when overriding method via the X-HTTP-METHOD-OVERRIDE header b6ee1a6
@schmittjoh schmittjoh updated tests a1d9fed
@lsmith77 lsmith77 added more tests for Request::createFromGlobals() 8c9ccf6
@fabpot fabpot merged branch lsmith77/create_from_globals_tests (PR #1983)
Commits
-------

8c9ccf6 added more tests for Request::createFromGlobals()

Discussion
----------

added more tests for Request::createFromGlobals()
46bbfff
Commits on Aug 19, 2011
@stloyd stloyd [FrameworkBundle] Cleanup schema file 6e7c375
@fabpot fabpot merged branch stloyd/patch-1 (PR #1988)
Commits
-------

6e7c375 [FrameworkBundle] Cleanup schema file

Discussion
----------

[FrameworkBundle] Cleanup schema file a bit

Removed unused attributes, and added one missing.
6a90a78
@fabpot fabpot merged branch Gregwar/email_guessing (PR #1970)
Commits
-------

80d1718 [Fix] Email() constraints now guess as 'email' field type

Discussion
----------

[Fix] Email() constraints now guess as 'email' field type

I don't know what this was set to "text"
e7ec02f
@fabpot fabpot merged branch hidenorigoto/validator_pattern_late_static_bind (PR #1914)
Commits
-------

275da0d [Validator] changed 'self' to 'static' for child class to override pattern constant

Discussion
----------

[Validator] change 'self::' to 'static::' for PATTERN constant overridable in child classes

In TimeValidator and UrlValidator, PATTERN constant is not used with late static bind(static::) while DateValidator supports it.
ea800c2
@fabpot fabpot merged branch schmittjoh/requestMethodOverrideFix (PR #1980)
Commits
-------

a1d9fed updated tests
b6ee1a6 fixes a bug when overriding method via the X-HTTP-METHOD-OVERRIDE header

Discussion
----------

Request method override fix
95719e7
@fabpot fabpot merged branch schmittjoh/visibilityChange (PR #1977)
Commits
-------

3dcb238 increased visibility of httpUtils property

Discussion
----------

increased visibility of httpUtils property
88b1dd7
@fabpot fabpot merged branch martinmayer/session_saving (PR #1937)
Commits
-------

34a1b53 [HttpFoundation] Do not save session in Session::__destroy() when saved already

Discussion
----------

[HttpFoundation] Saving session data in __destroy() has a side effect on functional tests

Having functional test with several non-insulated requests, TestSessionListener invokes session saving at the end of every request. But instance of Session remains in memory until it's collected by garbage collector which saves the same data again in __destroy() method. The problem is that session object can get collected after other requests changed session data (e. g. user logged in) resulting in former data overwriting the latter.
a5ccda4
@fabpot fabpot merged branch stloyd/form_datetime_transformer (PR #1851)
Commits
-------

d880db2 [Form] Test covered fix for invalid date (13 month/31.02.2011 etc.) send to transformer. Closes #1755
df74f49 Patched src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php to throw an exception when an invalid date is passed for transformation (e.g. 31st February)

Discussion
----------

[Form] Fix for "DateTimeToArrayTransformer" with invalid dates

Hey,

this is test covered fix from @mdavis1982 (closes #1755)

---------------------------------------------------------------------------

by stloyd at 2011/08/16 01:31:32 -0700

@fabpot Can we have this fix merged ?
b66eb4d
Commits on Aug 20, 2011
@jayrulez jayrulez Cleaned up unused code in Symfony\Component\EventDispatcher\EventDisp…
…atcher::getListeners()
72d71b5
Commits on Aug 21, 2011
@fabpot fabpot merged branch jayrulez/master (PR #1996)
Commits
-------

72d71b5 Cleaned up unused code in Symfony\Component\EventDispatcher\EventDispatcher::getListeners()

Discussion
----------

Cleaned up unused code

Cleaned up unused code in Symfony\Component\EventDispatcher\EventDispatcher::getListeners()
8c5b6aa
@igorw igorw [EventDispatcher] Change the license of EventDispatcher from LGPL to MIT
It was previously agreed to re-license the Doctrine2 based
EventDispatcher refactoring to use the MIT license. However, the files
still retain the LGPL license notice.

This commit changes the license to MIT.
8d48cea
Commits on Aug 22, 2011
@fabpot fabpot [Yaml] made a small optimization 12a852e
@stloyd stloyd [Form] Fix for treatment zero as empty data. Closes #1986 c29fa9d
@stloyd stloyd [Tests] Added missing test for NumberType 933c5aa
@fabpot fabpot merged branch stloyd/numbertype_test (PR #2001)
Commits
-------

933c5aa [Tests] Added missing test for NumberType

Discussion
----------

[Tests] Added missing test for NumberType
397ffd5
@fabpot fabpot merged branch igorw/eventdispatcher-license (PR #1997)
Commits
-------

8d48cea [EventDispatcher] Change the license of EventDispatcher from LGPL to MIT

Discussion
----------

[EventDispatcher] Change the license of EventDispatcher from LGPL to MIT

It was previously agreed to re-license the Doctrine2 based
EventDispatcher refactoring to use the MIT license. However, the files
still retain the LGPL license notice.

This commit changes the license to MIT.

---------------------------------------------------------------------------

by fabpot at 2011/08/21 05:55:00 -0700

That's right but I would prefer that the PR comes from someone of the Doctrine core team like @beberlei or @jwage.

---------------------------------------------------------------------------

by fabpot at 2011/08/21 05:55:28 -0700

or at least, they can perhaps acknowledge this PR.

---------------------------------------------------------------------------

by beberlei at 2011/08/22 00:11:20 -0700

Acknowledged
274eff0
@hidenorigoto hidenorigoto [FrameworkBundle] changed resource filename of Japanese validator tra…
…nslation
bc7edfe
@fabpot fabpot merged branch hidenorigoto/master (PR #2003)
Commits
-------

bc7edfe [FrameworkBundle] changed resource filename of Japanese validator translation

Discussion
----------

[FrameworkBundle] change resource filename of Japanese validator translation

The country code of the translation resource file should be short notation because the long notation fallbacks to it.
a8808be
@weaverryan weaverryan [Form] Fixing a bug where setting empty_value to false caused a varia…
…ble to not be found
fdd2e7a
@fabpot fabpot merged branch weaverryan/form_choice_missing_variable (PR #2005)
Commits
-------

fdd2e7a [Form] Fixing a bug where setting empty_value to false caused a variable to not be found

Discussion
----------

[Form] Fixing a bug where setting empty_value to false caused a variable

Hey guys!

I think was an edge case that was overlooked. In this one case, the `$emptyValue` variable is never set. It causes warnings, but there should be no behavior change since the missing variable is being set to `null`.

Thanks!
1fa6fa2
@fabpot fabpot [Form] added missing DelegatingValidator registration in the Form Ext…
…ension class (used when using the Form component outside a Symfony2 project where the validation.xml is used instead)
2b1bb2c
Commits on Aug 23, 2011
@fabpot fabpot merged branch stloyd/issue_1986 (PR #2000)
Commits
-------

c29fa9d [Form] Fix for treatment zero as empty data. Closes #1986

Discussion
----------

[Form] Fix for treatment zero as empty data. Closes #1986

For more info please read #1986.
0b53193
@fabpot fabpot merged branch Abhoryo/patch-1 (PR #1956)
Commits
-------

e9d2a67 CS
3a64b08 Search in others user providers when a user is not found in the first user provider and throws the right exception.

Discussion
----------

Chain user provider doesn't search in all user providers

I commit these changes because Chain user provider doesn't search in all user providers.

Example with the Acme/DemoBundle:

    // security.yml
    ...
        providers:
            chain_provider:
                providers: [in_memory, in_memory_extend]
            in_memory_extend:
                users:
                    admin2: { password: adminpass2, roles: [ 'ROLE_ADMIN' ] }
            in_memory:
                users:
                    user:  { password: userpass, roles: [ 'ROLE_USER' ] }
    ...
        firewalls:
    ...
            secured_area:
                pattern:    ^/demo/secured/
                provider: chain_provider OR in_memory_extend
    ...

We can see these logs :

    security.INFO: User "admin2" has been authenticated successfully [] []
    security.DEBUG: Write SecurityContext in the session [] []
    security.DEBUG: Read SecurityContext from the session [] []
    security.DEBUG: Reloading user from user provider. [] []
    security.WARNING: Username "admin2" could not be found. [] []

The new code search in others user providers when a user is not found in the first user provider and throws the right exception.

---------------------------------------------------------------------------

by lsmith77 at 2011/08/14 12:20:04 -0700

I wonder if it should be a provider option to continue on a failed user lookup. I can see cases where you really dont want to iterate over all providers and others where you do.

---------------------------------------------------------------------------

by Abhoryo at 2011/08/14 17:27:16 -0700

If someone need a provider like you describe, he can create one.
Here we talk about a chain user provider.

Doc : [using-multiple-user-providers](http://symfony.com/doc/current/book/security.html#using-multiple-user-providers)

We can read in the doc: "The chain_provider will, in turn, try to load the user from both the in_memory and user_db providers."
But its not the case right now.
1bb53b8
@fabpot fabpot [Security] added a unit test for previous merge 277d75b
@fabpot fabpot merged branch cordoval/patch-1 (PR #1890)
Commits
-------

8a980bd $node->hasAttribute('disabled') sf2 should not create disagreement between implementation and practice for a crawler. If sahi real browser can find an element that is disabled, then sf2 should too. https://github.com/Behat/Mink/pull/58#issuecomment-1712459

Discussion
----------

$node->hasAttribute('disabled') sf2 should not create disagreement betwee

$node->hasAttribute('disabled') sf2 should not create disagreement between implementation and practice for a crawler. If sahi real browser can find an element that is disabled, then sf2 should too.
https://github.com/Behat/Mink/pull/58#issuecomment-1712459

---------------------------------------------------------------------------

by cordoval at 2011/08/09 20:34:56 -0700

@fabpot please let me know if this is going to be in sometime soon or not, just wondering why it is deviating ...

---------------------------------------------------------------------------

by fabpot at 2011/08/23 01:11:42 -0700

I have just checked in a browser and the Symfony2 implementation is actually the right one.

Try this in a browser:

    <form action='#' method="post">
        <input name="foo" disabled="disabled" value="foo" />
        <input name="bar" value="bar" />

        <input type="submit" />
    </form>

    <?php

    print_r($_POST);

    // output: Array ( [bar] => bar ) when the form is submitted

And here is the discussion about it in the HTML4 spec: http://www.w3.org/TR/html4/interact/forms.html#h-17.12:

"In this example, the INPUT element is disabled. Therefore, it cannot receive user input nor will its value be submitted with the form."

And the same is tru for HTML5: http://www.w3.org/TR/html5/association-of-controls-and-forms.html#constructing-form-data-set

---------------------------------------------------------------------------

by cordoval at 2011/08/23 01:29:53 -0700

@fabpot I guess you got my scenario wrong. I am not trying to submit any form. I am just happen to have a disabled box that is checked and I want to read with the DOM Crawler that is checked. Not to submit or anything but for the purposes of testing.

Please consider also that this request comes from asserting values using behat mink, mink is fully dependent on sf2 driver for when it is used except it is told to use a different driver like a real browser like sahi. When testing in chrome and firefox, the verification with the DOM is made that the disabled box is checked properly. Symfony2 DOM Crawler however misses that spot for that use.

Even in the case where Symfony2 DOM Crawler component would have been thought not for this purpose of testing, or further for this particular scenario it would be good to make it more reusable for this kind of scenario.

Just saying....

---------------------------------------------------------------------------

by fabpot at 2011/08/23 02:00:34 -0700

Indeed, I didn't get your issue right. So, basically, all fields should be in the form, but the disabled field values should not be submitted (that makes sense).

I've prepared a fix in this patch: e885258 which is in the symfony/domcrawler-disabled-fields branch for now as I don't know if we can make this change in 2.0 or if we need to put it in 2.1.

---------------------------------------------------------------------------

by cordoval at 2011/08/23 02:15:01 -0700

oh no I was hoping to enter the authors, you already did the fix :'(
04a549b
@fabpot fabpot [DomCrawler] fixed disabled fields in forms (they are available in th…
…e DOM, but their values are not submitted -- whereas before, they were simply removed from the DOM)
3380f2a
@stloyd stloyd [WebProfiler] Use proper `Response` function to check is it an redire…
…ction
06162e7
@fabpot fabpot merged branch stloyd/patch-2 (PR #2010)
Commits
-------

06162e7 [WebProfiler] Use proper `Response` function to check is it an redirection

Discussion
----------

[WebProfiler] Use proper `Response` function

Use proper `Response::isRedirection()` function to check is it an redirection.
724d679
@fabpot fabpot merged branch danielholmes/patch-1 (PR #2008)
Commits
-------

e294211 [DomCrawler] Removed unused document property in Form

Discussion
----------

[DomCrawler] Removed unused document property in Form
1cf3cdd
@fabpot fabpot Merge branch 'domcrawler-disabled-fields'
* domcrawler-disabled-fields:
  [DomCrawler] fixed disabled fields in forms (they are available in the DOM, but their values are not submitted -- whereas before, they were simply removed from the DOM)
  $node->hasAttribute('disabled') sf2 should not create disagreement between implementation and practice for a crawler. If sahi real browser can find an element that is disabled, then sf2 should too. https://github.com/Behat/Mink/pull/58#issuecomment-1712459
0c6f47f
@jmikola jmikola [EventDispatcher] Fix removeSubscriber() to work with priority syntax 39fabab
@fabpot fabpot merged branch jmikola/remove-subscriber-with-priorities (PR #2014)
Commits
-------

39fabab [EventDispatcher] Fix removeSubscriber() to work with priority syntax

Discussion
----------

[EventDispatcher] Fix removeSubscriber() to work with priority syntax

Previously only addSubscriber() was being tested with priority syntax. This adds a unit test for removeSubscriber() and fixes a bug that would have caused it to fail.
9231f1d
Commits on Aug 24, 2011
@danielholmes danielholmes [DomCrawler] Removed unused document property in Form e294211
@fabpot fabpot added the 2.0.x CHANGELOG file 0805c9c
@fabpot fabpot tweaked CHANGELOG 755e0d4
@Seldaek Seldaek [WebProfilerBundle] Allow .html.twig in collector template names 6ca72cf
@Seldaek Seldaek [WebProfilerBundle] Throw exception if a collector template isn't found 89f477e
@fabpot fabpot [FrameworkBundle] fixed duplicated RequestContext instances d7f0789
@fabpot fabpot merged branch Seldaek/toolbar_debugging (PR #2019)
Commits
-------

89f477e [WebProfilerBundle] Throw exception if a collector template isn't found
6ca72cf [WebProfilerBundle] Allow .html.twig in collector template names

Discussion
----------

WDT debugging

While implementing collectors I did a mistake in the template name and it never told me, so I was left wondering why my stuff didn't show up. Not so nice IMO. Also the first commit is to allow template names to be specified fully. I don't see why this shouldn't be allowed, since it is the way you specify templates everywhere else.
8cdedd1
@fabpot fabpot fixed CS 0fc0f99
@fabpot fabpot [DoctrineBundle] removed an unused and confusing parameter (the conne…
…ction class can be changed via the wrapper_class setting of a connection)
536538f
@stloyd stloyd [ServerBag] Skip unnecessary loop in `getHeaders()` 542cfd6
@jmikola jmikola [FrameworkBundle] Avoid listener key conflicts in ContainerAwareEvent…
…Dispatcher

Since the key was previously concatenating service ID and method without a separator, it's possible that two different listeners could conflict (e.g. service/method pairs: foo/bar and fo/obar).
84c1719
Commits on Aug 25, 2011
@fabpot fabpot merged branch jmikola/ContainerAwareEventDispatcher-key-conflict (PR #…
…2022)

Commits
-------

84c1719 [FrameworkBundle] Avoid listener key conflicts in ContainerAwareEventDispatcher

Discussion
----------

[FrameworkBundle] Avoid listener key conflicts in ContainerAwareEventDispatcher

Since the key was previously concatenating service ID and method without a separator, it's possible that two different listeners could conflict (e.g. service/method pairs: foo/bar and fo/obar).
7f2c4ab
@fabpot fabpot merged branch stloyd/patch-4 (PR #2018)
Commits
-------

542cfd6 [ServerBag] Skip unnecessary loop in `getHeaders()`

Discussion
----------

[ServerBag] Skip unnecessary loop in `getHeaders()`
9112bed
@fabpot fabpot [HttpKernel] added a test for uploading a file via an array instead o…
…f an UploadedFile instance
a79f225
@fabpot fabpot [HttpFoundation] added a missing exception 1c7694f
Commits on Aug 26, 2011
@fabpot fabpot [HttpFoundation] changed \LogicException to \InvalidArgumentException 8f50592
@fabpot fabpot update CONTRIBUTORS for 2.0.1 194d2a7
@fabpot fabpot update VERSION for 2.0.1 f9ce68f
@fabpot fabpot updated CHANGELOG for 2.0.1 7275c88
@fabpot fabpot updated VENDORS for 2.0.1 7cb402d