Commit Graph

12007 Commits

Author SHA1 Message Date
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
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
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
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
alexpods
be42dbc82a [HttpFoundation][File][UploadedFile] Fix guessClientExtension() method 2013-05-10 08:00:03 +02:00
Erin Millard
a5441b2d57 Fixed parsing of leading blank lines in folded scalars. Closes #7989. 2013-05-10 10:09:46 +10: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
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
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
Tugdual Saunier
dd0e138f8c Eased translationNodeVisitor overriding in TranslationExtension 2013-05-09 10:16:05 +02:00
Stefan Warman
37af7714af [Console] Added dedicated testcase for HelperSet class 2013-05-09 10:10:50 +02:00
Fabien Potencier
eceec63402 merged branch dlsniper/translation-update (PR #7980)
This PR was merged into the master branch.

Discussion
----------

[Validator] Updated translation

| 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

This updates the Romanian translations to match the latest changes.

Commits
-------

3532f2d Updated translation
2013-05-09 10:09:53 +02:00
Fabien Potencier
853f681957 fixed request scope issues (refs #7457) 2013-05-09 09:53:36 +02:00
Florin Patan
3532f2de28 Updated translation 2013-05-09 10:15:42 +03:00
ikerib
971f5511e0 Basque translations for new validators from #790 2013-05-08 12:34:44 +02:00
Fabien Potencier
e3187590c0 [Serializer] fixed CS (refs #7971) 2013-05-08 10:39:40 +02:00
Lin Clark
60edc58325 Fixed fatal error in normalize/denormalizeObject. 2013-05-08 10:37:01 +02:00
Fabien Potencier
11b0758fbb merged branch hason/czech_validator (PR #7970)
This PR was merged into the master branch.

Discussion
----------

[Validator] Updated czech translation of comparison validators

Commits
-------

1416595 [Validator] Updated czech translation of comparison validators
2013-05-07 21:21:26 +02:00
Martin Hasoň
141659588a [Validator] Updated czech translation of comparison validators 2013-05-07 21:07:22 +02:00
WouterJ
1788c6bd32 Fixed 2 namespaces 2013-05-07 18:20:13 +02:00
Ricardo Oliveira
759ed17b25 [Validator] Added Portuguese translation for the comparison validators 2013-05-07 15:16:53 +01:00
Giacomo Gallico
0a266419b8 Update Crawler.php
If HTML is not well-formed XML parsing goes wrong.
2013-05-07 14:27:06 +03:00
Fabien Potencier
758e886267 merged branch vitaliytv/patch-1 (PR #7949)
This PR was merged into the master branch.

Discussion
----------

[Validator] Update validators.uk.xlf

append translation

Commits
-------

7bc9e09 Update validators.uk.xlf
2013-05-07 12:06:41 +02:00
Fabien Potencier
14cb1fa3d0 Merge branch '2.2'
* 2.2:
  bumped Symfony version to 2.1.11-DEV
  updated VERSION for 2.1.10
  update CONTRIBUTORS for 2.1.10
  updated CHANGELOG for 2.1.10
  fixed CS
  [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
  [Filesystem] Fix regression introduced in 10dea948

Conflicts:
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2013-05-06 22:03:44 +02:00
Fabien Potencier
66433c5626 Merge branch '2.1' into 2.2
* 2.1:
  bumped Symfony version to 2.1.11-DEV
  updated VERSION for 2.1.10
  update CONTRIBUTORS for 2.1.10
  updated CHANGELOG for 2.1.10
  fixed CS
  [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
  [Filesystem] Fix regression introduced in 10dea948

Conflicts:
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
2013-05-06 22:02:13 +02:00
Fabien Potencier
17a214a1c7 bumped Symfony version to 2.1.11-DEV 2013-05-06 21:45:53 +02:00
Vitaliy Tverdokhlib
7bc9e09b35 Update validators.uk.xlf
append translation
2013-05-06 15:29:08 +03:00
Fabien Potencier
7cced0a0e8 updated VERSION for 2.1.10 2013-05-06 13:01:51 +02:00
Fabien Potencier
9f522de0d5 fixed CS 2013-05-06 12:48:41 +02:00
Fabien Potencier
de98954016 merged branch stloyd/bugfix/process_tests (PR #7947)
This PR was merged into the 2.1 branch.

Discussion
----------

[Process] Cleanup tests & prevent assertion that kills randomly Travis-CI

Commits
-------

05b987f [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
2013-05-06 12:36:22 +02:00
Joseph Bielawski
05b987f381 [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI 2013-05-06 12:21:56 +02:00
Joseph Bielawski
e4913f8f04 [Filesystem] Fix regression introduced in 10dea948 2013-05-06 12:06:16 +02:00
Marco Pivetta
0aeed90e9a Dependency check should be on ProxyManager directly - fixes #7945 2013-05-06 11:51:21 +02:00
Fabien Potencier
f1c227be22 Merge branch '2.2'
* 2.2:
  added additional tests to cover invalid argument exceptions in OutputFormatterStyle component
  added a missing check for the provider key
  [Validator] fixed wrong URL for XSD
  [Validator] Fixed: $traverse and $deep is passed to the visitor from Validator::validate()
  [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
  [Form] Fixed: String validation groups are never interpreted as callbacks
  if the repository method returns an array ensure that it's internal poin...
  [Form] Improved multi-byte handling of NumberToLocalizedStringTransformer
  Fix wrong method in findTaggedServiceIds(), add example to docblock.

Conflicts:
	src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
	src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
2013-05-06 10:44:35 +02:00
Fabien Potencier
b9bc5b4770 Merge branch '2.1' into 2.2
* 2.1:
  added additional tests to cover invalid argument exceptions in OutputFormatterStyle component
  added a missing check for the provider key
  [Validator] fixed wrong URL for XSD
  [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
  [Form] Fixed: String validation groups are never interpreted as callbacks
  if the repository method returns an array ensure that it's internal poin...
  Fix wrong method in findTaggedServiceIds(), add example to docblock.

Conflicts:
	src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
2013-05-06 10:37:50 +02:00
Fabien Potencier
59867f921e merged branch fabpot/yaml-optim (PR #7935)
This PR was merged into the master branch.

Discussion
----------

made some optimization when parsing YAML files

| 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

This change makes a small speed optimization when loading a YAML file, but more important, it allows to use local stream wrappers instead of regular files on the filesystem.

Commits
-------

0586c7e made some optimization when parsing YAML files
2013-05-06 10:32:05 +02:00
Fabien Potencier
6604ff8719 merged branch pborreli/patch-9 (PR #7943)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] Reverted a part of #7931

refs: #7931

Commits
-------

09c2114 Reverted a part of f5e7f24819
2013-05-06 10:31:17 +02:00