Commit Graph

11249 Commits

Author SHA1 Message Date
Fabien Potencier
9b3525c707 merged branch xrstf/2.0 (PR #5686)
This PR was merged into the 2.0 branch.

Commits
-------

b2614aa fixed CS
e7c2e90 added doc comments

Discussion
----------

added doc comments
2012-10-06 21:50:55 +02:00
Christoph
b2614aa7e6 fixed CS 2012-10-06 14:46:45 +02:00
Christoph
65cf3a0d8a added doc comments 2012-10-06 06:44:21 +02:00
Christoph
e7c2e90069 added doc comments 2012-10-06 06:39:50 +02:00
Tobias Schultze
90145d2b71 [Routing] fix handling of two starting slashes in the pattern
It would be confused with a network path e.g. '//domain/path' when generating a path so should be prevented.
2012-10-06 01:40:30 +02:00
Fabien Potencier
65dd6e0ab3 merged branch drak/docb (PR #5672)
This PR was merged into the 2.0 branch.

Commits
-------

22c7a91 [HttpKernel][Translator] Fixed type-hints

Discussion
----------

[HttpKernel][Translator] Fixed type-hints

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

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

by drak at 2012-10-04T15:18:55Z

This PR is ready - the travis build fail is not related to this PR which is just docblock changes.

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

by pborreli at 2012-10-04T15:37:57Z

the travis build fail is indeed not related to your PR but your branch. see https://github.com/drak/symfony/blob/docb/.travis.yml

You should fetch upstream remote, merge, rebase and push again.

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

by drak at 2012-10-04T16:50:28Z

Thanks for the info, but the branch is 100% up to date with `2.0`, the file you quoted is as it is in the main repo: https://github.com/symfony/symfony/blob/2.0/.travis.yml - in any case, it doesnt affect merging this changeset.
2012-10-05 18:42:32 +02:00
Fabien Potencier
8062031a0a merged branch persand/2.1 (PR #5677)
This PR was squashed before being merged into the 2.1 branch (closes #5677).

Commits
-------

cf422bf [Validator] Updated swedish translation

Discussion
----------

[Validator] Updated swedish translation

Updated existing strings with plural translations and added some new translations as well.

https://github.com/symfony/symfony/issues/5628
2012-10-04 22:14:54 +02:00
Per Sandström
cf422bfed7 [Validator] Updated swedish translation 2012-10-04 22:14:54 +02:00
Fabien Potencier
d402e475f2 merged branch maggo/patch-1 (PR #5675)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5675).

Commits
-------

b0e4d4d Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf

Discussion
----------

[Validator] Fix and update validators.de.xlf

Adding new localized strings and fixing pluralization for german validation.
2012-10-04 19:40:30 +02:00
Marco
132ba25bbd Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
Adding new localized strings and fixing pluralization for german validation.
2012-10-04 19:40:30 +02:00
Fabien Potencier
bfc1dfa8e2 merged branch igorw/gitattributes (PR #5674)
This PR was merged into the 2.1 branch.

Commits
-------

462dddf [2.1] Exclude tests from zips via gitattributes

Discussion
----------

[2.1] Exclude tests from zips via gitattributes

See also: [Composer - Light-weight distribution packages](http://getcomposer.org/doc/02-libraries.md#light-weight-distribution-packages).
2012-10-04 17:36:05 +02:00
Igor Wiedler
462dddfac9 [2.1] Exclude tests from zips via gitattributes 2012-10-04 17:17:57 +02:00
Drak
22c7a910b8 [HttpKernel][Translator] Fixed type-hints 2012-10-04 16:11:30 +01:00
Fabien Potencier
2f497c99a9 merged branch Nercury/lt-validation-fix (PR #5670)
This PR was merged into the 2.1 branch.

Commits
-------

6a6b4ae Updated lithuanian validation translation

Discussion
----------

Updated lithuanian validation translation

Updated Lithuanian translation and added all plural form to prevent exception.
2012-10-04 11:35:12 +02:00
Nerijus Arlauskas
6a6b4aede6 Updated lithuanian validation translation 2012-10-04 12:08:15 +03:00
Fabien Potencier
b6dfa76b7d merged branch pawaclawczyk/bugfix-multiselect-setvalues (PR #5502)
This PR was squashed before being merged into the 2.1 branch (closes #5502).

Commits
-------

6200290 PSR-2 correct.
5c17388 Allows using multiselect through Form::setValues().

Discussion
----------

[DomCrawler] Allows using multiselect through Form::setValues().

Patch allows set multiple values in select using setValues() method, as it is used in Symfony\Component\BrowserKit\Client::submit().
2012-10-03 16:20:23 +02:00
Paweł Wacławczyk
74d10d666c [DomCrawler] Allows using multiselect through Form::setValues(). 2012-10-03 16:20:23 +02:00
Fabien Potencier
f90882927b merged branch kerihenare/ticket_5611 (PR #5612)
This PR was merged into the 2.0 branch.

Commits
-------

6c59fbd [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.

Discussion
----------

[HttpFoundation] Request::splitHttpAcceptHeader incorrect result order.

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

Makes items with equal q-values return in the original provided order. Fixes tests to reflect this behavior.

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

by kerihenare at 2012-10-02T20:59:11Z

To avoid confusion over the modified language test I have instead created new tests.
2012-10-03 16:08:54 +02:00
Fabien Potencier
a6ae6f6ec3 [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1) 2012-10-03 12:03:29 +02:00
Fabien Potencier
2fd699e097 merged branch fabpot/moved_optionsresolver_1 (PR #5657)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5657).

Commits
-------

939d387 Unit test for patched method OptionsResolver::validateOptionValues().
61d0f80 validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.

Discussion
----------

Patch method OptionsResover::validateOptionValues().

This PR was submitted on the symfony/OptionsResolver read-only repository and moved automatically to the main Symfony repository (closes symfony/OptionsResolver#1).

When we define allowed values for an optional option and the corresponding option was not set. On resolve, OptionsResover::validateOptionValues() was throwing a notice.
2012-10-03 11:57:12 +02:00
Olivier Maisonneuve
1d8931c79c Unit test for patched method OptionsResolver::validateOptionValues(). 2012-10-03 11:57:12 +02:00
Olivier Maisonneuve
23962fc47c validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't. 2012-10-03 11:57:12 +02:00
Fabien Potencier
f8a6cf2d31 merged branch bschussek/issue5578 (PR #5655)
This PR was merged into the 2.1 branch.

Commits
-------

2568432 [Form] Hardened code of ViolationMapper against errors

Discussion
----------

[Form] Hardened code of ViolationMapper against errors

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

This ticket improves the code of ViolationMapper to reduce the risk of bugs and in order to make further bug fixing easier. It was implemented while trying to solve #5578 and is semantically equivalent to the previous version.
2012-10-03 08:13:50 +02:00
Bernhard Schussek
2568432dd8 [Form] Hardened code of ViolationMapper against errors 2012-10-03 06:43:02 +02:00
Keri Henare
6c59fbdb59 [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
* Makes items with equal q-values return in the original provided order.
* Fixes tests to reflect this behavior
2012-10-03 09:31:34 +13:00
Fabien Potencier
566ad10f67 merged branch bschussek/issue5605 (PR #5653)
This PR was merged into the 2.1 branch.

Commits
-------

2d41229 [Form] Fixed negative index access in PropertyPathBuilder

Discussion
----------

[Form] Fixed negative index access in PropertyPathBuilder

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5605
Todo: -
License of the code: MIT
Documentation PR: -
2012-10-02 20:45:03 +02:00
Bernhard Schussek
2d412292d5 [Form] Fixed negative index access in PropertyPathBuilder 2012-10-02 20:20:14 +02:00
Fabien Potencier
5efe4037fa merged branch raresvla/master (PR #5646)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5646).

Commits
-------

4509c9e Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf

Discussion
----------

[validator] Fixed error messages for Length validator, locale: "ro"

....ro.xlf

Pluralization of $minMessage, $maxMessage and $exactMessage is required in LengthValidator.
The English version is already updated.
2012-10-02 18:39:32 +02:00
Rares Vlasceanu
ed1cf546e0 Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf
Pluralization of $minMessage, $maxMessage and $exactMessage is required in LengthValidator.
The English version is already updated.
2012-10-02 18:39:32 +02:00
Fabien Potencier
49ca648245 Merge branch '2.0' into 2.1
* 2.0:
  [2.0][http-foundation] Fix Response::getDate method
  Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
  fixed undefined variable
  hasColorSupport does not take an argument
  Improve FilterResponseEvent docblocks Response ref

Conflicts:
	tests/Symfony/Tests/Component/HttpFoundation/ResponseTest.php
2012-10-02 12:22:56 +02:00
Fabien Potencier
2f5a4d7dbc merged branch igorw/patch-1 (PR #5640)
This PR was merged into the 2.1 branch.

Commits
-------

47d7531 [2.1] Fix SessionHandlerInterface autoloading

Discussion
----------

[2.1] Fix SessionHandlerInterface autoloading

The path for 2.1 is also incorrect. For master, this was fixed in 3b47088c58. This patch adds the `target-dir` prefix to the autoloading base directory of the HttpFoundation stubs.

Note: Issue only affects 2.1, but it probably means `symfony/http-foundation` never worked on PHP 5.3.

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

by stof at 2012-10-01T14:33:18Z

@igorw Can you fix the Locale component too ?

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

by igorw at 2012-10-01T14:42:50Z

As per IRC, locale does not have autoloading for 2.1.
2012-10-01 20:40:45 +02:00
Igor Wiedler
47d7531112 [2.1] Fix SessionHandlerInterface autoloading
The path for 2.1 is also incorrect. For master, this was fixed in 3b4708. This patch adds the `target-dir` prefix to the autoloading base directory of the HttpFoundation stubs.
2012-10-01 17:30:10 +03:00
Fabien Potencier
7b22da693c merged branch jmikola/2.1-doctrine-type-option (PR #5632)
This PR was merged into the 2.1 branch.

Commits
-------

3cc3c67 [DoctrineBridge] Require class option for DoctrineType

Discussion
----------

[DoctrineBridge] Require class option for DoctrineType

This is a resubmission of #5289 against the 2.1 branch.

```
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
```

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

by stof at 2012-10-01T11:28:39Z

👍
2012-10-01 13:42:36 +02:00
Fabien Potencier
cab4f164f2 merged branch rybakit/permissions (PR #5637)
This PR was merged into the 2.1 branch.

Commits
-------

315ffc7 Remove executable bit from HttpKernel/DependencyInjection/ConfigurableExtension.php

Discussion
----------

[HttpKernel] Remove executable bit from ConfigurableExtension.php

See #5636
2012-10-01 12:59:10 +02:00
Eugene Leonovich
315ffc7f69 Remove executable bit from HttpKernel/DependencyInjection/ConfigurableExtension.php 2012-10-01 11:23:15 +02:00
Fabien Potencier
302c0e4647 merged branch benja-M-1/hotfix-response (PR #5633)
This PR was squashed before being merged into the 2.0 branch (closes #5633).

Commits
-------

5c60a65 [2.0][http-foundation] Update phpdoc
c17462f [2.0][http-foundation] Fix response getDate method

Discussion
----------

[2.0][http-foundation] Fix Response::getDate method

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

Reference #5588, #5629
2012-09-30 16:03:58 +02:00
Benjamin Grandfond
1a53b121aa [2.0][http-foundation] Fix Response::getDate method 2012-09-30 16:03:57 +02:00
Jeremy Mikola
3cc3c67e5a [DoctrineBridge] Require class option for DoctrineType 2012-09-29 16:16:47 -07:00
Fabien Potencier
4e3ea22736 [HttpFoundation] fixed the path to the SensioHandlerInterface class in composer.json 2012-09-29 18:56:30 +02:00
Fabien Potencier
5984dee719 merged branch sasezaki/ZF-4491 (PR #5222)
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #5222).

Commits
-------

60cd7c0 [HttpFoundation] Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842

Discussion
----------

[HttpFoundation] Support the new Microsoft URL Rewrite Module for IIS 7.0

@see http://framework.zend.com/issues/browse/ZF-4491
@see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
feel free, merge this or not.

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

by stloyd at 2012-08-09T09:41:18Z

Also this PR should be made against `2.0` branch.

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

by fabpot at 2012-09-18T17:24:26Z

@sasezaki Can you open a PR for the 2.0 branch? Thanks.
2012-09-28 21:25:17 +02:00
sasezaki
7444cb9725 Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842 2012-09-28 21:25:17 +02:00
Fabien Potencier
33abe78e6c merged branch h4ck3rm1k3/Undefined_Security_Http_Firewall_ContextListener3 (PR #5622)
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #5622).

Commits
-------

538f8c7 fixed undefined variable

Discussion
----------

Undefined security http firewall context listener3

Updated minimal patch,
First patch from static code analysis, $value should be $token I guess. please check.

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

by h4ck3rm1k3 at 2012-09-27T18:00:18Z

I have reverted the admin, i could create a new branch if needed. you can just cherrypick 	 e9bb5a8 that would be easier.

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

by h4ck3rm1k3 at 2012-09-27T18:29:36Z

I squashed it down to one commit. thanks for your patience and help.
2012-09-28 21:09:10 +02:00
James Michael DuPont
b3d06dda44 fixed undefined variable 2012-09-28 21:09:10 +02:00
Fabien Potencier
bd845b3bbc merged branch krmcbride/mongo-profiler (PR #5556)
This PR was merged into the 2.1 branch.

Commits
-------

c120c4d Added Base64 encoding, decoding to MongoDBProfilerStorage

Discussion
----------

[HttpKernel] Added UTF8 encoding, decoding to MongoDBProfilerStorage

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

It didn't take long for us to hit a non-utf8 error using the new `MongoDBProfilerStorage`.  I'm pretty sure the culprit was the Switfmailer DataCollector serializing a message with a PDF attachment.

I thought this would be a good failsafe, although one could ask whether mail message attachments should be serialized at all...

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

by krmcbride at 2012-09-28T17:28:02Z

Switched encoding/decoding to base64
2012-09-28 19:49:10 +02:00
Kevin McBride
c120c4d3d0 Added Base64 encoding, decoding to MongoDBProfilerStorage 2012-09-28 10:25:05 -07:00
Fabien Potencier
6f30614343 merged branch hason/crawler_mb (PR #5590)
This PR was merged into the 2.1 branch.

Commits
-------

d7623ae [DomCrawler] Added test for supported encodings by mbstring

Discussion
----------

[2.1][DomCrawler] Added test for supported encodings by mbstring

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

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

by fabpot at 2012-09-25T09:35:18Z

As this is a bug fix, it should be done on the 2.0 branch. Thanks.

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

by stof at 2012-09-25T09:41:59Z

@fabpot 2.0 does not contain the code trying to convert the encoding.
2012-09-28 19:05:17 +02:00
Fabien Potencier
0d92a24551 merged branch Nanocom/fix_console_tests (PR #5602)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5602).

Commits
-------

a7d8a74 [Console] Fix duplicated code and a field name

Discussion
----------

[Console] Fix duplicated code and a field name

* Renamed a field name in CommandTesterTest
* Deleted duplicated code in testRenderException

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

by fabpot at 2012-09-27T12:16:40Z

Can you submit this PR on the 2.1 branch as this is where it should be fixed? Thanks.
2012-09-28 16:35:16 +02:00
Arnaud Kleinpeter
f1746795d5 Fix duplicated code and a field name 2012-09-28 16:35:16 +02:00
Fabien Potencier
0671fb78a8 merged branch h4ck3rm1k3/RefactorExtract (PR #5623)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5623).

Commits
-------

4a17053 refactor src/Symfony/Component/Translation/Loader/MoFileLoader.php

Discussion
----------

Refactor extract

proposed patch for what looked falsly as usage of undefined variables (#5620)

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

by stof at 2012-09-27T18:05:22Z

could you squash your commits ?

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

by pborreli at 2012-09-27T18:12:56Z

check http://symfony.com/doc/current/contributing/code/patches.html#step-3-submit-your-patch

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

by h4ck3rm1k3 at 2012-09-27T18:18:53Z

Wow, that is nice, thanks for taking the time to teach me these tricks.
2012-09-28 16:32:19 +02:00
James Michael DuPont
4aecda3a93 refactor src/Symfony/Component/Translation/Loader/MoFileLoader.php 2012-09-28 16:32:18 +02:00