Commit Graph

14484 Commits

Author SHA1 Message Date
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
Grégoire Pineau
6526166b05 [Console] Added status code to CommandTester and ApplicationTester
Theses classes are already statefull. They contain the input and the
output data. So we can safely add the last status code to the class.
2013-05-13 14:22:46 +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
Aleksey Podskrebyshev
a644516c5c [HttpFoundation][NamespacedAttributeBag] Refactoring of resolveKey() method 2013-05-10 16:58:21 +04: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
Fabien Potencier
db8a25b331 merged branch stof/composer_replace (PR #7995)
This PR was merged into the master branch.

Discussion
----------

Added the replace constraint for ProxyManagerBridge

Commits
-------

912a383 Added the replace constraint for ProxyManagerBridge
2013-05-10 07:53:16 +02:00
Erin Millard
a5441b2d57 Fixed parsing of leading blank lines in folded scalars. Closes #7989. 2013-05-10 10:09:46 +10:00
Christophe Coevoet
912a383c5f Added the replace constraint for ProxyManagerBridge 2013-05-10 01:04:29 +02:00
Jakub Zalas
ef87ba7913 [Form] Fixed a method name.
1858b96b7d introduced a mocked context and therefore getExecutionContext() is now called getMockExectionContext().
2013-05-10 00:02:36 +01:00
Fabien Potencier
d2a542c5bb merged branch jakzal/loader-fix (PR #7987)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7987).

Discussion
----------

[Config] FIxed Loader::import()

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? |no
| Tests pass?   | yes
| Fixed tickets | fixes #7965, replaces #7983
| License       | MIT
| Doc PR        | -

Commits
-------

984e56a [Config] Added a test case for Loader::import().
2f69860 [Config] Fixed Loader import
2013-05-09 17:22:40 +02:00
Jakub Zalas
c93b9f72e5 Added a test case for Loader::import(). 2013-05-09 17:22:40 +02:00
Myke79
e8d5d16a13 Fixed Loader import 2013-05-09 17:22:40 +02:00
Fabien Potencier
7fc0768b48 merged branch fabpot/console-fix (PR #7982)
This PR was merged into the master branch.

Discussion
----------

Console fix

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes (possibly)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | symfony/symfony-standard#256
| License       | MIT
| Doc PR        | n/a

Everything is explained in the commits.

Commits
-------

bd0c48c [Console] moved the IO configuration to its own method
fdb4b1f [Console] moved --help support to allow proper behavior with other passed options
2013-05-09 15:01:06 +02:00
Fabien Potencier
d8d38e33f6 merged branch jakzal/httpkernel-tests-fix (PR #7984)
This PR was merged into the master branch.

Discussion
----------

[HttpKernel] Fixed ContainerAwareHttpKernelTest

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes, although not all of them yet (security tests fail on PHP 5.3.3)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

d5e7bdf [HttpKernel] Fixed ContainerAwareHttpKernelTest.
2013-05-09 13:25:34 +02:00
Jakub Zalas
d5e7bdf5ee [HttpKernel] Fixed ContainerAwareHttpKernelTest. 2013-05-09 11:31:24 +01:00
Fabien Potencier
bd0c48cc00 [Console] moved the IO configuration to its own method
The IO configuration was also moved earlier in the process so that
options are taken into account as early as possible.

That's useful for instance in Symfony FrameworkBundle, where
commands are registered in the doRun() method. If an exception
occurs during registration, the -q, -v, ... options would not
have any effect.
2013-05-09 11:00:31 +02:00
Fabien Potencier
fdb4b1fd75 [Console] moved --help support to allow proper behavior with other passed options 2013-05-09 10:42:56 +02:00
Fabien Potencier
af4c9d6626 merged branch tucksaun/patch-1 (PR #7952)
This PR was submitted for the 2.1 branch but it was merged into the master branch instead (closes #7952).

Discussion
----------

[TwigBridge] Make getNodeVisitors call getTranslationNodeVisitor()

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Applies to | 2.1+
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

Commits
-------

20977e2 [TwigBridge] Eased translationNodeVisitor overriding in TranslationExtension
2013-05-09 10:16:05 +02:00
Tugdual Saunier
dd0e138f8c Eased translationNodeVisitor overriding in TranslationExtension 2013-05-09 10:16:05 +02:00
Fabien Potencier
9db13c6940 merged branch warmans/component_console_helper_helperset_tests_2.1 (PR #7969)
This PR was squashed before being merged into the 2.1 branch (closes #7969).

Discussion
----------

[Console] Added dedicated testcase for HelperSet class

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

Previously the HelperSet class was only tested by way of the Application testcase. This patch adds a dedicated testcase and increases test coverage of the class to 100%.

Commits
-------

37af771 [Console] Added dedicated testcase for HelperSet class
2013-05-09 10:10:51 +02:00
Stefan Warman
37af7714af [Console] Added dedicated testcase for HelperSet class 2013-05-09 10:10:50 +02:00