Commit Graph

8098 Commits

Author SHA1 Message Date
Matt Robinson
0507840b67 Prevent parameters from overwriting the template filename.
Fixes a potential arbitrary file execution exploit.
2012-01-09 11:40:00 +00:00
Fabien Potencier
4ad7e0e4dd merged branch Seldaek/console_opts2 (PR #3061)
Commits
-------

c7ab9ba [Console] Allow redefinition of application options descriptions

Discussion
----------

[Console] Allow redefinition of application options descriptions

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes

This allows you to redefine an `InputOption` as long as it keeps the same semantic (same default, same name, same alias, same modes). There are two purposes:

- Modifying the description with a more accurate one
- Making sure the option appears in your commands' help

Concrete example: I often want to provide a verbose version of commands. It's an elegant and very common pattern, but I basically can't document what is going to happen if you do `--verbose` since the base Application already defines `--verbose`. Also the `--verbose` option does not appear when you do `console <command> --help`, which means people probably won't think of using that option.
2012-01-09 12:31:41 +01:00
Fabien Potencier
61975a1b3d [Console] tweaked previous merge 2012-01-09 12:22:03 +01:00
Fabien Potencier
4f8f2d4f47 merged branch Seldaek/console_opts (PR #3060)
Commits
-------

7f7b853 [Console] Format simple arrays nicer

Discussion
----------

[Console] Format simple arrays nicer

Minor cosmetic adjustment for simple (i.e. with sequential numeric keys) arrays
2012-01-09 12:15:01 +01:00
Fabien Potencier
2f0afb2b5a fixed CS 2012-01-09 12:13:49 +01:00
Fabien Potencier
e8d1bd2902 merged branch weaverryan/security-phpdoc (PR #3055)
Commits
-------

8ee9161 [Security] Adding more extensive PHPDoc to UserInterface, AdvancedUserInterface and UserProviderInterface

Discussion
----------

More extensive PHPDoc for Security interfaces

Hey guys!

We've started to get into the habit of documenting interfaces and methods in the official docs. I think these things should be omitted from the documentation entirely, and replaced with a link to API docs that rock (I've started doing this already).

This PR just takes some of the details we have in the docs and pushes them back as PHPDoc. I use `@see`, `<code>` and changed a particular `@throws` to have a FQ class name since there's no `use` statement.

Thanks!

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

by weaverryan at 2012/01/07 20:24:15 -0800

Ok, updated and I think it's clearer now.

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

by fabpot at 2012/01/07 23:29:45 -0800

@weaverryan Great! I think that's a really good idea to document interfaces in the API, that makes a lot of sense.

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

by maastermedia at 2012/01/08 02:10:04 -0800

+1 Symfony API needs that atention also, yes. Thank you.

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

by lsmith77 at 2012/01/08 11:45:04 -0800

@fabpot: but then we should also add a list of interfaces to the API http://screencast.com/t/vu4Tljkri0
2012-01-09 12:10:47 +01:00
Fabien Potencier
dc65b3478f merged branch maastermedia/translations (PR #3064)
Commits
-------

10ecaba slovenian validators.xlf updated

Discussion
----------

Validators.sl.xlf updated

PR sent intentionally to symfony:master because of different translations set in translations.XYZ.xlf and translations.XYZ.xliff in current 2.0 branch.
2012-01-09 12:00:40 +01:00
Fabien Potencier
ca8dc87940 merged 2.0 2012-01-09 11:51:30 +01:00
Fabien Potencier
40053bca03 merged branch Seldaek/console_tests_2_0 (PR #3066)
Commits
-------

c9129e5 Fix Console tests on windows

Discussion
----------

Fix Console tests on windows (2.0)

Rebased #3059 on 2.0 - once this is applied I will rebase it again because some of the fixes could not be applied to 2.0.
2012-01-09 11:49:57 +01:00
Fabien Potencier
b7a8f6d2cd merged branch hhamon/commands_description_fixes (PR #3065)
Commits
-------

96425b0 [SwiftmailerBundle] harmonized commands descriptions.
7eb1c43 [FrameworkBundle] harmonized commands descriptions.
0829094 [DoctrineBundle] harmonized commands descriptions.

Discussion
----------

Commands description fixes
2012-01-09 11:49:47 +01:00
Hugo Hamon
96425b01f7 [SwiftmailerBundle] harmonized commands descriptions. 2012-01-09 10:05:25 +01:00
Jordi Boggiano
c9129e51fe Fix Console tests on windows 2012-01-09 10:04:20 +01:00
Hugo Hamon
7eb1c436ae [FrameworkBundle] harmonized commands descriptions. 2012-01-09 10:01:34 +01:00
Hugo Hamon
082909417b [DoctrineBundle] harmonized commands descriptions. 2012-01-09 10:01:09 +01:00
Peter Kokot
10ecaba75d slovenian validators.xlf updated 2012-01-09 09:15:10 +01:00
Fabien Potencier
d7fa66acb5 merged branch ericclemmons/2863-getsetmethodnormalize-lcfirst (PR #3051)
Commits
-------

707bcc3 Updated CHANGELOG with GetSetNormalizer BC change
85bf553 GetSetMethodNormalizer uses lcfirst instead of strtolower when computing method names
01fcb1b Updated GetSetMethodNormalizerTest to expect camelCased functions instead of lowercased

Discussion
----------

[Serializer] GetSetMethodNormalizer uses `lcfirst` instead of `strtolower` (on master)

Bug fix: yes
Feature addition: no
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #2863

Rebased PR #2977 onto `master` (was on `2.0`).

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

by fabpot at 2012/01/06 10:57:23 -0800

Can you add a note in the CHANGELOG to explain the change and the potential BC break?

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

by ericclemmons at 2012/01/08 13:34:17 -0800

@fabpot Updated `CHANGELOG-2.1` since this is going onto `master`.

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

by stof at 2012/01/08 13:48:59 -0800

@ericclemmons you should rebase your branch on top of master. github says it cannot be merged as is

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

by ericclemmons at 2012/01/08 14:02:11 -0800

@stof Done.  (There was another Serializer entry in the CHANGELOG that didn't exist when I made this branch.)
2012-01-09 08:10:32 +01:00
Fabien Potencier
21993aa670 merged branch Tobion/assert-fix (PR #3063)
Commits
-------

1728493 made the assertions in the RequestTest more explicit and improved PHPDoc

Discussion
----------

made the assertions in the RequestTest more explicit and improved PHPDoc

as discussed in 4f1edb50d8 (comments)
2012-01-09 08:09:34 +01:00
Fabien Potencier
0336bdc7b0 merged branch maastermedia/translations (PR #3062)
Commits
-------

620a354 slovenian translations updated

Discussion
----------

Slovenian translations updated
2012-01-09 08:05:10 +01:00
Tobias Schultze
17284937f6 made the assertions in the RequestTest more explicit and improved PHPDoc 2012-01-09 06:33:53 +01:00
Peter Kokot
620a354026 slovenian translations updated 2012-01-09 03:02:36 +01:00
Jordi Boggiano
c7ab9ba7ec [Console] Allow redefinition of application options descriptions 2012-01-09 00:42:35 +01:00
Jordi Boggiano
7f7b853d79 [Console] Format simple arrays nicer 2012-01-09 00:03:43 +01:00
Eric Clemmons
707bcc3be2 Updated CHANGELOG with GetSetNormalizer BC change 2012-01-08 14:01:05 -08:00
Eric Clemmons
85bf553cca GetSetMethodNormalizer uses lcfirst instead of strtolower when computing method names 2012-01-08 13:55:41 -08:00
Eric Clemmons
01fcb1bdd7 Updated GetSetMethodNormalizerTest to expect camelCased functions instead of lowercased 2012-01-08 13:55:41 -08:00
Fabien Potencier
8ce034fae0 Revert "merged 2.0"
This reverts commit 7000e944fd, reversing
changes made to 9d9013d662.
2012-01-08 20:43:02 +01:00
Ryan Weaver
8ee9161e6b [Security] Adding more extensive PHPDoc to UserInterface, AdvancedUserInterface and UserProviderInterface 2012-01-07 22:23:05 -06:00
Fabien Potencier
561cde7743 merged branch digitalkaoz/bugfix_2730_v4 (PR #3052)
Commits
-------

9441c46 [DependencyInjection] PhpDumper, fixes #2730

Discussion
----------

[DependencyInjection] PhpDumper, fixes #2730

Hey, this PR fixes #2730, if no parameters are set, the constructor wont get passed a ParameterBag

Bug fix: yes (#2730)
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

3rd and last try ;) this time i think its all fine
2012-01-07 16:41:16 +01:00
Fabien Potencier
4f1edb50d8 merged branch stof/issue_3053 (PR #3054)
Commits
-------

9bc41d0 [HttpFoundation] Fixed #3053

Discussion
----------

[HttpFoundation] Fixed #3053
2012-01-07 16:40:58 +01:00
Fabien Potencier
7e7244ea53 merged branch canni/empty_root_form_name (PR #2936)
Commits
-------

3702541 Add tests
4f38b14 Remove `elseif`
a5efe6a Add info to CHANGELOG-2.1
3d20e39 [Form] Enable empty root form name

Discussion
----------

[Form] Enable empty root form name

BC Break: no
Feature addition: yes
Symfony2 tests pass: yes
Fixes the following issues: #2790
Todo: need more testing

This PR enables usage of empty string as a form name (only at root level).

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

by canni at 2011/12/21 09:44:51 -0800

@stof corrected

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

by canni at 2012/01/03 01:23:37 -0800

@Tobion corrected, thx

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

by fabpot at 2012/01/05 19:22:25 -0800

@canni: Can you add some unit tests for this new feature? Thanks.

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

by canni at 2012/01/06 03:09:39 -0800

@fabpot Will do :)

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

by canni at 2012/01/07 07:36:10 -0800

@fabpot done.
2012-01-07 16:40:10 +01:00
Dariusz Górecki
3702541b5a Add tests 2012-01-07 16:30:46 +01:00
Dariusz Górecki
4f38b14e7d Remove elseif 2012-01-07 15:13:48 +01:00
Dariusz Górecki
a5efe6acda Add info to CHANGELOG-2.1 2012-01-07 15:13:48 +01:00
Dariusz Górecki
3d20e399e9 [Form] Enable empty root form name
BC Break: no
Feature addition: yes
Symfony2 tests pass: yes
Fixes the following issues: #2790
Todo: need more testing

This PR enables usage of empty string as a form name (only at root level).
2012-01-07 15:13:48 +01:00
Christophe Coevoet
9bc41d00d1 [HttpFoundation] Fixed #3053 2012-01-07 14:27:33 +01:00
digitalkaoz
9441c46bb6 [DependencyInjection] PhpDumper, fixes #2730 2012-01-06 21:20:08 +01:00
Fabien Potencier
c637869c95 merged branch vicb/test/TwigBridge (PR #3044)
Commits
-------

dcee6ff [TwigBridge] Improve test coverage

Discussion
----------

[TwigBridge] Improve test coverage

related to https://github.com/fabpot/Twig/issues/580

[Travis is happy](http://travis-ci.org/#!/vicb/symfony/builds/484594) but it seems he doesn't like branch name with `/` when displaying status images.

It could have been submitted against 2.0 but there is an issue here: the bridge is tied to Twig so that would mean testing against every single Twig version shipped with 2.0 which I don't want.

I have "solved" the issue by ensuring that Twig version is at least 1.5.0 in the tests set up. This is not a perfect solution but I can not imagine something better for now.
2012-01-06 12:51:04 +01:00
Victor Berchet
dcee6fffea [TwigBridge] Improve test coverage 2012-01-06 08:35:36 +01:00
Fabien Potencier
3e9d937eb8 updated VERSION for 2.0.9 2012-01-06 07:49:25 +01:00
Fabien Potencier
ec472913ee update CONTRIBUTORS for 2.0.9 2012-01-06 07:49:05 +01:00
Fabien Potencier
4f9b9eb3f3 updated CHANGELOG for 2.0.9 2012-01-06 07:48:27 +01:00
Fabien Potencier
5b566f84b6 merged branch antonbabenko/master (PR #2995)
Commits
-------

1cd74ec Added norwegian translations of validators

Discussion
----------

Added norwegian translations of validators

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

by stof at 2011/12/29 10:14:43 -0800

Can you send a PR to the 2.0 branch instead of master to add these translation for the ids 1 to 41 (missing in your PR btw) ? and then another PR to master for the ids 42 to 48 which are new for 2.1 ?

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

by antonbabenko at 2011/12/29 10:59:39 -0800

Ok, will do, but where can I find the correct original one ? I took german file as the most complete. Some languages have different amount of phrases and sources.

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

by javiereguiluz at 2011/12/29 11:23:04 -0800

@antonbabenko you can use the Spanish translation as an example (it was updated very recently and I initially made the same mistake ;) ):

  * #2968 for 2.0 branch (added id 41)
  * #2969 for master branch (added ids 42 - 48)

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

by antonbabenko at 2011/12/29 11:28:03 -0800

Thanks Javier.
2012-01-06 04:21:06 +01:00
Fabien Potencier
0492290a3b [Console] added a missing method (closes #3043) 2012-01-06 04:12:25 +01:00
Fabien Potencier
4c6c22166a merged branch Tobion/patch-4 (PR #3042)
Commits
-------

daee68a fixed typos and unified PHPDoc in the Response class

Discussion
----------

fix typos in Response
2012-01-06 04:09:51 +01:00
Tobias Schultze
daee68a54e fixed typos and unified PHPDoc in the Response class 2012-01-05 23:17:04 +01:00
Fabien Potencier
3e24636904 merged branch justinrainbow/2_0_framework_bundle_fix (PR #3039)
Commits
-------

7c8bd3d [FrameworkBundle] Invalid composer ref fix

Discussion
----------

[FrameworkBundle] Invalid composer ref fix

Changes the `composer.json` reference in the FrameworkBundle to use the `symfony/translation` package rather than the current `symfony/translator` (which doesn't exist).
2012-01-05 17:11:25 +01:00
Justin Rainbow
7c8bd3d917 [FrameworkBundle] Invalid composer ref fix
The composer.json was referencing a "symfony/translator" package
which does not exist.  This has been updated to use the
"symfony/translation" package.
2012-01-05 09:00:58 -07:00
Fabien Potencier
e09b5231d3 updated Twig to 1.5.1 to fix a regression 2012-01-05 16:02:00 +01:00
Fabien Potencier
85a5f1533b fixed previous merge 2012-01-05 14:55:00 +01:00
Fabien Potencier
7000e944fd merged 2.0 2012-01-05 14:54:04 +01:00