Commit Graph

14593 Commits

Author SHA1 Message Date
Lukas Kahwe Smith
6d2135b65c force the Content-Type to html in the web profiler controllers 2013-05-15 19:16:40 +02:00
Fabien Potencier
a6dd5db60d merged branch armetiz/master (PR #8045)
This PR was squashed before being merged into the master branch (closes #8045).

Discussion
----------

[Form] Add missing type hint

Commits
-------

4dccee6 [Form] Add missing type hint
2013-05-15 17:40:41 +02:00
Thomas Tourlourat
4dccee61c7 [Form] Add missing type hint 2013-05-15 17:40:40 +02:00
Fabien Potencier
da6f190a6b merged branch tiraeth/master-browserkit-redirect (PR #8025)
This PR was squashed before being merged into the master branch (closes #8025).

Discussion
----------

[BrowserKit] should not follow redirects if status code is not 30x

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

Currently, BrowserKit operates incorrectly. It follows "redirect" when `Location` header is present, but having just the header is not enough to perform redirection. [RFC-2616](http://tools.ietf.org/html/rfc2616#section-14.30) precisely says that the redirection should be performed only with `30x` status codes.

This PR fixes the incorrect behaviour of BrowserKit and make it consist with both the RFC document and with other clients, used for example with Behat.

I've found the issue while testing my application with Behat. I was returning `Location` header with `HTTP 201/Created` status code and was surprised that BrowserKit follows the redirection.

This PR is for 2.3 version (master) of Symfony.

Commits
-------

8f54da7 [BrowserKit] should not follow redirects if status code is not 30x
2013-05-15 17:16:47 +02:00
m.chwedziak
8f54da73dd [BrowserKit] should not follow redirects if status code is not 30x 2013-05-15 17:16:46 +02:00
Fabien Potencier
1f8a1b7125 tweaked previous merge (refs #8029) 2013-05-15 17:12:03 +02:00
Fabien Potencier
4edbf3cd2e merged branch ramonornela/master (PR #8029)
This PR was merged into the master branch.

Discussion
----------

Improvement composer.json Console

Added suggest to composer.json.

Commits
-------

5e6245f [ADD] Component_Console -add suggest in the composer.json to event-dispatcher
2013-05-15 17:11:32 +02:00
Fabien Potencier
d61ca1be07 merged branch jakzal/bugfix/segfaulting-tests (PR #8032)
This PR was merged into the master branch.

Discussion
----------

Fixed the tests on PHP 5.3.3

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

PHPUnit with PHP 5.3.3 couldn't handle garbage collecting properly.

Commits
-------

0617ed1 [Console] Removed the descriptor from data set providers.
2013-05-15 17:09:31 +02:00
Fabien Potencier
d656be01cf merged branch paradoxe/master (PR #8043)
This PR was merged into the master branch.

Discussion
----------

[Form][Twig] Removed an extra table column in the "button_row" block template

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

Commits
-------

6d5bc7a [Twig][Form] Removed extra table colunm in the button_row block template
2013-05-15 17:07:12 +02:00
Fabien Potencier
b027c92cdb merged branch Tobion/console-nulloutput (PR #8037)
This PR was merged into the master branch.

Discussion
----------

[Console] fix Output classes

Please see commits.

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

Commits
-------

940b788 [Console] use inheritdoc for Output classes
bd61b92 [Console] fix phpdoc of Output classes (esp. regarding the new verbosities)
9dcc9fa [Console] fix abstract Output class that fasly claims to support guessing of decorated variable.
2628d88 [Console] the default type value should use the constant in OutputInterface::write
ee0cc40 [Console] fix NullOutput
a290f87 [Console] fix test for NullOutput that does not print anything and add a failing test for verbosity
2013-05-15 16:55:03 +02:00
paradoxe
6d5bc7ad0f [Twig][Form] Removed extra table colunm in the button_row block template 2013-05-15 00:05:41 +02:00
Tobias Schultze
940b7888ac [Console] use inheritdoc for Output classes 2013-05-14 18:52:49 +02:00
Tobias Schultze
bd61b925a1 [Console] fix phpdoc of Output classes (esp. regarding the new verbosities)
also add missing information
2013-05-14 18:51:31 +02:00
Tobias Schultze
9dcc9facf0 [Console] fix abstract Output class that fasly claims to support guessing of decorated variable.
Also we don't need to typecast to boolean as its already done by the formatter and its his responsibility
2013-05-14 18:18:10 +02:00
Tobias Schultze
2628d889a7 [Console] the default type value should use the constant in OutputInterface::write 2013-05-14 18:09:22 +02:00
Tobias Schultze
ee0cc40c87 [Console] fix NullOutput
It should not extend from abstract Output class because than it inherits the useless constructor arguments and applies formatting in write() needlessly.
2013-05-14 17:58:06 +02:00
Tobias Schultze
a290f87123 [Console] fix test for NullOutput that does not print anything and add a failing test for verbosity 2013-05-14 17:31:22 +02:00
Jakub Zalas
0617ed16ce [Console] Removed the descriptor from data set providers. 2013-05-14 08:19:41 +01:00
Fabien Potencier
89c25911a9 merged branch fabpot/dep-versions (PR #8017)
This PR was merged into the master branch.

Discussion
----------

changed all version deps to accept all upcoming Symfony versions

Everything is in the title.

Commits
-------

b1c9fd2 removed versions in composer.json files
f41ac06 changed all version deps to accepts all upcoming Symfony versions
2013-05-13 20:08:42 +02:00
ramonornela
5e6245ffe1 [ADD] Component_Console -add suggest in the composer.json to event-dispatcher 2013-05-13 14:36:19 -03:00
Fabien Potencier
b1c9fd20a1 removed versions in composer.json files 2013-05-13 16:36:40 +02:00
Fabien Potencier
f41ac06531 changed all version deps to accepts all upcoming Symfony versions 2013-05-13 09:33:35 +02:00
Fabien Potencier
6d64c9a990 merged branch jakzal/bugfix/domcrawler-savehtml (PR #8013)
This PR was merged into the master branch.

Discussion
----------

[DomCrawler] Fixed the Crawler::html() method for early PHP versions

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes, but not on travis (segfault)
| Fixed tickets | #7963
| License       | MIT
| Doc PR        | -

Node argument was added to the [`DOMDocument::saveHTML()`](http://php.net/manual/en/domdocument.savehtml.php) in PHP 5.3.6. See http://php.net/manual/en/domdocument.savehtml.php.

It's not a nice looking solution, but seems to be the only option. Condition should be removed once PHP dependency goes over 5.3.6.

Commits
-------

a4e3ebf [DomCrawler] Fixed the Crawler::html() method for PHP versions earlier than 5.3.6.
2013-05-13 09:00:26 +02:00
Fabien Potencier
cfd7e8bb0d merged branch kgilden/trans-et (PR #8016)
This PR was merged into the master branch.

Discussion
----------

[Validator] added missing Estonian translations

| Q             | A
| ------------- | ---
| Fixed tickets | -
| License       | MIT

Commits
-------

fd2b260 [Validator] added missing Estonian translations
2013-05-13 08:59:30 +02:00
Kristen Gilden
fd2b2602ab [Validator] added missing Estonian translations
Estonian translations for the following validators:

-  Currency;
-  EqualTo;
-  IdenticalTo;
-  NotEqualTo;
-  NotIdenticalTo;
-  GreaterThan;
-  GreaterThanOrEqual;
-  LessThan;
-  LessThanOrEqual;
2013-05-13 03:35:41 +03:00
Jakub Zalas
a4e3ebf385 [DomCrawler] Fixed the Crawler::html() method for PHP versions earlier than 5.3.6.
Node argument was added to the DOMDocument::saveHTML() in PHP 5.3.6. See http://php.net/manual/en/domdocument.savehtml.php.
2013-05-11 21:34:40 +01:00
Fabien Potencier
a27cbd9f45 merged branch NiGGa/patch-1 (PR #8010)
This PR was merged into the master branch.

Discussion
----------

Update validators.hu.xlf

In hungarian we dont use plurals.

Commits
-------

8ac4844 Update validators.hu.xlf
2013-05-11 12:04:00 +02:00
Hoffmann András
8ac4844b04 Update validators.hu.xlf 2013-05-11 11:58:58 +02:00
Fabien Potencier
4b3ae5d1d3 merged branch jakzal/testfix/bcrypt-before-5-3-7 (PR #8009)
This PR was merged into the master branch.

Discussion
----------

[Security] Disabled the BCryptPasswordEncoder tests for PHP < 5.3.7

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

See https://github.com/ircmaxell/password_compat/issues/10#issuecomment-11203833.

Commits
-------

3beaf52 [Security] Disabled the BCryptPasswordEncoder tests for PHP versions lower than 5.3.7.
2013-05-11 08:20:17 +02:00
Jakub Zalas
3beaf52ef7 [Security] Disabled the BCryptPasswordEncoder tests for PHP versions lower than 5.3.7.
See https://github.com/ircmaxell/password_compat/issues/10#issuecomment-11203833.
2013-05-10 22:34:58 +01:00
Fabien Potencier
1c61996a5b bumped Symfony version to 2.3.0-DEV-DEV 2013-05-10 21:19:19 +02:00
Fabien Potencier
5c73a4ce77 updated VERSION for 2.3.0-BETA2 2013-05-10 20:28:48 +02:00
Fabien Potencier
79d3259d6b updated CHANGELOG for 2.3.0-BETA2 2013-05-10 20:28:17 +02:00
Fabien Potencier
78cd0452ec removed CHANGELOG for 2.0 as it is not maintained anymore 2013-05-10 20:27:49 +02:00
Fabien Potencier
498bfa33fa Merge branch '2.2'
* 2.2:
  fixed CS
  Fixed XML syntax.
  Fixed parsing of leading blank lines in folded scalars. Closes #7989.
  [Form] Fixed a method name.
  Added a test case for Loader::import().
  Fixed Loader import
  [Console] Added dedicated testcase for HelperSet class
  [Serializer] fixed CS (refs #7971)
  Fixed fatal error in normalize/denormalizeObject.
  Fixed 2 namespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-05-10 20:12:13 +02:00
Fabien Potencier
70ea5a61c5 Merge branch '2.1' into 2.2
* 2.1:
  Fixed XML syntax.
  Fixed parsing of leading blank lines in folded scalars. Closes #7989.
  Added a test case for Loader::import().
  Fixed Loader import
  [Console] Added dedicated testcase for HelperSet class
2013-05-10 20:08:31 +02:00
Fabien Potencier
a00abf6cda fixed CS 2013-05-10 18:49:00 +02:00
Fabien Potencier
a122d3148a merged branch aforsblo/translation_syntax_fix (PR #8006)
This PR was merged into the 2.1 branch.

Discussion
----------

[Validator] Fixed XML syntax in translation.

| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT

Commits
-------

0a4837d Fixed XML syntax.
2013-05-10 18:41:40 +02:00
Andreas Forsblom
0a4837dee2 Fixed XML syntax. 2013-05-10 19:13:09 +03:00
Fabien Potencier
bbdd516e63 [DomCrawler] fixed tests for previous merge 2013-05-10 17:43:46 +02:00
Fabien Potencier
cbfab7ab06 merged branch spil-giacomo/patch-1 (PR #7963)
This PR was merged into the master branch.

Discussion
----------

Update Crawler.php

If HTML is not well-formed XML parsing goes wrong.
Could be useful create another method returning XML and XHTML in a `well-formed` standard?

Commits
-------

0a26641 Update Crawler.php
2013-05-10 17:42:47 +02:00
Fabien Potencier
1da4361c23 merged branch 77web/comparison-validator-translation-ja (PR #8004)
This PR was merged into the master branch.

Discussion
----------

[Validator] added Japanese translation for comparison validators

| Q             | A
| ------------- | ---
| Fixed tickets | N/A
| License       | MIT

Commits
-------

798a5b9 [Validator] added Japanese translation for comparison validators
2013-05-10 16:30:25 +02:00
77web
798a5b9bf4 [Validator] added Japanese translation for comparison validators 2013-05-10 22:32:59 +09:00
Fabien Potencier
31138f4474 merged branch webfactory/pass-excpetions-to-monolog (PR #8000)
This PR was squashed before being merged into the master branch (closes #8000).

Discussion
----------

Pass exceptions from the ExceptionListener to Monolog

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

Pass exceptions caught by the ExceptionListener to Monolog, using the log message context. As of Monolog 1.5, exceptions passed that way will at least be logged with the line they were thrown in, also including any previous exceptions.

Getting full stack traces (as suggested in #7976) becomes a possible change at the Monolog level (see seldaek/monolog#192) or users can add their own Monolog Formatter for that.

This PR is based on master. I'd be glad to provide similar ones for 2.1/2.2 if you'd pick them. Due to recent changes in the ExceptionListener I don't think a single patch on the older branches can easily be pulled to master anyway.

Commits
-------

97bee20 Pass exceptions from the ExceptionListener to Monolog
2013-05-10 11:42:13 +02:00
Matthias Pigulla
97bee2050c Pass exceptions from the ExceptionListener to Monolog 2013-05-10 11:42:12 +02:00
Fabien Potencier
1003c39a10 uncommented a commented test 2013-05-10 11:39:39 +02:00
Fabien Potencier
5b6da97c49 merged branch alexpods/guess_client_extension_fix (PR #7990)
This PR was squashed before being merged into the master branch (closes #7990).

Discussion
----------

[HttpFoundation][File][UploadedFile] Fix guessClientExtension() method

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

1) Change getMimeType() by getClientMimeType() (we are guessing extension based on client information after all)
2) Add use of missing namespace (ExtensionGuesser)
3) Add tests for getClientExtension() method

Commits
-------

be42dbc [HttpFoundation][File][UploadedFile] Fix guessClientExtension() method
2013-05-10 08:00:03 +02:00
alexpods
be42dbc82a [HttpFoundation][File][UploadedFile] Fix guessClientExtension() method 2013-05-10 08:00:03 +02:00
Fabien Potencier
181d0c6ed0 merged branch ezzatron/yaml-folded-leading-newlines (PR #7997)
This PR was merged into the 2.1 branch.

Discussion
----------

Fixed parsing of leading blank lines in folded scalars.

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

Fixed the issue raised in #7989. The cause was in the way the parser determined the indentation level of block scalars. When the indentation is not manually specified, the parser now determines the indentation from the first *non-empty* line as per section [8.1.1.1.](http://www.yaml.org/spec/1.2/spec.html#id2793979) of the spec.

Commits
-------

a5441b2 Fixed parsing of leading blank lines in folded scalars. Closes #7989.
2013-05-10 07:57:14 +02:00
Fabien Potencier
300130a773 merged branch jakzal/form-validator-tests-fix (PR #7996)
This PR was merged into the 2.2 branch.

Discussion
----------

Fixed failing 2.2 tests

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

1858b96b7d introduced a mocked context and therefore `getExecutionContext()` is was renamed to `getMockExectionContext()`.

Commits
-------

ef87ba7 [Form] Fixed a method name.
2013-05-10 07:53:54 +02:00