Commit Graph

6830 Commits

Author SHA1 Message Date
Fabien Potencier
39339121d6 fixed HInclude renderer (closes #7113) 2013-02-19 08:24:52 +01:00
Christophe Coevoet
189fba6d0f Removed some leaking deprecation warning in the Form component
Fixes #7101
2013-02-19 08:14:41 +01:00
Fabien Potencier
95a8aa5af2 Merge branch '2.1' into 2.2
* 2.1:
  [Process] Fix regression introduced in #6620 / 880da01c49, fixes #7082
2013-02-18 22:28:10 +01:00
Fabien Potencier
6fb7904ba0 Merge branch '2.0' into 2.1
* 2.0:
  [Process] Fix regression introduced in #6620 / 880da01c49, fixes #7082
2013-02-18 22:27:57 +01:00
Jordi Boggiano
179cd58646 [Process] Fix regression introduced in #6620 / 880da01c49, fixes #7082 2013-02-17 20:36:49 +01:00
Fabien Potencier
ae2f424da7 merged branch fabpot/hinclude-tweak (PR #7096)
This PR was merged into the 2.2 branch.

Commits
-------

a313188 added a proper setter for the templating servicein HInclude

Discussion
----------

added a proper setter for the templating servicein HInclude

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

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

by stof at 2013-02-17T12:44:40Z

👍
2013-02-17 16:28:01 +01:00
Fabien Potencier
fc73d9f049 merged branch fabpot/request-create-fix (PR #7098)
This PR was merged into the 2.2 branch.

Commits
-------

738de9a [HttpKernel] added a unit for the previous commit (closes #7025)
d0e4b76 [HttpFoundation] fixed, overwritten CONTENT_TYPE

Discussion
----------

Fixed content type when passed as a server value

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

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

by stof at 2013-02-17T14:51:35Z

👍
2013-02-17 16:27:25 +01:00
Fabien Potencier
738de9a246 [HttpKernel] added a unit for the previous commit (closes #7025) 2013-02-17 14:09:02 +01:00
Fabien Potencier
0de369ae38 Merge branch '2.1' into 2.2
* 2.1:
  [FrameworkBundle] tweaked reference dumper command (see #7093)
  [HttpKernel] added some tests for previous merge
  Fix REMOTE_ADDR for cached subrequests
  [Process] Warn user with a useful message when tmpfile() failed

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
2013-02-17 14:00:38 +01:00
Martijn Evers
d0e4b7639c [HttpFoundation] fixed, overwritten CONTENT_TYPE 2013-02-17 13:55:26 +01:00
Fabien Potencier
5bf6d7e1b8 [BrowserKit] fixed test added in the previous merge (refs #7059) 2013-02-17 13:53:31 +01:00
Fabien Potencier
fc695f506f merged branch sstok/browserkit-client-http-auth (PR #7059)
This PR was merged into the 2.2 branch.

Commits
-------

b240d1f [BrowserKit] added a test to make sure HTTP authentication is preserved when submitting a form

Discussion
----------

[WIP]BrowserKit] added a test to make sure HTTP authentication is preserved

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

Since #6995 BrowseKit no longer seems to preserve the HTTP authentication when submitting a form. This PR adds a test to demonstrate the failure.

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

by vicb at 2013-02-13T12:49:16Z

Thanks. Could you add a "[WIP]" prefix to the PR tittle and set "bug fix" to "no" for now ?

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

by sstok at 2013-02-13T13:59:42Z

done 👍

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

by fabpot at 2013-02-17T12:49:35Z

This cannot be related to #6995 as your test does not involve any HttpFoundation classes.
2013-02-17 13:52:54 +01:00
Grzegorz Łukaszewicz
22aa8a6f66 Remove unnecessary comment and change test name 2013-02-17 13:47:50 +01:00
Fabien Potencier
8f570285d2 merged branch fabpot/error-handler (PR #7080)
This PR was merged into the 2.2 branch.

Commits
-------

cb319ac [HttpKernel] added error display suppression when using the ErrorHandler (if not, errors are displayed twice, refs #6254)

Discussion
----------

[HttpKernel] added error display suppression when using the ErrorHandler (if not, errors are displayed twice, refs #6254)

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

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

by bamarni at 2013-02-15T10:15:29Z

Are you sure this fixes the twice displaying issue? This is already done here : https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Kernel.php#L99

Fatal errors are displayed twice in some situations because this handler gets registered twice, and it registers 2 times the same shutdown callback, a few lines below your change.

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

by fabpot at 2013-02-15T10:21:39Z

No, I've closed this #6254 as this is an Assetic issue, not a Symfony one.
2013-02-17 13:29:13 +01:00
Gábor Egyed
609636e95e [Config] tweaked dumper to indent multi-line info 2013-02-17 13:27:42 +01:00
Fabien Potencier
98d57500f2 [HttpKernel] added some tests for previous merge 2013-02-17 12:42:57 +01:00
Michel Weimerskirch
0eff68f8c8 Fix REMOTE_ADDR for cached subrequests
Fixes #7091
2013-02-17 12:37:52 +01:00
Tobias Schultze
54d7d258c1 [HttpKernel] hinclude fragment renderer must escape URIs properly to return valid html 2013-02-15 22:21:39 +01:00
Fabien Potencier
cb319acb11 [HttpKernel] added error display suppression when using the ErrorHandler (if not, errors are displayed twice, refs #6254) 2013-02-15 08:54:09 +01:00
Fabien Potencier
5276a096a6 [HttpFoundation] tweaked previous merge 2013-02-15 08:36:52 +01:00
Fabien Potencier
d0e964a1ae merged branch dlsniper/small-http-foundation-enhancement (PR #6999)
This PR was squashed before being merged into the 2.2 branch (closes #6999).

Commits
-------

de0f7b7 [HttpFoundation] Added getter for httpMethodParameterOverride state

Discussion
----------

[HttpFoundation] Added getter for httpMethodParameterOverride state

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6984
| License       | MIT
| Doc PR        | ~
2013-02-15 08:33:56 +01:00
Florin Patan
de0f7b759f [HttpFoundation] Added getter for httpMethodParameterOverride state 2013-02-15 08:33:55 +01:00
Jānis Lukss
3473fc7ae4 Create validators.lv.xlf
Latvian translation of validators
2013-02-14 19:46:13 +01:00
Jordi Boggiano
5e8d844678 [Process] Warn user with a useful message when tmpfile() failed 2013-02-14 12:14:27 +01:00
Tobias Schultze
09920322ea [Translator] fix metadata
- fix '0' problem
- only access metadata when implementing interface
- refactor code
- clarify phpdoc
2013-02-14 10:33:29 +01:00
Tobias Schultze
3b71000a6d [Translator] fix typecast in transChoice 2013-02-14 09:39:27 +01:00
Tobias Schultze
88f98c93f6 [Translator] optimized adding of resources and saving a call to array_unique 2013-02-14 09:39:26 +01:00
Tobias Schultze
e88bf7b10f [Translator] fix phpdoc of MessageCatalogueInterface::add and ::replace 2013-02-14 09:39:14 +01:00
Tobias Schultze
c97ee8dd48 [Translator] mention that the message id may also be an object that can be cast to string in TranslatorInterface and fix the IdentityTranslator that did not respect this 2013-02-14 09:35:42 +01:00
Tobias Schultze
5a36b2d5da [Translator] fix MessageCatalogueInterface::getFallbackCatalogue that can return null
also use inheritdoc for the implementation
2013-02-14 09:35:41 +01:00
Sebastiaan Stok
b240d1f807 [BrowserKit] added a test to make sure HTTP authentication is preserved when submitting a form 2013-02-13 12:36:22 +01:00
Igor Wiedler
06c26dc7ed Remove array type hint from GetResponseForControllerResultEvent::setControllerResult() 2013-02-13 02:35:51 +01:00
Tobias Schultze
d1c34e87cb [Translator] coding style 2013-02-13 01:53:15 +01:00
Fabien Potencier
a4ac5e6374 bumped Symfony version to 2.2.0-DEV 2013-02-11 16:24:43 +01:00
Fabien Potencier
f410931dd8 Revert "merged branch povilas/issue_6101 (PR #6708)"
This reverts commit b2bcbbbd19, reversing
changes made to c5fcf0d0cc.
2013-02-11 13:46:49 +01:00
Fabien Potencier
95ba9449e2 Merge branch '2.1' into 2.2
* 2.1:
  [DependencyInjection] fixed tests (refs #7017)
2013-02-11 12:43:49 +01:00
Fabien Potencier
0209eb6c47 Merge branch '2.0' into 2.1
* 2.0:
  [DependencyInjection] fixed tests (refs #7017)
2013-02-11 12:42:49 +01:00
Fabien Potencier
d41fc8bb2d [DependencyInjection] fixed tests (refs #7017) 2013-02-11 12:41:22 +01:00
Fabien Potencier
743612bbbd Merge branch '2.1' into 2.2
* 2.1:
  added support for the X-Forwarded-For header (closes #6982, closes #7000)
  fixed the IP address in HttpCache when calling the backend
  [EventDispatcher] Added assertion.
  [EventDispathcer] Fix removeListener
  [DependencyInjection] Add clone for resources which were introduced in 2.1
  [DependencyInjection] Allow frozen containers to be dumped to graphviz
  Fix 'undefined index' error, when entering scope recursively
  [Security] fixed session creation on login (closes #7011)
  Add dot character `.` to legal mime subtype regular expression
  [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)
2013-02-11 12:26:43 +01:00
Fabien Potencier
33aca01611 Merge branch '2.0' into 2.1
* 2.0:
  [EventDispatcher] Added assertion.
  [EventDispathcer] Fix removeListener

Conflicts:
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
2013-02-11 12:26:14 +01:00
Martin Hasoň
f0afc2c009 Fixed XmlFileLoaderTest::testLoadThrowsExceptionWithInvalidFileEvenWithoutSchemaValidation 2013-02-11 12:24:47 +01:00
povilas
a9238493a7 moved file hash calculation to own method 2013-02-11 12:20:15 +01:00
Fabien Potencier
c5fcf0d0cc merged branch dlsniper/validator-check-property-metadata (PR #6972)
This PR was squashed before being merged into the 2.2 branch (closes #6972).

Commits
-------

4cbdbcb [Validator] Add check for existing metadata on property

Discussion
----------

[Validator] Add check for existing metadata on property

| Q             | A
| ------------- | ---
| Bug fix?      | no (sort of)
| New feature?  | no
| BC breaks?    | no (I don't think so)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Todo:
- [x] Check if the new method should be added to the interface as well.

This adds a check for metadata existence before usage else the code will emit a warning.

This should not be a BC break or a bug fix as the patched code is 2.2 specific.

@bschussek let me know if I should add the method in the interface as well. Thank you.

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

by vicb at 2013-02-05T10:40:56Z

Strictly speaking this is a BC break (you are adding a public method). But I guess we should better defined what should be describe as BC break - I have asked myself the same question more than one time /cc @fabpot

Please also add a UT and a note in the changelog.

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

by dlsniper at 2013-02-05T11:26:30Z

@vicb thanks for input. In this case I guess I should add the method to the interface as well.

As for unit tests I'll add them soon as well.

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

by fabpot at 2013-02-05T14:19:14Z

Can you add a test?

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

by dlsniper at 2013-02-05T15:57:12Z

I'll do it tonight as I've bumped into some work related issues.

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

by fabpot at 2013-02-11T11:11:12Z

Just for the record, this is not a BC break as the interface was added in 2.2.
2013-02-11 12:11:43 +01:00
Florin Patan
4cbdbcb1f9 [Validator] Add check for existing metadata on property 2013-02-11 12:11:43 +01:00
Fabien Potencier
2c6e882b1b merged branch fabpot/pattern-fix (PR #6998)
This PR was merged into the 2.2 branch.

Commits
-------

73aa7d1 replaced usage of the deprecated pattern routing key (replaced with path)

Discussion
----------

replaced usage of the deprecated pattern routing key (replaced with path)

| 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

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

by lsmith77 at 2013-02-07T13:35:54Z

do we have tests to cover the BC behavior?

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

by fabpot at 2013-02-07T16:30:31Z

I've just added some tests for the legacy way.
2013-02-11 11:51:33 +01:00
Fabien Potencier
42d3c4c9ca added support for the X-Forwarded-For header (closes #6982, closes #7000) 2013-02-11 11:50:30 +01:00
Fabien Potencier
6a9c5102b2 fixed the IP address in HttpCache when calling the backend 2013-02-11 11:50:29 +01:00
Fabien Potencier
c5148a1d11 fixed typos in composer.json version constraints 2013-02-11 11:28:56 +01:00
Fabien Potencier
1697b7204c merged branch fabpot/composer-deps (PR #7027)
This PR was merged into the 2.2 branch.

Commits
-------

0e4a1fe updated required versions when depending on the HttpFoundation component
2704705 updated required versions when depending on the HttpKernel component
0a70fe7 updated required versions when depending on the Config component
2f1939b updated required versions when depending on the Form component
719628a updated required versions when depending on the DependencyInjection component
3db311a updated required versions when depending on the Validator component
a671313 updated required versions when depending on the Translation component
289ccfc updated required versions when depending on the Routing component
a742f0a updated required versions when depending on the EventDispatcher component
51857fe updated required versions when depending on the OptionsResolver component
20dfc15 updated required versions when depending on the PropertyAccess component
f971ccf updated required versions when depending on the Security component
da06817 updated required versions when depending on the Templating component
108a8c0 updated required versions when depending on the Stopwatch component
155cccb updated required versions when depending on the Process component
b95184b updated required versions when depending on the Finder component
a5da4a1 updated required versions when depending on the Dom Crawler component
0d74948 use ~2.0 when depending on the Dom Crawler component
d2d4c0a use ~2.1 when depending on the ClassLoader component
4def221 use ~2.0 when depending on the CSS selector component
9b64be2 use ~2.0 when depending on the locale component
c3906a4 updated required versions when depending on the Yaml component

Discussion
----------

Update Composer deps

| 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

Since we adopted Composer in Symfony, we limit the Symfony Components deps for any Symfony Component to the current version of Symfony. That's very limited as for instance, any version of Yaml can be used as a dependency for any other Symfony Component. So, this PR changes the version constraints for dependencies to the largest range possible.

The idea is also to open the range even more when new versions of Symfony comes.

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

by bamarni at 2013-02-08T17:40:41Z

👍 closes #5891

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

by canni at 2013-02-08T23:42:04Z

👍

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

by simensen at 2013-02-09T05:35:41Z

👍

I think this is a great idea but it opens up the potential for internal version conflicts between components. The increased maintenance is probably worth it, though. :)

Several packages on Packagist are currently broken (see #6983) and I think this would fix that. A number of my projects have been forced back to 2.2@RC in favor of staying on 2.3@dev so I'm excited to see this resolved one way or another.

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

by vicb at 2013-02-09T10:06:36Z

Would the right way to fix this issue be semantic versioning ?
2013-02-11 11:09:17 +01:00
Fabien Potencier
a3131882e3 added a proper setter for the templating servicein HInclude 2013-02-10 12:34:10 +01:00
Victor
87f3db780e [EventDispathcer] Fix removeListener 2013-02-10 11:45:08 +01:00
Jakub Zalas
381bd7e235 [HttpFoundation] Added support for partial ranges in the BinaryFileResponse.
Valid ranges include:
* bytes=0-499
* bytes=500-999
* bytes=-500
* bytes=9500-
* bytes=0-0
2013-02-09 16:41:39 +01:00
Jakub Zalas
d9b91458f1 [HttpFoundation] Fixed byte ranges in the BinaryFileResponse.
According to rfc2616 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.1)
byte positions are inclusive:

The first-byte-pos value in a byte-range-spec gives the byte-offset of
the first byte in a range. The last-byte-pos value gives the byte-offset
of the last byte in the range; that is, the byte positions specified are
inclusive. Byte offsets start at zero.
2013-02-09 16:41:27 +01:00
Fabien Potencier
0e4a1fe418 updated required versions when depending on the HttpFoundation component 2013-02-08 17:10:58 +01:00
Fabien Potencier
270470596f updated required versions when depending on the HttpKernel component 2013-02-08 17:10:57 +01:00
Fabien Potencier
0a70fe7079 updated required versions when depending on the Config component 2013-02-08 17:10:57 +01:00
Fabien Potencier
2f1939b4a0 updated required versions when depending on the Form component 2013-02-08 17:10:57 +01:00
Fabien Potencier
719628a5ce updated required versions when depending on the DependencyInjection component 2013-02-08 17:10:56 +01:00
Fabien Potencier
3db311a601 updated required versions when depending on the Validator component 2013-02-08 17:10:56 +01:00
Fabien Potencier
a6713136d0 updated required versions when depending on the Translation component 2013-02-08 17:10:56 +01:00
Fabien Potencier
289ccfc724 updated required versions when depending on the Routing component 2013-02-08 17:10:56 +01:00
Fabien Potencier
a742f0a03e updated required versions when depending on the EventDispatcher component 2013-02-08 17:10:55 +01:00
Fabien Potencier
51857feb8b updated required versions when depending on the OptionsResolver component 2013-02-08 17:10:55 +01:00
Fabien Potencier
20dfc15de6 updated required versions when depending on the PropertyAccess component 2013-02-08 17:10:55 +01:00
Fabien Potencier
108a8c0117 updated required versions when depending on the Stopwatch component 2013-02-08 17:10:54 +01:00
Fabien Potencier
155cccbe8e updated required versions when depending on the Process component 2013-02-08 17:10:53 +01:00
Fabien Potencier
b95184b834 updated required versions when depending on the Finder component 2013-02-08 17:10:53 +01:00
Fabien Potencier
0d74948280 use ~2.0 when depending on the Dom Crawler component 2013-02-08 17:10:52 +01:00
Fabien Potencier
d2d4c0a9bb use ~2.1 when depending on the ClassLoader component 2013-02-08 17:10:52 +01:00
Fabien Potencier
4def2219cd use ~2.0 when depending on the CSS selector component
The API is stable and won't change.
2013-02-08 17:10:52 +01:00
Fabien Potencier
9b64be2ee8 use ~2.0 when depending on the locale component
Some methods have been added in 2.1 but none of them are used by the
Symfony components.
2013-02-08 17:10:51 +01:00
Fabien Potencier
c3906a4acb updated required versions when depending on the Yaml component
The API has not changed since 2.0 and won't until 3.0.
2013-02-08 17:10:51 +01:00
Fabien Potencier
642c95a631 added Universal* classes in the list of deprecated classes for 3.0 2013-02-08 17:10:00 +01:00
Martijn Evers
c3c9c9ec5b exception listener, allow easier overloading of the default behavior 2013-02-08 12:43:40 +01:00
Igor Wiedler
e0637fa9b7 [DependencyInjection] Add clone for resources which were introduced in 2.1 2013-02-07 23:54:50 +01:00
Fabien Potencier
648527355d Merge branch '2.0' into 2.1
* 2.0:
  [DependencyInjection] Allow frozen containers to be dumped to graphviz
  Add dot character `.` to legal mime subtype regular expression
  [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)
2013-02-07 23:54:36 +01:00
Fabien Potencier
85557619ba [Routing] fixed previous merge 2013-02-07 23:44:42 +01:00
Igor Wiedler
bd0ad92559 [DependencyInjection] Allow frozen containers to be dumped to graphviz 2013-02-07 23:33:52 +01:00
Ludek Stepan
83e95586e7 Fix 'undefined index' error, when entering scope recursively 2013-02-07 23:17:35 +01:00
Adrien Samson
3615e199d2 [Security] fixed session creation on login (closes #7011) 2013-02-07 21:22:30 +01:00
Dariusz Górecki
30b0c37b68 [Router] Fix TraceableUrlMatcher 2013-02-07 17:30:00 +00:00
Fabien Potencier
7a35cb7c3b merged branch romainneutron/file-binary-guesser (PR #7006)
This PR was merged into the 2.0 branch.

Commits
-------

a12744e Add dot character `.` to legal mime subtype regular expression

Discussion
----------

[HttpFoundation][2.0] Add dot character `.` to legal mime subtype regular expression

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

For example, the following mimetype (used for Microsoft powerpoints) is not recognized given the current regexp : `application/vnd.ms-powerpoint; charset=binary`
2013-02-07 17:36:12 +01:00
Fabien Potencier
f8cf1eb1a2 merged branch fabpot/fragment-fix (PR #6996)
This PR was merged into the 2.2 branch.

Commits
-------

5a2caa5 [HttpKernel] fixed the hinclude fragment renderer when the template is empty

Discussion
----------

[HttpKernel] fixed the hinclude fragment renderer when the template is empty

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

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

by lsmith77 at 2013-02-07T13:36:58Z

does it make sense to allow the template to be empty? i mean isnt this instead an error condition?

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

by fabpot at 2013-02-07T16:16:04Z

Why not? An empty template means and empty content, which you might want as this is just the fallback content displayed when the real content is not loaded yet.
2013-02-07 17:32:34 +01:00
Fabien Potencier
73aa7d128b replaced usage of the deprecated pattern routing key (replaced with path) 2013-02-07 17:29:53 +01:00
Romain Neutron
a12744e30e Add dot character . to legal mime subtype regular expression 2013-02-07 17:24:12 +01:00
Fabien Potencier
3c24f6e39a merged branch fabpot/request-creation-fix (PR #6995)
This PR was merged into the 2.2 branch.

Commits
-------

bc4a0e7 [HttpFoundation] fixed Request::create() method

Discussion
----------

[HttpFoundation] fixed Request::create() method

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

When creating a Request with Request::create(), some information can
come from the URI and the server variable. Until now, it was not clear
which information had precedence over the other and as a matter of fact,
this method was not consistent.

Now, information contained in the URI always take precedence over
information coming from the server array. That makes sense as the server
array is often copied from another existing Request object.

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

by vicb at 2013-02-07T14:42:15Z

You should add a note in the changelog
2013-02-07 16:27:14 +01:00
Fabien Potencier
bc4a0e751e [HttpFoundation] fixed Request::create() method
When creating a Request with Request::create(), some information can
come from the URI and the server variable. Until now, it was not clear
which information had precedence over the other and as a matter of fact,
this method was not consistent.

Now, information contained in the URI always take precedence over
information coming from the server array. That makes sense as the server
array is often copied from another existing Request object.
2013-02-07 16:26:12 +01:00
Fabien Potencier
3d43bcc540 merged branch fabpot/better-exception-messages (PR #6994)
This PR was merged into the 2.2 branch.

Commits
-------

3053194 [DependencyInjection] enhanced some error messages

Discussion
----------

[DependencyInjection] enhanced some error messages

| 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
2013-02-07 14:24:42 +01:00
Fabien Potencier
ed98a5164f Merge branch '2.1' into 2.2
* 2.1:
  [HttpKernel] fixed the creation of the Profiler directory
  [Security] fixed session creation when none is needed (closes #6917)
  [FrameworkBundle] removed obsolete comment (see 2e356c1)
2013-02-07 12:58:45 +01:00
Fabien Potencier
e50d33308a [HttpKernel] fixed the creation of the Profiler directory 2013-02-07 12:58:33 +01:00
Fabien Potencier
5a2caa5e85 [HttpKernel] fixed the hinclude fragment renderer when the template is empty 2013-02-07 12:09:58 +01:00
Fabien Potencier
3446cb219a bumped Symfony version to 2.2.0-RC2-DEV 2013-02-07 12:04:45 +01:00
Kris Wallsmith
da2292681f [Validator] gracefully handle transChoice errors 2013-02-06 12:54:30 -08:00
Fabien Potencier
3053194cd7 [DependencyInjection] enhanced some error messages 2013-02-06 16:38:36 +01:00
Fabien Potencier
d5fe378e54 tweaked previous merge 2013-02-05 15:17:02 +01:00
Fabien Potencier
6e9c235d62 merged branch michaelperrin/feature/deprecation-messages (PR #6973)
This PR was merged into the 2.2 branch.

Commits
-------

badb2b9 Add "'property_path' => false" deprecation message for forms

Discussion
----------

Add "'property_path' => false" deprecation message for forms
2013-02-05 15:16:26 +01:00
Fabien Potencier
0c20a5aee9 [Security] fixed interface implementation (closes #6974) 2013-02-05 15:08:32 +01:00
Michaël Perrin
badb2b99b0 Add "'property_path' => false" deprecation message for forms 2013-02-05 11:48:57 +01:00
Fabien Potencier
9367a7cd8e fixed CS 2013-02-05 11:25:15 +01:00
Elnur Abdurrakhimov
9d089ef998 Added BCrypt password encoder. 2013-02-05 10:22:32 +01:00
Fabien Potencier
f40c137440 updated VERSION for 2.2.0-RC1 2013-02-05 08:31:53 +01:00
Jakub Zalas
63f300613e Removed underscores from test method names to be consistent with other components.
It is more common to use fully camel-cased names for test methods. Only some of the test methods are called with underscore notation. To avoid confusion it is better to be consistent.
2013-02-04 21:27:45 +01:00
Fabien Potencier
be69ca1648 merged branch hhamon/user_password_constraints_namespace (PR #6960)
This PR was merged into the 2.2 branch.

Commits
-------

35b62ac [Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API.

Discussion
----------

[Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | yes (for people already using the ``UserPassword`` constraint class in their code)
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2013-02-04 21:25:39 +01:00
Fabien Potencier
ddf4678dd6 [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)
This fixes the creation of a sub-request when the master request Request URI
is determined with specific server information.
2013-02-04 19:34:49 +01:00
Fabien Potencier
8ca00c598c [Security] fixed session creation when none is needed (closes #6917) 2013-02-04 18:59:58 +01:00
Florin Patan
5377290fbf Micro-optimization 2013-02-04 13:46:31 +01:00
Fabien Potencier
bf8b0f7a5f Merge branch '2.1' into 2.2
* 2.1:
  fixed a circular call (closes #6864)
  Correct comment in NativeSessionStorage regarding session.save_handler
  [Security] Add PHPDoc to AuthenticationEvents
2013-02-04 13:41:52 +01:00
Fabien Potencier
04cb480e30 Merge branch '2.0' into 2.1
* 2.0:
  fixed a circular call (closes #6864)
2013-02-04 13:41:37 +01:00
Fabien Potencier
3166e5b763 fixed regression in the Finder component (it was possible to use it without using exec before, closes #6357) 2013-02-04 13:41:13 +01:00
Fabien Potencier
74f2fcfed0 fixed a circular call (closes #6864) 2013-02-04 13:39:09 +01:00
Hugo Hamon
35b62ac4cd [Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API. 2013-02-04 13:20:14 +01:00
Fabien Potencier
df4188a921 merged branch hhamon/user_password_validator_unit_test (PR #6947)
This PR was merged into the 2.2 branch.

Commits
-------

a433ba2 [Security] [Tests] added unit tests for the UserPasswordValidator class and made the validator service for the UserPassword constraint configurable.

Discussion
----------

[Security] [Tests] added unit tests for the UserPasswordValidator class ...

...and made the validator service for the UserPassword constraint configurable.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2013-02-04 12:35:48 +01:00
Fabien Potencier
4284f19bd3 merged branch fabpot/render-with-objects (PR #6942)
This PR was merged into the 2.2 branch.

Commits
-------

8f8d6cf [HttpKernel] fixed regression when rendering an inline controller and passing some objects  (closes #6822)

Discussion
----------

[HttpKernel] fixed regression when rendering an inline controller and passing some objects (closes #6822)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6822
| License       | MIT
| Doc PR        | n/a
2013-02-04 12:07:48 +01:00
Hugo Hamon
a433ba2f75 [Security] [Tests] added unit tests for the UserPasswordValidator class and made the validator service for the UserPassword constraint configurable. 2013-02-02 14:28:44 +01:00
Fabien Potencier
175827713a tweaked previous commit 2013-02-01 22:56:52 +01:00
Victor
3fee9c0f80 [HttpKernel] Fix the URI signer (closes #6801) 2013-02-01 22:56:31 +01:00
Fabien Potencier
0c3d0db5de merged branch franmomu/add_phpdoc_to_authentication_events (PR #6831)
This PR was merged into the 2.1 branch.

Commits
-------

e7624b6 [Security] Add PHPDoc to AuthenticationEvents

Discussion
----------

[Security] Added PHPDoc to AuthenticationEvents

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |
2013-02-01 22:52:20 +01:00
Mahmoud Mostafa
edd5a85303 Add Arabic translations. 2013-02-01 22:37:51 +01:00
Fabien Potencier
8f8d6cfb15 [HttpKernel] fixed regression when rendering an inline controller and passing some objects (closes #6822) 2013-02-01 17:19:49 +01:00
Fabien Potencier
c72e471c65 renamed some classes and Twig functions to more descriptive names (refs #6871)
HttpContentRenderer has been renamed to FragmentHandler.
The RendererStrategy subnamespace has been renamed to Fragment.
The strategy classes now have Fragment in their names.
ProxyRouterListener has been renamed to FragmentListener
The router_proxy configuration entry has been renamed to fragments.
2013-02-01 15:17:20 +01:00
Victor Berchet
507d0c43d5 Classcollectionloader: fix traits + enhancements 2013-02-01 15:12:50 +01:00
Victor
df9db258c1 Fix a deprecated method call in the tests 2013-02-01 14:27:32 +01:00
Joseph Bielawski
53c70548a0 Update composer.json files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version 2013-02-01 10:33:53 +01:00
TravisCarden
924c25642b Remove executable bit from all PHP files 2013-01-31 12:27:04 -06:00
Florin Patan
d0341e84ab Replaced call that triggers deprecated error 2013-01-31 14:13:11 +02:00
Sebastian Bergmann
6c00ffe90f Fugbix typo 2013-01-31 09:00:54 +01:00
Fabien Potencier
63c61eef7d merged branch stof/fix_null_logger (PR #6920)
This PR was merged into the master branch.

Commits
-------

b1d1168 Fixed the NullLogger to implement the HttpKernel interface again

Discussion
----------

Fixed the NullLogger to implement the HttpKernel interface again

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no (reverting one introduced by mistake)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | n/a

This BC breaking mistake has been reported in https://github.com/schmittjoh/JMSSecurityExtraBundle/pull/105#issuecomment-12908659
2013-01-31 08:55:22 +01:00
Jean-François Simon
ed3a875de0 [Finder] Fixed test 2013-01-31 08:21:20 +01:00
Igor Wiedler
d6c0455c11 Correct comment in NativeSessionStorage regarding session.save_handler
It's save_handler, not save_handlers.
2013-01-30 22:06:00 +01:00
Christophe Coevoet
b1d1168d26 Fixed the NullLogger to implement the HttpKernel interface again 2013-01-30 20:59:27 +01:00
Jean-François Simon
ef593fa8d8 [Finder] Fixed iterator keys 2013-01-29 19:42:39 +01:00
Jean-François Simon
d16e28acaf [Finder] Added iterator keys test 2013-01-29 19:30:27 +01:00
Fabien Potencier
c1037b1603 merged branch vicb/fmwk/config (PR #6852)
This PR was squashed before being merged into the master branch (closes #6852).

Commits
-------

fde7585 [DIC] Better handling of enableable configurations

Discussion
----------

[DIC] Better handling of enableable configurations

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no, this feature has not been released yet
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

My definition of bug fix might be discussable. The thing which I think is not discussable is that this PR fixes the semantic - and I think it is important for a "semantic configuration": before this PR, some nodes had `->canBeDisabled` for nodes that were actually disabled by default. Those nodes now have `->canBeEnabled` which sounds right.

**Edit: Jan 28, 2013** - history:

See [the related comments](https://github.com/symfony/symfony/pull/6829#discussion_r2727742).

I think Symfony **must** get the configuration right as we can expect of lot of devs to use this as a template when writting their own configuration.

@schmittjoh could you please give me your feedback on [this change](https://github.com/symfony/symfony/pull/6852/files#L4R224) considering [the rationale](https://github.com/symfony/symfony/pull/6852/files#L3R7).

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

by stof at 2013-01-23T16:10:33Z

@vicb your links are broken as they are pointing to the PR creation page

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

by stof at 2013-01-23T16:10:55Z

and to create a TODO list, it has to be a list first

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

by vicb at 2013-01-23T16:31:10Z

@stof thanks for reporting the broken links, they are fixed /cc @schmittjoh

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

by vicb at 2013-01-23T16:31:50Z

@Tobion please submit a PR to my repo, I don't have much time to work on this. Thanks !

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

by vicb at 2013-01-25T15:14:47Z

@fabpot @schmittjoh I'd like your feedback on the latest commit, rationale is in the method phpDoc. It better matches what we do now and seem the most sensible thing to do.

edit: with this you can no more disable the node explicitly, I have to find a better solution

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

by schmittjoh at 2013-01-25T15:20:13Z

Looks good.

On Fri, Jan 25, 2013 at 4:15 PM, Victor Berchet <notifications@github.com>wrote:

> @fabpot <https://github.com/fabpot> @schmittjoh<https://github.com/schmittjoh>I'd like your feedback on the latest commit, rationale is in the method
> phpDoc. It better matches what we do now and seem the most sensible thing
> to do.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/symfony/symfony/pull/6852#issuecomment-12704585>.
>
>

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

by vicb at 2013-01-28T14:37:57Z

@fabpot I know I keep insisting on this one and I am sorry for that but I think this should be considered as a bug fix (see the PR header for details) and should be merged in 2.2. I think the Symfony core should be exemplary as it is used by many developers as a template when creating their own bundle. *This PR is no more a WIP and can be merged right now*.

In addition to fixing the enableable nodes, this PR contain new UTs and some fixes to the code / tests.

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

by fabpot at 2013-01-28T16:43:42Z

@vicb As explained in a comment, this is not a BC break as this feature does not exist in 2.1. So, I can make the change to the CHANGELOG if you want after merging, or I can let you make the change.

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

by vicb at 2013-01-28T16:46:33Z

I am going to change it right now !

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

by vicb at 2013-01-28T16:46:56Z

(and thanks for having checked this)

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

by vicb at 2013-01-28T16:54:37Z

@fabpot I have updated the changelog and the PR header.

I am not sure if the commits should be squashed or not. On one side the multiple commits can help understand the changes but on the other side that's a lot of small commits which could pollute history. I let you choose what to do.
2013-01-28 18:21:49 +01:00
Victor
fde7585967 [DIC] Better handling of enableable configurations 2013-01-28 18:21:49 +01:00
Franz Liedke
7cff461062 [Routing] Improve RouteNotFoundException messages 2013-01-28 10:55:07 +01:00
Fabien Potencier
6755546b8c Merge branch '2.1'
* 2.1:
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception
2013-01-27 17:49:19 +01:00
Fabien Potencier
6f71948023 [Yaml] fixed wrong merge (indentation default is 4 as of 2.1) 2013-01-27 17:12:43 +01:00
Xavier Amado
d77828ca22 Fixed missing class argument when throwing exception 2013-01-26 08:21:53 +01:00
Victor
189a05e8c7 css fix 2013-01-25 15:47:14 +01:00
Fabien Potencier
5381faed6d merged branch fabpot/phpdoc-fix (PR #6869)
This PR was merged into the master branch.

Commits
-------

e3086cc [Console] added some missing information in the phpdoc (closes #6464)

Discussion
----------

[Console] added some missing information in the phpdoc (closes #6464)

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6464
| License       | MIT
| Doc PR        | n/a
2013-01-25 07:59:49 +01:00
Fabien Potencier
6b8617d799 merged branch fabpot/deprecated-calls (PR #6868)
This PR was merged into the master branch.

Commits
-------

ed64413 removed deprecated message in FieldType

Discussion
----------

removed deprecated messages coming for internal calls

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

It's probably not the cleanest code possible, but I don't see any other way to keep the type for BC and avoid the deprecated message when called internally.

That should fix the deprecated messages thrown by the Form and Validator components.

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

by stof at 2013-01-24T15:41:26Z

The cases where you should actually be warned about the deprecation of FieldType is when using ``field`` to create a field with the factory (which would not trigger the constructor)

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

by fabpot at 2013-01-24T15:46:23Z

@stof: what do you mean? That we can remove the `trigger_error()` call altogether?

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

by stof at 2013-01-24T15:49:31Z

Nobody will ever instantiate the FieldType directly as the framework is registering it (btw, you are missing the FrameworkBundle lazy registration here).
The constructor of a form type is not the right place to deprecate it as registering it does not mean it will be used in the app.

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

by fabpot at 2013-01-24T15:51:26Z

@stof: I've updated the PR to remove the `trigger_error` call.
2013-01-24 19:40:31 +01:00
Fabien Potencier
e3086cccf8 [Console] added some missing information in the phpdoc (closes #6464) 2013-01-24 16:55:08 +01:00
Fabien Potencier
ed644133b7 removed deprecated message in FieldType 2013-01-24 16:50:46 +01:00
Fabien Potencier
5923f8bfc8 [Form] updated ValidatorExtension to avoid using a deprecated method 2013-01-24 13:42:16 +01:00
Fabien Potencier
9e8b2f01f6 [Validator] fixed broken tests 2013-01-24 11:00:40 +01:00
Fabien Potencier
a1616efe1f merged branch franmomu/update_deprecated_calls_all_validator (PR #6743)
This PR was merged into the master branch.

Commits
-------

8bfd7a7 Remove custom error handler for deprecations
efbff0c Change deprecated Min and Max constraint
c47f027 [Validator][Constraints] Update AllValidator using new Validator API

Discussion
----------

[Validator][Constraints] Update AllValidator using new Validator API

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets:
License of the code: MIT
2013-01-24 10:29:59 +01:00
Fabien Potencier
70686ac7b3 merged branch franmomu/update_deprecated_calls_collection_validator (PR #6741)
This PR was merged into the master branch.

Commits
-------

9264431 Remove custom error handler for deprecations
c80c17e Change deprecated Min constraint to Range constraint
a39fdd8 Remove getPropertyPath in the tests
ffa4c6f [Validator][Constraints] CollectionValidator

Discussion
----------

[Validator][Constraints] Update CollectionValidator using new Validator API

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6648
License of the code: MIT

In the tests `$i = 1` is because in `validate` the first call to `$this->context` is `$this->context->getGroup();`, should I write this in a comment before each declaration?

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

by stof at 2013-01-15T21:50:41Z

You should also modify the CollectionValidator tests to use a different constraint than ``Min`` which is deprecated. Once it is done, these tests should not need to register a custom error handler catching deprecations anymore

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

by franmomu at 2013-01-15T22:33:43Z

Perfect, I'm going to do the same in #6743
2013-01-24 10:29:51 +01:00
Fabien Potencier
02738a509f merged branch CEikermann/patch-1 (PR #6728)
This PR was merged into the master branch.

Commits
-------

2061cc0 Update src/Symfony/Component/Validator/Mapping/ClassMetadata.php

Discussion
----------

[Validator] ClassMetadata use deprecated methods

Bug fix: yes
Feature addition: no
Backwards compatibility break: maybe yes (I don't have the knowlegde)
Symfony2 tests pass: yes
Fixes the following tickets: ?
Todo: Nothing
License of the code: MIT
Documentation PR: Nothing

getValue() is deprecated since version 2.2 and will be removed in 2.3. Use getPropertyValue() instead.

ClassMetadata is still using the deprecated method, changed it to getPropertyValue to prevent a trigger error.

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

by fabpot at 2013-01-14T15:35:28Z

ping @bschussek
2013-01-24 09:53:37 +01:00
Fabien Potencier
c3ee8f65f7 bumped Symfony version to 2.2.0-RC1-DEV 2013-01-24 09:14:41 +01:00
Fabien Potencier
86dd5e482d updated VERSION for 2.2.0-BETA2 2013-01-24 08:15:19 +01:00
Fabien Potencier
6a53180aa9 [HttpKernel] added a missing unit test 2013-01-24 07:51:29 +01:00
Fabien Potencier
c0d72d275f [HttpKernel] fixed typo (closes #6859) 2013-01-24 07:50:13 +01:00
Fabien Potencier
3196dbdf52 Merge branch '2.1'
* 2.1:
  [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
  [Security] PHPDoc in SecurityEvents
  Fix typos in README
  Added an error message in the DebugClassLoader when using / instead of \.
  KNOWN_ISSUES with php 5.3.16
  [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
  [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
  [Yaml] fixed #6773
  [Yaml] fixed #6770
  bumped Symfony version to 2.1.8-DEV
  bumped Symfony version to 2.0.23-DEV

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Client.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-01-23 21:21:00 +01:00
Fabien Potencier
7c957e3411 merged branch MaksSlesarenko/fix-for-choice-widget (PR #6734)
This PR was squashed before being merged into the master branch (closes #6734).

Commits
-------

4d51ec0 Fix for hardcode (#6384) in choice widget

Discussion
----------

Fix for hardcode (#6384) in choice widget

empty_value should not be disabled if field is not required!

#6384

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

by sstok at 2013-01-15T15:51:08Z

You need to revert the file mode changes (100644 → 100755)

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

by MaksSlesarenko at 2013-01-18T16:44:42Z

fixed tests

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

by MaksSlesarenko at 2013-01-21T15:36:59Z

ping @fabpot

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

by fabpot at 2013-01-21T15:58:26Z

ping @bschussek

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

by MaksSlesarenko at 2013-01-23T11:15:37Z

ping @fabpot @bschussek

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

by Tobion at 2013-01-23T12:08:19Z

I think it's good to squash and merge.

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

by fabpot at 2013-01-23T12:16:37Z

Can you rebase and squash before I merge? Thanks.

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

by MaksSlesarenko at 2013-01-23T19:51:36Z

@fabpot done
2013-01-23 20:54:36 +01:00
Maks Slesarenko
4d51ec05d8 Fix for hardcode (#6384) in choice widget 2013-01-23 20:54:35 +01:00
Fabien Potencier
78e3da501f merged branch vicb/di/prepext (PR #6853)
This PR was merged into the master branch.

Commits
-------

7944860 [DIC] Move PrependExtensionInterface to the Extension namespace

Discussion
----------

[DIC] Move PrependExtensionInterface to the Extension namespace

@fabpot Please merge before 2.2 (no BC break) /cc @lsmith77
2013-01-23 18:53:45 +01:00
Victor
79448600f5 [DIC] Move PrependExtensionInterface to the Extension namespace 2013-01-23 17:42:45 +01:00
Fabien Potencier
65b4112ddb fixed a circular reference (closes #6730) 2013-01-23 14:48:08 +01:00
Fabien Potencier
4bdfb92a35 updated CHANGELOGS 2013-01-23 14:21:06 +01:00
Fabien Potencier
e5135f67be [HttpKernel] renamed path to _path to avoid collision 2013-01-23 13:57:53 +01:00
Fabien Potencier
3193a90815 made the proxy path configurable 2013-01-23 13:57:53 +01:00
Fabien Potencier
ad82893691 removed the need for a proxy route for rendering strategies 2013-01-23 13:57:52 +01:00
Fabien Potencier
b9f0e17e67 [HttpKernel] made the Request required when using rendering strategies
The previous code allowed to pass null as a Request but that does not
really make sense as rendering a sub-request can only happen from a
master request. This was done to ease testing but that was a mistake.
2013-01-23 13:57:23 +01:00
Fran Moreno
e7624b6b83 [Security] Add PHPDoc to AuthenticationEvents 2013-01-22 10:47:05 +01:00
Fabien Potencier
bdc7e91865 Merge branch '2.0' into 2.1
* 2.0:
  [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
  [Security] PHPDoc in SecurityEvents
  [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
  [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
  [Yaml] fixed #6773
  [Yaml] fixed #6770
  bumped Symfony version to 2.0.23-DEV

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2013-01-22 08:14:57 +01:00
Fabien Potencier
4119cafdbe [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder 2013-01-21 23:08:41 +01:00
Fabien Potencier
696900e68f [HttpKernel] fixed failing test 2013-01-21 22:03:00 +01:00
Fabien Potencier
94f6116f42 renamed hostname to host in the routing system (closes #6775)
As explained in #6775, this has been done for the following reasons:

1. It's also Request::getHost()
2. The term hostname has been obsoleted in
http://tools.ietf.org/html/rfc3986#appendix-D.2 and uses the host only
3. hostname in the RFC was defined as the registered domain name, but we
probably also want to match IP-Adresses with the pattern which is the
host = IP-literal / IPv4address / reg-name for.
2013-01-21 17:57:32 +01:00
Fabien Potencier
001734aa2e [Validator] fixed phpdoc 2013-01-21 17:57:12 +01:00
Fabien Potencier
18b9e68861 [HttpFoundation] renamed hostname to host in the test to be consistent 2013-01-21 17:56:55 +01:00
Fabien Potencier
5663820aa6 merged branch franmomu/added_phpdoc_security_events (PR #6818)
This PR was squashed before being merged into the 2.0 branch (closes #6818).

Commits
-------

598ae9d [Security] PHPDoc in SecurityEvents

Discussion
----------

[Security] PHPDoc in SecurityEvents

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

I'm not sure about the description given.
2013-01-21 16:19:16 +01:00
Fran Moreno
598ae9d050 [Security] PHPDoc in SecurityEvents 2013-01-21 16:19:16 +01:00
Fabien Potencier
b7614e9ca8 merged branch fabpot/content-renderer-refactoring (PR #6810)
This PR was merged into the master branch.

Commits
-------

aadefd3 [HttpKernel] refactored the HTTP content renderer to make it easier to extend

Discussion
----------

[HttpKernel] refactored the HTTP content renderer to make it easier to extend

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

This makes the StreamedResponse logic reusable for other strategies and it also makes the RenderingStrategy interface less fuzzy about its contract.

That also makes features like #4470 easier to implement from the outside.

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

by stof at 2013-01-20T11:01:29Z

👍
2013-01-21 16:18:25 +01:00
Fabien Potencier
aadefd378d [HttpKernel] refactored the HTTP content renderer to make it easier to extend 2013-01-21 16:17:47 +01:00
Fabien Potencier
1ab48db367 tweaked the deprecated error handler to actually display the deprecation message
I've also removed uninterested information (like the trigger_error stack
frame).
2013-01-20 16:29:41 +01:00
Fabien Potencier
6923a484c2 fixed markup 2013-01-19 08:50:02 +01:00
Fabien Potencier
62a4cc90cc merged branch beberlei/SerializerOptions (PR #6797)
This PR was merged into the master branch.

Commits
-------

fcabadf Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md
b6bdb45 Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers.
ef652e2 Added context to JsonEncoder
eacb7e2 Rename $options to $context, as it makes the intent much more clear.
8854b85 Fix CS issues, removed global options
9c54a4b [Serializer] Allow options to be passed to SerialiizerInterface#serialize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.

Discussion
----------

[2.2] [Serializer] Configurable Serializer

Bug fix: no
Feature addition: yes
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #4907, #4938
License of the code: MIT
Todo:

This is an extension of GH-6574 that removes the context state in favor of passing this information around.

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

by beberlei at 2013-01-18T13:12:39Z

@fabpot @lsmith I think this is how it should work from an OOP/OOD perpesctive, avoiding the context state. This makes for a much cleaner code and dependency graph.

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

by lsmith77 at 2013-01-18T14:14:37Z

makes sense. anything fancier would lose this components simplicity which IMHO is the main benefit versus JMS serializer.

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

by fabpot at 2013-01-18T14:26:25Z

Looks very good. 👍

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

by beberlei at 2013-01-18T14:37:32Z

I need to fix the failures with the JsonEncoder and then this is good to merge

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

by stof at 2013-01-18T14:40:21Z

you also need to update the CHANGELOG of the component

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

by beberlei at 2013-01-18T23:17:57Z

Fixed, only the Redis Profiler problem still failing the Travis builds. Also I updated the CHANGELOG.md.

@fabpot  Good to merge from my POV

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

by stof at 2013-01-18T23:27:59Z

@beberlei see #6804 for the Redis profiler issue
2013-01-19 08:48:06 +01:00
Christophe Coevoet
11aaa2e672 Added an error message in the DebugClassLoader when using / instead of \. 2013-01-19 08:47:26 +01:00
Benjamin Eberlei
fcabadfc23 Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md 2013-01-19 00:06:48 +01:00
Christophe Coevoet
3d762dd92f [HttpKernel] Fixed the Redis profiler storage return value 2013-01-18 21:37:54 +01:00
Christophe Coevoet
44fe249bae Fixed some tests on Windows 2013-01-18 21:36:32 +01:00
Benjamin Eberlei
b6bdb450e3 Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers. 2013-01-18 14:08:59 +01:00
Fabien Potencier
53ccc2c677 [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786) 2013-01-18 10:52:07 +01:00
Fabien Potencier
d12011724e merged branch gnugat/refactoring/console-get-help (PR #6789)
This PR was squashed before being merged into the master branch (closes #6789).

Commits
-------

917f473 [Console] Removing unnecessary sprintf in Application->getHelp

Discussion
----------

[Console] Removing unnecessary sprintf in Application->getHelp

Minor change of the `Symfony\Component\Console\Application->getHelp()`  method.

I have spotted:
1. an unnecessary `sprintf` call (no `args` arguments);
2. two ways of adding a new line in the help (an empty string as new entry of the array and a `\n` at the end of the string).

It seems to be there since the begining and it looks like a forgoten change to me, so I fixed them by removing the `sprintf` call and using a new array entry (empty string) instead of the `\n`.

| Q             | A
| ------------- | ---
| License       | MIT
2013-01-18 09:14:58 +01:00
Loic Chardonnet
917f473798 [Console] Removing unnecessary sprintf in Application->getHelp 2013-01-18 09:14:57 +01:00
Fabien Potencier
0391ac770e merged branch ezzatron/yaml-negative-integers (PR #6784)
This PR was merged into the 2.0 branch.

Commits
-------

fea20b7 [Yaml] fixed #6770

Discussion
----------

[Yaml] fixed parsing of negative integers (2.0 branch)

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

Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
2013-01-18 07:25:05 +01:00
Erin Millard
ab0385c633 [Yaml] fixed #6773 2013-01-18 09:42:00 +10:00
Erin Millard
fea20b7eb2 [Yaml] fixed #6770 2013-01-18 09:32:48 +10:00
Fabien Potencier
9155a2382e bumped Symfony version to 2.1.8-DEV 2013-01-18 00:11:33 +01:00
Fabien Potencier
4c437f6be9 bumped Symfony version to 2.0.23-DEV 2013-01-18 00:11:05 +01:00
Fabien Potencier
a04d5d6203 Merge branch '2.1'
* 2.1:
  [Yaml] fixed unneeded BC break
  [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
  [Yaml] fixed typo
  updated VERSION for 2.1.7
  updated CHANGELOG for 2.1.7
  updated VERSION for 2.0.22
  update CONTRIBUTORS for 2.0.22
  updated CHANGELOG for 2.0.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-01-17 22:22:20 +01:00
Fabien Potencier
f53784913b Merge branch '2.0' into 2.1
* 2.0:
  [Yaml] fixed unneeded BC break
  [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
  [Yaml] fixed typo
  updated VERSION for 2.0.22
  update CONTRIBUTORS for 2.0.22
  updated CHANGELOG for 2.0.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-01-17 22:21:51 +01:00
Fabien Potencier
0138c2d0b3 [Yaml] fixed unneeded BC break 2013-01-17 22:16:19 +01:00
Fabien Potencier
972e1b7a16 [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation 2013-01-17 22:13:26 +01:00
Fabien Potencier
51d1948327 [Yaml] fixed typo 2013-01-17 17:53:40 +01:00
Fabien Potencier
3444290cd6 updated VERSION for 2.1.7 2013-01-17 17:21:47 +01:00
Fabien Potencier
08ccc62aa5 updated VERSION for 2.0.22 2013-01-17 16:40:40 +01:00
Fabien Potencier
1f762c7723 Merge branch '2.1'
* 2.1:
  [Yaml] fixed default value
  Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
  added a way to enable/disable object support when parsing/dumping
  added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
  fixed CS
  [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
  fixes a bug when output/error output contains a % character
  [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
  [Profiler] [Redis] Fix sort of profiler rows.
  Fix version_compare() calls for PHP 5.5.
  Removed underscores from test method names to be consistent with other components.
  [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
  Fix version_compare() calls for PHP 5.5.
  Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
  removed the .gitattributes files (closes #6605, reverts #5674)
  [HttpKernel] Clarify misleading comment in ExceptionListener

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
	src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
	src/Symfony/Component/Process/Process.php
2013-01-17 16:25:59 +01:00
Fabien Potencier
a25fad847b Merge branch '2.0' into 2.1
* 2.0:
  [Yaml] fixed default value
  Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
  added a way to enable/disable object support when parsing/dumping
  added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
  [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)

Conflicts:
	src/Symfony/Component/Yaml/Dumper.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/DumperTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
	src/Symfony/Component/Yaml/Yaml.php
2013-01-17 16:20:05 +01:00
Fabien Potencier
e17e2327b1 [Yaml] fixed default value 2013-01-17 16:16:00 +01:00