Commit Graph

7040 Commits

Author SHA1 Message Date
Fabien Potencier
4f9b9eb3f3 updated CHANGELOG for 2.0.9 2012-01-06 07:48:27 +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
208c2e468c removed the version attribute in all composer.json files 2012-01-05 14:51:20 +01:00
Fabien Potencier
2a33fbdd16 merged branch tystr/sanitize_queries_fix (PR #3032)
Commits
-------

261325d Cast $query['params'] to array to ensure it is a valid argument for the foreach.

Discussion
----------

[DoctrineBridge] Account for $query['params'] being null in DoctrineDataCollector's sanitizeQueries method

I was getting this error because inside the sanitizeQueries method of DoctrineDataCollector, there's no handling for $query['params'] being null.

ErrorException: Warning: Invalid argument supplied for foreach() in .../vendor/symfony/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php line 91
2012-01-05 14:36:06 +01:00
Fabien Potencier
cd07c9150a merged branch franmomu/2.0 (PR #3038)
Commits
-------

d0c54e1 [FrameworkBundle][translations] Updated Catalan translation

Discussion
----------

[FrameworkBundle][translations] Updated Catalan translation

Updated Catalan translation
2012-01-05 14:28:36 +01:00
Fran Moreno
d0c54e1856 [FrameworkBundle][translations] Updated Catalan translation 2012-01-05 10:07:52 +01:00
Tyler Stroud
261325d33c Cast $query['params'] to array to ensure it is a valid argument for the foreach.
This prevents errors if $query['params'] is null
2012-01-04 12:23:42 -08:00
Fabien Potencier
870ab2d11e updated vendors 2012-01-04 14:49:58 +01:00
Fabien Potencier
4e1499dd74 merged branch maastermedia/patch-1 (PR #3010)
Commits
-------

fae7157 slovenian validators translations correction

Discussion
----------

slovenian validators translations correction
2012-01-02 09:23:26 +01:00
Peter Kokot
fae715798a slovenian validators translations correction 2012-01-01 20:48:21 +01:00
Fabien Potencier
362d31d002 merged branch stloyd/skip_test (PR #3004)
Commits
-------

4c44023 [Tests] Skip segfaulting form test

Discussion
----------

[Tests] Skip segfaulting form test when using PHP <= 5.3.2

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

http://travis-ci.org/#!/stloyd/symfony/jobs/461563
2011-12-30 15:43:40 +01:00
Joseph Bielawski
4c44023e8b [Tests] Skip segfaulting form test 2011-12-30 15:36:55 +01:00
Fabien Potencier
8c4af20482 merged branch lsmith77/travis_test_5_3_2 (PR #2958)
Commits
-------

dfbed9f also test PHP 5.3.2, since this is the official lowest supported PHP version

Discussion
----------

[WIP] test with PHP 5.3.2 on travis

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: ![Build Status](https://secure.travis-ci.org/lsmith77/symfony.png?branch=travis_test_5_3_2)
Fixes the following tickets: -

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

by lsmith77 at 2011/12/25 16:29:20 -0800

Enable testing against PHP 5.3.2, not sure why its segfaulting PHPUnit. Will check with @loicfrering whats going on there.

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

by lsmith77 at 2011/12/25 17:31:04 -0800

the issue may be inside the ClassLoader .. so we might need to increase the minimal version. but this needs to be confirmed independently.
2011-12-30 14:08:00 +01:00
Fabien Potencier
094b326bf2 merged branch hhamon/browser_kit_phpdoc (PR #2991)
Commits
-------

885fa02 [BrowserKit] added missing @return PHPDoc for the Client::submit() method.

Discussion
----------

[BrowserKit] added missing @return PHPDoc for the Client::submit() method
2011-12-30 14:07:36 +01:00
Fabien Potencier
b150fe1fdd merged branch odolbeau/2.0 (PR #2993)
Commits
-------

0d3e709 Rename test file

Discussion
----------

Just rename MessageCatalogTest in MessageCatalogueTest

This time, in the correct branch...

(see: https://github.com/symfony/symfony/pull/2987)
2011-12-30 14:02:35 +01:00
Olivier Dolbeau
0d3e709e0e Rename test file 2011-12-29 16:30:31 +01:00
Hugo Hamon
885fa02871 [BrowserKit] added missing @return PHPDoc for the Client::submit() method. 2011-12-29 15:00:40 +01:00
Fabien Potencier
5106810803 merged branch Burgov/reverse_transform_test_fix_2_0 (PR #2984)
Commits
-------

ced57d8 reverse transform doesn't take a second argument

Discussion
----------

reverse transform doesn't take a second argument

as requested in https://github.com/symfony/symfony/pull/2980

when cherry-picking the earlier commit I found out that some assertSame calls had been changed into assertNull in 2.1, but not in 2.0. This will probably result in some merge problems later. Let me know if and how I should update my commit if this is the case
2011-12-29 09:19:10 +01:00
Bart van den Burg
ced57d8ee5 reverse transform doesn't take a second argument 2011-12-29 09:10:04 +01:00
Fabien Potencier
a01eee8536 merged branch ericclemmons/2884-parameterbag-with-spaces (PR #2976)
Commits
-------

85ca8e3 ParameterBag no longer resolves parameters that have spaces.
99011ca Added tests for ParameterBag parameters with spaces

Discussion
----------

[DependencyInjection] Parameters with spaces are not resolved

Bug fix: yes
Feature addition: no
Backwards compatibility break: no (not likely, according to convention)
Symfony2 tests pass: yes
Fixes the following tickets: #2884

`ParameterBag` currently resolves anything between two `%` signs, which creates issues for any parameters in the DIC that are legitimate text.  This PR enforces the [documented parameter convention](http://symfony.com/doc/2.0/book/service_container.html#service-parameters) so that only `%parameters.with.no_spaces%` are resolved.

I was considering using instead `^%([^\w\._-]+)%$`, but felt that was too constricting & could easily introduce issues with existing applications.
2011-12-28 21:36:04 +01:00
Fabien Potencier
48203fc1a2 merged branch havvg/patch-1 (PR #2957)
Commits
-------

41950a6 [WebProfilerBundle] add margin-bottom to caption

Discussion
----------

[WebProfilerBundle] add margin-bottom to caption

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

by fabpot at 2011/12/26 13:15:57 -0800

What does it fix?

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

by havvg at 2011/12/27 02:46:16 -0800

Just a minor design issue with table captions.

Without: http://dl.dropbox.com/u/548684/PR2957/without-margin.png
With: http://dl.dropbox.com/u/548684/PR2957/with-margin.png

I currently hold it in a custom css, but thought it is generic enough to be put into the bundle.

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

by henrikbjorn at 2011/12/27 04:03:53 -0800

@havvg What custom bundle is that ? and what does it show? look interesting

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

by havvg at 2011/12/27 04:40:18 -0800

@henrikbjorn It's a bundle (not published yet, https://github.com/havvg/HavvgCloudcontrolBundle) adding features to fully utilize applications on http://cloudcontrol.com PaaS.
2011-12-28 20:42:42 +01:00
Fabien Potencier
e6c6b46ae9 merged branch aerialls/check_cs_fix (PR #2975)
Commits
-------

0797564 [Check CS] don't replace 'else if' on twig files (closes #2961)

Discussion
----------

[Check CS] don't replace 'else if' on twig files (closes #2961)
2011-12-28 20:40:59 +01:00
Fabien Potencier
6c96ccef4f merged branch javiereguiluz/phpdoc-console-component (PR #2978)
Commits
-------

3f2e1b0 [Console] Updated tests to reflect the change from `program` to `application`
2b64944 [Console][Output] Fixed some minor typos and grammatical errors
96997f1 [Console][Input] Added missing PHPDoc and fixed some minor typos and grammatical errors
855b8af [Console][Helper] Added missing PHPDoc and fixed some minor typos and grammatical errors
3ad02bd [Console][Formatter] Added missing PHPDoc @throws and fixed some minor typos and grammatical errors
33e3f11 [Console] Added a missing PHPDoc and replaced `program` by `application`

Discussion
----------

[Console] Fixed and completed PHPDoc

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

Fixes the following tickets: -

* Fixed minor typos and grammatical errors
* Added missing PHPDoc for some methods
* Added missing @throws
2011-12-28 20:38:46 +01:00
Javier Eguíluz
3f2e1b0483 [Console] Updated tests to reflect the change from program to application 2011-12-28 12:44:00 +01:00
Javier Eguíluz
2b64944fd7 [Console][Output] Fixed some minor typos and grammatical errors 2011-12-28 10:42:15 +01:00
Javier Eguíluz
96997f12d6 [Console][Input] Added missing PHPDoc and fixed some minor typos and grammatical errors 2011-12-28 10:39:14 +01:00
Javier Eguíluz
855b8af776 [Console][Helper] Added missing PHPDoc and fixed some minor typos and grammatical errors 2011-12-28 10:33:49 +01:00
Javier Eguíluz
3ad02bd5f9 [Console][Formatter] Added missing PHPDoc @throws and fixed some minor typos and grammatical errors 2011-12-28 10:29:22 +01:00
Javier Eguíluz
33e3f11f48 [Console] Added a missing PHPDoc and replaced program by application 2011-12-28 10:22:28 +01:00
Eric Clemmons
85ca8e3615 ParameterBag no longer resolves parameters that have spaces.
They must be strictly "%some.parameter%" or similar.
2011-12-27 12:49:22 -08:00
Eric Clemmons
99011ca9c9 Added tests for ParameterBag parameters with spaces 2011-12-27 12:48:49 -08:00
Julien Brochet
0797564208 [Check CS] don't replace 'else if' on twig files (closes #2961) 2011-12-27 16:10:32 +01:00
Fabien Potencier
f458e96f93 changed composer.json max version for Twig 2011-12-27 13:23:51 +01:00
Fabien Potencier
c92d75f6dd [TwigBridge] changed composer.json max version for Twig 2011-12-27 12:11:50 +01:00
Fabien Potencier
b254851e91 merged branch lsmith77/forward_compat_filesystem (PR #2971)
Commits
-------

aacb2de use the forward compat version in the Filesystem service

Discussion
----------

use the forward compat version in the Filesystem service

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: ![Build Status](https://secure.travis-ci.org/lsmith77/symfony.png?branch=forward_compat_filesystem)
Fixes the following tickets: -

by changing the service it should fix any type hints for the Filesystem class inside 2.1, but it shouldn't affect anyone still type hinting the old location in 2.0 since the new forward compat file extends the old file.

See
00c988bf0c (commitcomment-820879)

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

by tobiassjosten at 2011/12/26 18:41:45 -0800

👍
2011-12-27 10:01:26 +01:00
lsmith77
aacb2deb20 use the forward compat version in the Filesystem service 2011-12-27 00:32:17 +01:00
Fabien Potencier
aa74e90772 merged branch javiereguiluz/add-unique-entity-spanish-translation (PR #2968)
Commits
-------

eb2d6e6 [FrameworkBundle] Added UniqueEntity message translation for Spanish

Discussion
----------

[FrameworkBundle] Added UniqueEntity message translation for Spanish
2011-12-26 21:56:59 +01:00
Javier Eguíluz
eb2d6e6f2f [FrameworkBundle] Added UniqueEntity message translation for Spanish 2011-12-26 20:39:34 +01:00
Fabien Potencier
fb374c1395 merged branch weaverryan/parameter_bag_phpdoc (PR #2965)
Commits
-------

a9b54df [HttpFoundation] Adding some additional PHPDoc to ParameterBag

Discussion
----------

Parameter bag phpdoc

Hi guys!

Very basic - just noticed that a few spots were a little light in PHPDoc while doing some docs stuff. Especially with core components that are being used by other groups, loading up on more PHPDoc may be a good idea where it's light.

Thanks!
2011-12-26 19:29:16 +01:00
Ryan Weaver
a9b54dfa4b [HttpFoundation] Adding some additional PHPDoc to ParameterBag 2011-12-26 12:25:02 -06:00
Fabien Potencier
5b4e6190c4 updated VERSION for 2.0.8 2011-12-26 11:56:10 +01:00
Fabien Potencier
6aee905588 update CONTRIBUTORS for 2.0.8 2011-12-26 11:55:48 +01:00
Fabien Potencier
59663c604a updated CHANGELOG for 2.0.8 2011-12-26 11:54:39 +01:00
Fabien Potencier
e5c44e261e updated vendors for 2.0.8 2011-12-26 11:50:33 +01:00
lsmith77
dfbed9f91d also test PHP 5.3.2, since this is the official lowest supported PHP version 2011-12-26 01:15:21 +01:00