Commit Graph

20133 Commits

Author SHA1 Message Date
Fabien Potencier ba84ac87b8 bug #14170 Fix the AJAX profiling (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix the AJAX profiling

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | reported in https://github.com/symfony/symfony/issues/13447#issuecomment-88849938
| License       | MIT
| Doc PR        | n/a

The fix for IE8 (#13978) which does not have the addEventListener method on XMLHttpRequest broke the feature for modern browsers because it was checking the existence on the wrong object. It is a method on the instance, not on the "class", and so should be checked on the prototype.

Commits
-------

9d6c0b1 Fix the AJAX profiling
2015-04-02 14:16:16 +02:00
Javier Eguiluz dbd02b0871 Use specialized config methods instead of the generic ifTrue() method 2015-04-02 13:05:24 +02:00
Christophe Coevoet 9d6c0b1c30 Fix the AJAX profiling
The fix for IE8 which does not have the addEventListener method on
XMLHttpRequest broke the feature for modern browsers because it was
checking the existence on the wrong object. It is a method on the
instance, not on the "class", and so should be checked on the prototype.
2015-04-02 11:50:50 +02:00
Gregor Harlan e72128fa86 CS: Use "self" keyword instead of class name if possible 2015-04-01 21:28:50 +02:00
Fabien Potencier de02c5f962 bumped Symfony version to 2.6.7 2015-04-01 20:51:37 +02:00
Fabien Potencier 48c9e835a8 updated VERSION for 2.6.6 2015-04-01 18:55:26 +02:00
Fabien Potencier 4eb695a40e updated CHANGELOG for 2.6.6 2015-04-01 18:55:18 +02:00
Nicolas Grekas 06f92fc2d5 Safe escaping of fragments for eval() 2015-04-01 18:53:45 +02:00
Fabien Potencier ec2cb961cc Merge branch '2.3' into 2.6
* 2.3:
  bumped Symfony version to 2.3.28
  updated VERSION for 2.3.27
  update CONTRIBUTORS for 2.3.27
  updated CHANGELOG for 2.3.27
  isFromTrustedProxy to confirm request came from a trusted proxy.
  Safe escaping of fragments for eval()

Conflicts:
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpKernel/HttpCache/Esi.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-04-01 18:50:12 +02:00
Fabien Potencier feb48c26b3 bumped Symfony version to 2.3.28 2015-04-01 17:29:10 +02:00
Fabien Potencier ce4aab1508 updated VERSION for 2.3.27 2015-04-01 16:28:26 +02:00
Fabien Potencier a7dcf0c15f update CONTRIBUTORS for 2.3.27 2015-04-01 16:28:11 +02:00
Fabien Potencier dcd7971033 updated CHANGELOG for 2.3.27 2015-04-01 16:27:49 +02:00
Fabien Potencier 3594ea4ec1 security #14167 n/a (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

n/a

Commits
-------

195c57e Safe escaping of fragments for eval()
2015-04-01 16:19:30 +02:00
Fabien Potencier ad73d3d852 security #14166 n/a (neclimdul)
This PR was merged into the 2.3 branch.

Discussion
----------

n/a

Commits
-------

6c73f0c isFromTrustedProxy to confirm request came from a trusted proxy.
2015-04-01 16:18:06 +02:00
James Gilliland 6c73f0ce93 isFromTrustedProxy to confirm request came from a trusted proxy. 2015-04-01 16:16:10 +02:00
Nicolas Grekas 195c57e1f5 Safe escaping of fragments for eval() 2015-04-01 16:15:02 +02:00
Nicolas Grekas 48bd5500d0 Merge branch '2.3' into 2.6
* 2.3:
  [travis] Fix tests cancellations
2015-04-01 09:23:56 +02:00
Nicolas Grekas 85c97815f3 minor #14141 [travis] Revert tests cancellations and don't fail if memcached is not avail (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Revert tests cancellations and don't fail if memcached is not avail

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

I don't understand how travis gets its $TRAVIS_COMMIT, but this should make things stable again.

Commits
-------

7441955 [travis] Fix tests cancellations
2015-04-01 09:23:35 +02:00
Nicolas Grekas 7441955a50 [travis] Fix tests cancellations 2015-04-01 08:29:01 +02:00
Joseph Bielawski 52885f0ade [DoctrineBridge] Add missing variable declaration in testcase 2015-03-31 14:57:19 +02:00
Fabien Potencier 82400f8427 bug #14126 [VarDumper] Fix toggle action to see source excerpt (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix toggle action to see source excerpt

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

A pure JavaScript fix

Commits
-------

10f7133 [VarDumper] Fix toggle action to see source excerpt
2015-03-31 10:16:37 +02:00
Fabien Potencier 29e153ebdf bug #14114 [VarDumper] Fix dumping references as properties (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix dumping references as properties

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

Just discovered this while reviewing an other PR.
Using `array_combine()` preserves references now.

Commits
-------

6c6560e [VarDumper] Fix dumping references as properties
2015-03-31 10:15:34 +02:00
Nicolas Grekas 6c6560e5f5 [VarDumper] Fix dumping references as properties 2015-03-31 10:12:29 +02:00
Nicolas Grekas 10f713385e [VarDumper] Fix toggle action to see source excerpt 2015-03-31 10:08:51 +02:00
Fabien Potencier 2c4b5e5bbe Merge branch '2.3' into 2.6
* 2.3:
  [Validator] Add missing pt_BR translations
  Add parsing of hexadecimal strings for PHP 7
  [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
  [Validator] Added missing Hungarian translation
  [Validator] Fixed grammar in Hungarian translation
  CS: Unary operators should be placed adjacent to their operands
  CS: Binary operators should be arounded by at least one space
  remove useless tests that fail in php 7
  [Translator] fix test for php 7 compatibility
  Update phpdoc of ProcessBuilder#setPrefix()

Conflicts:
	src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf
	src/Symfony/Component/Yaml/Parser.php
2015-03-30 17:54:10 +02:00
Fabien Potencier 9215c222ff minor #14101 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition (cordoval)
This PR was merged into the 2.3 branch.

Discussion
----------

[Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition

|Q            |A  |
|---          |---|
|Bug Fix?     |y  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |y  |
|Fixed Tickets| #13957  |
|License      |MIT|
|Doc PR       |   |

Commits
-------

b735022 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
2015-03-30 17:47:26 +02:00
Fabien Potencier 2d9cc133ff minor #14090 CS: Unary operators should be placed adjacent to their operands (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Unary operators should be placed adjacent to their operands

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

Update before upcoming changes on PHP CS Fixer 1.7

To keep fabbot.io happy ;)

Commits
-------

2367f4a CS: Unary operators should be placed adjacent to their operands
2015-03-30 17:33:35 +02:00
Fabien Potencier 6e91981549 minor #14089 CS: Binary operators should be arounded by at least one space (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Binary operators should be arounded by at least one space

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

Update before upcoming changes on PHP CS Fixer 1.7

To keep fabbot.io happy ;)

Commits
-------

ec2cec6 CS: Binary operators should be arounded by at least one space
2015-03-30 17:29:33 +02:00
Fabien Potencier ffd76e1777 minor #14092 [Validator] Add missing pt_BR translations (andreia)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14092).

Discussion
----------

[Validator] Add missing pt_BR translations

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

Commits
-------

d748374 [Validator] Add missing pt_BR translations
2015-03-30 17:08:09 +02:00
Andreia Bohner d748374c5c [Validator] Add missing pt_BR translations 2015-03-30 17:07:31 +02:00
Fabien Potencier e2ed37cceb minor #14107 Add parsing of hexadecimal strings for PHP 7 (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Add parsing of hexadecimal strings for PHP 7

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

PHP 7 does not handle the hexadecimal notation in is_numeric checks anymore, so the detection needs to be implemented explicitly.

With this change, we should have a passing testsuite on PHP 7

Commits
-------

e848040 Add parsing of hexadecimal strings for PHP 7
2015-03-30 10:04:19 +02:00
Christophe Coevoet e848040e9e Add parsing of hexadecimal strings for PHP 7
PHP 7 does not handle the hexadecimal notation in is_numeric checks
anymore, so the detection needs to be implemented explicitly.
2015-03-30 09:42:01 +02:00
Fabien Potencier 89c82e5b63 minor #14095 [TwigBridge] don't mock a deprecated class (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] don't mock a deprecated class

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

Commits
-------

24a9d66 remove usage of deprecated class
2015-03-29 20:00:22 +02:00
Fabien Potencier 4f25914842 minor #14099 [Validator] Added missing Hungarian translation (1ed)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Added missing Hungarian translation

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

Commits
-------

933a449 [Validator] Added missing Hungarian translation
2015-03-29 11:46:31 +02:00
Fabien Potencier 32dc1cdd5f minor #14087 [Translator] fix test for php 7 compatibility (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translator] fix test for php 7 compatibility

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

Commits
-------

02b829f [Translator] fix test for php 7 compatibility
2015-03-29 11:45:38 +02:00
Fabien Potencier bcbf92900c minor #14098 [Validator] Fixed grammar in Hungarian translation (1ed)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed grammar in Hungarian translation

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

Corrected translation coming from https://github.com/symfony/symfony/pull/11778

Commits
-------

5f133b3 [Validator] Fixed grammar in Hungarian translation
2015-03-29 11:43:58 +02:00
Fabien Potencier 480c0e509e minor #14088 remove useless tests that fail in php 7 (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

remove useless tests that fail in php 7

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14086 for Security and Form component
| License       | MIT
| Doc PR        | -

`@expectedException \PHPUnit_Framework_Error` doesn't catch php fatal errors for wrong types in php 7. But these test are also pretty useless anyway. Then we would have to add a lot of tests for all arguments that are typehinted. Let's just remove these tests.

Commits
-------

59cab27 remove useless tests that fail in php 7
2015-03-29 11:42:57 +02:00
Luis Cordova b73502241a [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition 2015-03-29 02:02:40 -05:00
Gábor Egyed 933a449be7 [Validator] Added missing Hungarian translation 2015-03-28 19:25:46 +01:00
Gábor Egyed 5f133b3903 [Validator] Fixed grammar in Hungarian translation 2015-03-28 18:46:14 +01:00
Christian Flothmann 24a9d66d87 remove usage of deprecated class 2015-03-28 17:22:38 +01:00
Dariusz Ruminski 2367f4a5a2 CS: Unary operators should be placed adjacent to their operands 2015-03-27 23:12:40 +01:00
Dariusz Ruminski ec2cec6fd8 CS: Binary operators should be arounded by at least one space 2015-03-27 23:05:05 +01:00
Tobias Schultze 59cab272e1 remove useless tests that fail in php 7 2015-03-27 22:21:56 +01:00
Tobias Schultze 02b829f973 [Translator] fix test for php 7 compatibility 2015-03-27 19:29:16 +01:00
Nicolas Grekas e5611d25dd Fix merge 2015-03-27 19:02:17 +01:00
Fabien Potencier 0b1f17206c minor #13829 [Process] prefix should not be escaped (pyrech)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] prefix should not be escaped

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

The phpdoc of `ProcessBuilder#setPrefix` says:

```
Adds an unescaped prefix to the command string.
```
But in the current implementation, the prefix is merged with arguments array and then is escaped which seems wrong.

Commits
-------

67f65c9 Update phpdoc of ProcessBuilder#setPrefix()
2015-03-27 16:19:08 +01:00
Loïck Piera 67f65c9fe4 Update phpdoc of ProcessBuilder#setPrefix() 2015-03-27 16:14:25 +01:00
Fabien Potencier aea7b93a94 bug #14074 [VarDumper] Fix dumping ThrowingCasterException (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix dumping ThrowingCasterException

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

This cleans up dumping ThrowingCasterException to what I really intended to dump since the beginning.

Commits
-------

9944589 [VarDumper] Fix dumping ThrowingCasterException
2015-03-27 13:12:20 +01:00