Commit Graph

14105 Commits

Author SHA1 Message Date
Fabien Potencier 743a15439d merged branch pborreli/patch-9 (PR #7770)
This PR was merged into the 2.1 branch.

Discussion
----------

Removed trailing whitespace

Commits
-------

20d6fd8 Removed trailing whitespace
2013-04-21 16:27:47 +02:00
Pascal Borreli 20d6fd8987 Removed trailing whitespace 2013-04-21 14:22:56 +00:00
Fabien Potencier f9603a6fa8 merged branch kgilden/trans_et (PR #7769)
This PR was merged into the 2.1 branch.

Discussion
----------

[Validator] added missing estonian translation of messages

| Q             | A
| ------------- | ---
| Fixed tickets | -
| License       | MIT

Commits
-------

efff50a [Validator] added missing estonian translation of messages
2013-04-21 16:13:54 +02:00
Kristen Gilden efff50ae69 [Validator] added missing estonian translation of messages 2013-04-21 16:56:15 +03:00
Fabien Potencier c9e049b739 merged branch pborreli/grammar-typo (PR #7768)
This PR was merged into the master branch.

Discussion
----------

Fixed typos

Commits
-------

0a12fd6 Fixed typos
2013-04-21 15:28:06 +02:00
Pascal Borreli 0a12fd619e Fixed typos 2013-04-21 13:23:54 +00:00
Fabien Potencier dbcaa0353a merged branch pborreli/phpdocs (PR #7764)
This PR was merged into the master branch.

Discussion
----------

Fixed PHPDocs

Commits
-------

7cfa661 Fixed PHPDocs
2013-04-21 14:49:12 +02:00
Pascal Borreli 7cfa66159e Fixed PHPDocs 2013-04-21 12:26:17 +00:00
Fabien Potencier a876c8a12e merged branch WouterJ/patch-2 (PR #7762)
This PR was merged into the master branch.

Discussion
----------

[VALIDATOR] Dutch translation of ISSN message

Added dutch translation of the ISSN message (added in #7756 )

Commits
-------

d336979 [VALIDATOR] Dutch translation of ISSN message
2013-04-21 14:23:03 +02:00
Fabien Potencier a2d9599cfa merged branch XWB/dutch-typo (PR #7763)
This PR was merged into the master branch.

Discussion
----------

Fixed Dutch translation of IBAN message

Commits
-------

7e9fc23 Fixed Dutch translation of IBAN message
2013-04-21 14:22:55 +02:00
Karel Souffriau 7e9fc23eb4 Fixed Dutch translation of IBAN message 2013-04-21 14:12:37 +02:00
Wouter J d336979b8a [VALIDATOR] Dutch translation of ISSN message 2013-04-21 14:37:54 +03:00
Fabien Potencier 39dfbf682c merged branch pborreli/typos-isbn (PR #7761)
This PR was merged into the master branch.

Discussion
----------

Fixed typos

Sorry for the multiple PRs

Commits
-------

6ef7f10 Fixed typos
2013-04-21 13:21:42 +02:00
Fabien Potencier a4abfb9550 [Validator] tweaked ISSN validator (refs #7756) 2013-04-21 13:20:34 +02:00
Pascal Borreli 6ef7f10628 Fixed typos 2013-04-21 11:14:35 +00:00
Fabien Potencier b7e1c916ab merged branch pborreli/typo-issn (PR #7760)
This PR was merged into the master branch.

Discussion
----------

Fixed typo

Commits
-------

b5c8739 Fixed typo
2013-04-21 13:08:38 +02:00
Pascal Borreli b5c87396b7 Fixed typo 2013-04-21 10:57:29 +00:00
Fabien Potencier 909b810302 [Validator] fixed CS, updated CHANGELOG 2013-04-21 12:48:25 +02:00
Fabien Potencier a6edc3dfca merged branch ajgarlag/feature/issn-validator (PR #7756)
This PR was squashed before being merged into the master branch (closes #7756).

Discussion
----------

[Validator] Added ISSN Validator

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

This PR complements the ISBN validator added some months ago to allow validation of relevant library systems data.

Commits
-------

77f62ec [Validator] Added ISSN Validator
2013-04-21 12:42:55 +02:00
Antonio J. García Lagar 77f62ec740 [Validator] Added ISSN Validator 2013-04-21 12:42:55 +02:00
Fabien Potencier ec01e479c4 [Console] made the shel prompt easily customizable (closes #7710) 2013-04-21 12:38:46 +02:00
Fabien Potencier d5801a2575 merged branch Aitboudad/patch-1 (PR #7758)
This PR was merged into the master branch.

Discussion
----------

[Validator] Added Arabic translations for IBAN & ISBN messages

Commits
-------

fd9eaae [Validator] Added Arabic trans of ISBN validator
2013-04-21 12:18:17 +02:00
Fabien Potencier a6ebbc9c8a merged branch jskvara/master (PR #7757)
This PR was merged into the master branch.

Discussion
----------

[Validator] Added Czech translations for IBAN and ISBN validators

Added Czech translations for IBAN and ISBN validators

Commits
-------

565f612 [Validator] Added Czech translations of IBAN and ISBN
2013-04-21 12:18:09 +02:00
Abdellatif AitBoudad fd9eaaee16 [Validator] Added Arabic trans of ISBN validator 2013-04-21 10:12:31 +00:00
jskvara 565f6120d0 [Validator] Added Czech translations of IBAN and ISBN 2013-04-21 11:50:43 +02:00
Fabien Potencier d4d79ab707 merged branch dbu/fix-doctrine-register-mappings-pass (PR #7755)
This PR was merged into the master branch.

Discussion
----------

fix register mappings pass to only register mappings with one object manager

| Q             | A
| ------------- | ---
| Bug fix?      |  yes
| New feature?  | no
| BC breaks?    | yes (but feature is totally new)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7599
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/2507

This PR fixes the issues @Stof discovered in #7599 - we now introduce a way to only register the mappings with one of the object managers.

Commits
-------

fc12bd1 fix register mappings pass to only register mappings with one object manager
2013-04-21 11:17:18 +02:00
Fabien Potencier de956b6e12 merged branch hason/process (PR #6796)
This PR was merged into the master branch.

Discussion
----------

[Process] Added ProcessUtils::escapeArgument() to fix the bug in escapeshellarg() function on Windows

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

Commits
-------

a557b89 [Process] Added ProcessUtils::escapeArgument() to fix the bug in escapeshellarg() function on Windows
2013-04-21 10:43:42 +02:00
David Buchmann fc12bd1316 fix register mappings pass to only register mappings with one object manager 2013-04-21 10:43:42 +02:00
Fabien Potencier da5022ccce [HttpKernel] added some comments to explain the rationale behind the previous merge change 2013-04-21 10:38:16 +02:00
Fabien Potencier 5ad5a5ca48 merged branch bamarni/http-kernel-lazy-classmap (PR #7322)
This PR was merged into the master branch.

Discussion
----------

[HttpKernel] made the classmap lazy-loaded

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [yes]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| License       | MIT

see https://github.com/symfony/symfony-standard/pull/437#issuecomment-14667140

Instead of managing this from HttpCache, I suggest to handle it at Kernel's level, what do you think?

Commits
-------

2aefe21 [HttpKernel] made the classmap lazy-loaded
2013-04-21 10:36:53 +02:00
Fabien Potencier 46ac2f0e42 [TwigBundle] removed @ when defining an autoescaping service, and fixed XSD to use - instead of _ 2013-04-21 10:18:50 +02:00
Fabien Potencier 898a63c8f0 merged branch maxbeutel/pr/custom-template-escaping (PR #7479)
This PR was merged into the master branch.

Discussion
----------

[TwigBundle] Make twig extension handle custom template escaping guesser

I wanted to add a custom template escaping guesser for twig like in http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy

This pull request allows you register a service id and a method as a custom guesser:

    twig:
        autoescape: my_service:guess

Documentation is missing for this PR and the unit tests are not that good. I´d work on it if this PR has any chance of getting merged?

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

Commits
-------

c2c1ed0 make twig extension handle custom template escaping guesser
2013-04-21 10:14:24 +02:00
Fabien Potencier d604af19ef [Serializer] fixed CS 2013-04-21 10:13:22 +02:00
Fabien Potencier 8e8e3772dc merged branch felicitus/master (PR #7494)
This PR was squashed before being merged into the master branch (closes #7494).

Discussion
----------

[master] Better documentation for

Fixes #7492

Commits
-------

b1e14b2 [master] Better documentation for
2013-04-21 10:11:27 +02:00
Felicitus b1e14b27ba [master] Better documentation for 2013-04-21 10:11:26 +02:00
Fabien Potencier 2ff26b2208 [Console] updated CHANGELOG and added some more unit tests 2013-04-21 09:53:05 +02:00
Fabien Potencier d9fa16087b merged branch quiqueporta/multiselect (PR #7602)
This PR was squashed before being merged into the master branch (closes #7602).

Discussion
----------

[DialogHelper] Multiselect : added an option to the "select" function that makes the possibility of multiselect options.

When the option list appears, you can select more than one value separated by comma.

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

Commits
-------

c8a5e02 [DialogHelper] Multiselect : added an option to the "select" function that makes the possibility of multiselect options.
2013-04-21 09:51:24 +02:00
Quique Porta c8a5e021dc [DialogHelper] Multiselect : added an option to the "select" function that makes the possibility of multiselect options. 2013-04-21 09:51:23 +02:00
Fabien Potencier e03e2cd0fa [HttpKernel] optimized previous merge 2013-04-21 09:48:28 +02:00
Fabien Potencier 2f3b33a630 merged branch guilhermeblanco/client_ip_fix (PR #7559)
This PR was squashed before being merged into the master branch (closes #7559).

Discussion
----------

[HttpFoundation] [HttpKernel] Internal sub-requests should have X-Forwarded-For header providing real client IP

This is a better alternative to fix issue highlighted in #7554 and #7557.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7554, #7557
| License       | MIT

When dealing with inline fragment renderer, it emulates an internal request by overriding the REMOTE_ADDR on Request. This is true, since conceptually request came from local server.
The problem that this introduces is that overriding the server value, it turns into an impossible state to retrieve the real client ip, only returning the local server IP (which is hardcoded to 127.0.0.1).

This patch takes the same approach as a Varnish call (it behaves the exact same way, reusing all code built for handling client ip handling on sub-requests), populating the X-Forwarded-For header and also making getClientIp smarter by removing possible local IP addresses from being considered as the client IP address.

Commits
-------

773e109 [HttpFoundation] [HttpKernel] Internal sub-requests should have X-Forwarded-For header providing real client IP
2013-04-21 09:39:54 +02:00
Guilherme Blanco 773e109ebf [HttpFoundation] [HttpKernel] Internal sub-requests should have X-Forwarded-For header providing real client IP 2013-04-21 09:39:17 +02:00
Fabien Potencier 69deaa7bc7 merged branch fabpot/moved_filesystem_3 (PR #7752)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7752).

Discussion
----------

Filesystem::touch() not working with different owners (utime/atime issue)

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

Case: I have 2 users, www-data and myself. I have a command script that makes a lock file in /var/lock/.../ something. This command is called from a post request by FOS and ran in the background.  Whever one of the 2 methods (web/cli manually) is used, the other user won't have permissions to use the Filesystem::touch(). The reason this won't work is the second parameter.

What touch() does:
$touch param: The touch time. If time is not supplied, the current system time is used.
$atime param: If present, the access time of the given filename is set to the value of atime. Otherwise, it is set to the value passed to the time parameter. If neither are present, the current system time is used.

So the current code is basically copying this. However, if the second parameter is null it is still present and will cause the same problem. Note that all files and folders related are set to 0777 and have the owner of www-data. I'm accessing them under my own account here:

Interactive shell

php > var_dump(touch('/var/lock/tripolis/ontw/dev/2140191804.lock', null));
PHP Warning:  touch(): Utime failed: Operation not permitted in php shell code on line 1

Warning: touch(): Utime failed: Operation not permitted in php shell code on line 1
bool(false)
php > var_dump(touch('/var/lock/tripolis/ontw/dev/2140191804.lock'));
bool(true)

If I were to pass it without second parameter, let it be time() or null (Filesystem uses time() by default if not present), it DOES work. However, Filesystem::touch() ALWAYS gives a parameter to touch. This parameter is exactly the same value as what the function itself would do in php. Let it be that in my case there is an issue with the atime. I'm not exactly sure how it works but it's not tracked or usable in my case. Because parameter 2 exists, parameter 3 is set. Parameter 3 is not allowed and therefore causes Filesystem::touch() to throw an exception.

Commits
-------

e3a0fe6 Filesystem::touch() not working with different owners (utime/atime issue)
2013-04-21 09:19:24 +02:00
Iltar van der Berg 06e21fff03 Filesystem::touch() not working with different owners (utime/atime issue) 2013-04-21 09:19:24 +02:00
Marc a8d2e06387 Added html method into Crawler class
* This method allow to get html inside desired element
* New method is tested
2013-04-21 08:33:13 +02:00
Fabien Potencier bc6d68803e merged branch damour/patch-1 (PR #7749)
This PR was merged into the master branch.

Discussion
----------

changelog typo fix

Commits
-------

bc62d5b typo fix
2013-04-21 08:24:50 +02:00
Fabien Potencier 085e73f540 merged branch pborreli/patch-8 (PR #7748)
This PR was merged into the master branch.

Discussion
----------

Fixed typo

Commits
-------

173f15c Fixed typo
2013-04-21 08:24:33 +02:00
Fabien Potencier 133cd0320f merged branch 77web/translation-ja-iban-isbn (PR #7747)
This PR was merged into the master branch.

Discussion
----------

[Validator] added Japanese translation for IBAN & ISBN messages

| Q             | A
| ------------- | ---
| Fixed tickets | N/A
| License       | MIT

Commits
-------

3719cd5 [Validator] added Japanese translation for IBAN & ISBN messages
2013-04-21 08:24:02 +02:00
Fabien Potencier 993abe0a53 merged branch jakzal/iban-isbn-pl-translations (PR #7743)
This PR was merged into the master branch.

Discussion
----------

[Validator] Added Polish translations for IBAN and ISBN messages.

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

Commits
-------

811fc30 [Validator] Added Polish translations for IBAN and ISBN messages.
2013-04-21 08:23:28 +02:00
Fabien Potencier 9772300060 merged branch patie/master (PR #7744)
This PR was merged into the master branch.

Discussion
----------

[Validator] Added Slovak translations for IBAN and ISBN messages.

Commits
-------

2890a3f [Validator] Added Slovak translations of IBAN and ISBN
2013-04-21 08:23:21 +02:00
Fabien Potencier 775d951a94 merged branch Olden/russian_translations (PR #7745)
This PR was merged into the master branch.

Discussion
----------

[Validator] Russian translation of the IBAN & ISBN validator messages

Added the Russian translation for new validators.

Commits
-------

ca00f21 [Validator] Russian translation of the IBAN & ISBN validator messages
2013-04-21 08:23:13 +02:00