Commit Graph

18668 Commits

Author SHA1 Message Date
Nicolas Grekas
3c6d1a93dd Merge branch '2.3' into 2.7
* 2.3:
  [Yaml] Fix tests on PHP 7.0.2
  [2.3] Workaround https://bugs.php.net/63206
  Add closing parenthesis
2016-01-13 11:26:43 +01:00
Kévin Dunglas
eac37cd4ae bug #17328 [Serializer] Allow to use proxies in object_to_populate (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Allow to use proxies in object_to_populate

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

Allows to populate a proxy (or any class having the given type).

Commits
-------

b16b5b9 [Serializer] Allow to use proxies in object_to_populate
2016-01-13 11:07:31 +01:00
Nicolas Grekas
26af0ae56b minor #17348 [Yaml] Fix tests on PHP 7.0.2 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Fix tests on PHP 7.0.2

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

Related to https://bugs.php.net/66179 that has been fixed in 7.0.2

Commits
-------

902f6dd [Yaml] Fix tests on PHP 7.0.2
2016-01-13 10:03:05 +01:00
Nicolas Grekas
902f6ddb93 [Yaml] Fix tests on PHP 7.0.2 2016-01-13 09:54:41 +01:00
Nicolas Grekas
d44e0b7212 [2.7] Workaround https://bugs.php.net/63206 2016-01-13 08:57:33 +01:00
Nicolas Grekas
c5479dde8c [2.3] Workaround https://bugs.php.net/63206 2016-01-13 08:28:48 +01:00
omerida
5cdccc4350 Add closing parenthesis 2016-01-12 14:46:23 -05:00
Kévin Dunglas
ff18b68e77 [Serializer] Unset object_to_populate after using it 2016-01-12 19:26:02 +01:00
Fabien Potencier
da655a9368 Merge branch '2.3' into 2.7
* 2.3:
  Typo fix
  [2.3] Static Code Analysis for Components
  Added support \IteratorAggregate for UniqueEntityValidator
  Fix #17306 Paths with % in it are note allowed (like urlencoded)
  Added sort order SORT_STRING for params in UriSigner
  Remove normalizer cache in Serializer class
2016-01-12 18:44:11 +01:00
Tobias Schultze
85d5ed29d7 bug #17140 [Serializer] Remove normalizer cache in Serializer class (jvasseur)
This PR was merged into the 2.3 branch.

Discussion
----------

[Serializer] Remove normalizer cache in Serializer class

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

The serializer cache the normalizer/denormalizer to use based only on the class and format. But the supportsNormalization and supportDenormalization methods can decide based on the data passed leading to hard to find bugs when the serializer used a cached normalizer it shouldn't use.

Commits
-------

8566dc1 Remove normalizer cache in Serializer class
2016-01-12 13:31:34 +01:00
Fabien Potencier
f1cce4e139 minor #17282 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #17282).

Discussion
----------

[2.3] Static Code Analysis for Components

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

Static Code Analysis with Php Inspections (EA Extended):
    - several code constructs simplification
    - decoupling statements from foreach
    - extra colons/parenthesis removal (code style)
    - correct string functions usage (micro-optimization)
    - variable functions usage (php 5 compatible)

Commits
-------

81f8181 [2.3] Static Code Analysis for Components
2016-01-12 12:31:36 +01:00
Vladimir Reznichenko
81f81812a5 [2.3] Static Code Analysis for Components 2016-01-12 12:31:34 +01:00
Fabien Potencier
a02bd4b753 bug #17307 [FrameworkBundle] Fix paths with % in it (like urlencoded) (scaytrase)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix paths with % in it (like urlencoded)

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

Commits
-------

de7b4d7 Fix #17306 Paths with % in it are note allowed (like urlencoded)
2016-01-11 11:07:30 +01:00
Disparity
6ebd1792d8 Added support \IteratorAggregate for UniqueEntityValidator
Expand the list of supported types of results returned from the repositories.
Added processing of type \IteratorAggregate (and as a consequence doctrine Collection)
2016-01-11 11:04:46 +01:00
mantulo
0f8da347f8 Update AbstractChoiceListTest.php
fixed phpdoc namespace
2016-01-11 11:03:27 +01:00
Kévin Dunglas
b16b5b9d86 [Serializer] Allow to use proxies in object_to_populate 2016-01-11 10:59:43 +01:00
Pavel Batanov
de7b4d73c6 Fix #17306 Paths with % in it are note allowed (like urlencoded) 2016-01-09 15:55:11 +03:00
Diego Saint Esteben
e38fa135ab Use proper class to fetch $versionStrategy property 2016-01-07 19:01:12 +01:00
Tim van Densen
2040139db6 Added sort order SORT_STRING for params in UriSigner 2016-01-07 14:43:59 +01:00
Fabien Potencier
19da1850f6 bug #17279 [2.7][FrameworkBundle] Add case in Kernel directory guess for PHPUnit (tgalopin)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][FrameworkBundle] Add case in Kernel directory guess for PHPUnit

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

The current automatic guess of the Kernel directory in the context of PHPUnit does work properly using the following commands:

- `phpunit -c app`
- `phpunit --configuration app`
- `phpunit --configuration=app`

But it fails with the synthax `phpunit -capp`, even if PHPUnit supports it. This PR fixes this.

See https://github.com/symfony/symfony/pull/17272.

Commits
-------

a7b7766 [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:29:06 +01:00
Fabien Potencier
c4cc147e8d Merge branch '2.3' into 2.7
* 2.3:
  Add missing apostrophe in setSaveHandler phpdoc
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:28:07 +01:00
Fabien Potencier
f9bf3f8d5a bug #17278 [2.3][FrameworkBundle] Add case in Kernel directory guess for PHPUnit (tgalopin)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][FrameworkBundle] Add case in Kernel directory guess for PHPUnit

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

The current automatic guess of the Kernel directory in the context of PHPUnit does work properly using the following commands:

- `phpunit -c app`
- `phpunit --configuration app`
- `phpunit --configuration=app`

But it fails with the synthax `phpunit -capp`, even if PHPUnit supports it. This PR fixes this.

See https://github.com/symfony/symfony/pull/17272.

Commits
-------

758fc1d [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:27:03 +01:00
pawel-lewtak
e32f5a2cd2 Add missing apostrophe in setSaveHandler phpdoc 2016-01-07 14:19:31 +01:00
Nicolas Grekas
cb7036093e [VarDumper] Fix typo 2016-01-07 12:12:32 +01:00
Titouan Galopin
a7b7766983 [FrameworkBundle] Add case in Kernel directory guess for PHPUnit 2016-01-06 11:27:30 +01:00
Nicolas Grekas
6cd79e92f6 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix potential race condition
  typo
  [FrameworkBundle] Set the kernel.name properly after a cache warmup
  Removed spaces before semicolon
2016-01-06 10:57:37 +01:00
Titouan Galopin
758fc1dfb2 [FrameworkBundle] Add case in Kernel directory guess for PHPUnit 2016-01-06 10:52:17 +01:00
Nicolas Grekas
b114a85609 [Process] Fix potential race condition 2016-01-06 10:07:06 +01:00
Nicolas Grekas
478710f984 [PhpUnitBridge] Re-enable the garbage collector 2016-01-06 07:53:30 +01:00
Jáchym Toušek
eab7e11be7 typo 2016-01-05 16:32:23 +01:00
Jakub Zalas
1438b9a067 [FrameworkBundle] Set the kernel.name properly after a cache warmup 2016-01-04 18:15:54 +01:00
Fabien Potencier
5a9c1b5a0f minor #17243 Removed spaces before semicolon (dereckson)
This PR was merged into the 2.3 branch.

Discussion
----------

Removed spaces before semicolon

'lorem ; ipsum' → 'lorem; ipsum'

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

Commits
-------

169d551 Removed spaces before semicolon
2016-01-04 17:52:03 +01:00
Tobias Schultze
fff265d451 Merge branch '2.3' into 2.7 2016-01-04 15:49:16 +01:00
Adrien LUCAS
be20e892c2 Fix Form's DateTimeType tests. 2016-01-04 15:27:01 +01:00
Fabien Potencier
e738227d63 bug #17159 [Yaml] recognize when a block scalar is left (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] recognize when a block scalar is left

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

The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.

Commits
-------

3a22165 [Yaml] recognize when a block scalar is left
2016-01-04 12:01:16 +01:00
Christian Flothmann
3a2216559b [Yaml] recognize when a block scalar is left
The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.
2016-01-03 20:52:40 +01:00
Jérôme Vasseur
8566dc18fc Remove normalizer cache in Serializer class 2016-01-03 18:07:57 +01:00
Fabien Potencier
6dbef8ccb8 updated copyright year 2016-01-03 16:33:06 +01:00
Fabien Potencier
d6f503660f Merge branch '2.3' into 2.7
* 2.3:
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:32:00 +01:00
Diego Saint Esteben
ce067e6460 Update copyright year 2016-01-01 23:53:47 -03:00
Sébastien Santoro
169d5513a6 Removed spaces before semicolon
'lorem ; ipsum' → 'lorem; ipsum'
2016-01-01 15:10:52 +00:00
Fabien Potencier
1b15ac3bdc minor #17085 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #17085).

Discussion
----------

[2.3] Static Code Analysis for Components

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

Static Code Analysis with Php Inspections (EA Extended):
    - remaining mkdir race conditions
    - continue miss-usage in switch

Commits
-------

6d303c7 [2.3] Static Code Analysis for Components
2015-12-31 19:24:03 +01:00
Vladimir Reznichenko
6d303c7755 [2.3] Static Code Analysis for Components 2015-12-31 19:24:01 +01:00
Nicolas Grekas
bd97e51e0b Merge branch '2.3' into 2.7
* 2.3:
  [Process] Clean tested process on tear down
2015-12-31 11:59:19 +01:00
Nicolas Grekas
80e11071cc [Process] Clean tested process on tear down 2015-12-31 11:29:46 +01:00
Nicolas Grekas
ddab6278a2 Merge branch '2.3' into 2.7
* 2.3:
  bug #14246 [Filesystem] dumpFile() non atomic

Conflicts:
	src/Symfony/Component/Filesystem/Filesystem.php
2015-12-31 10:09:12 +01:00
Nicolas Grekas
3aa30005f0 bug #17195 bug #14246 [Filesystem] dumpFile() non atomic (Hidde Boomsma)
This PR was merged into the 2.3 branch.

Discussion
----------

bug #14246 [Filesystem] dumpFile() non atomic

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

Remove race condition where `dumpFile` has written the resulting file but has not given access yet.

Commits
-------

e4015d5 bug #14246 [Filesystem] dumpFile() non atomic
2015-12-31 10:05:40 +01:00
Hidde Boomsma
e4015d5cc3 bug #14246 [Filesystem] dumpFile() non atomic 2015-12-31 09:33:44 +01:00
Nicolas Grekas
c457f7beb7 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix running tests on HHVM>=3.8
2015-12-30 19:22:28 +01:00
Nicolas Grekas
a47208bea9 [Process] Fix running tests on HHVM>=3.8 2015-12-30 19:16:06 +01:00
Tobias Schultze
140ed985be feature #16747 [Form] Improved performance of ChoiceType and its subtypes (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Improved performance of ChoiceType and its subtypes

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

I found out today that, although CachingFactoryDecorator is part of Symfony 2.7, it is not configured to be used in the DI configuration. This simple in-memory cache improved the page load by 50% for one considerably large form with many (~600) choice/entity fields that I was working on today.

Also, caching of query builders with parameters was broken, since the parameters are represented by objects. PHP's object hashes were used to calculate the cache keys, hence the cache always missed. I converted parameters to arrays for calculating the cache keys to fix this problem.

Commits
-------

a0ef101 [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 16:04:43 +01:00
Nicolas Grekas
2c2daf184c Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix potential race condition leading to transient tests
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
2015-12-30 11:27:24 +01:00
Bernhard Schussek
a0ef1018d6 [Form] Improved performance of ChoiceType and its subtypes 2015-12-30 11:11:52 +01:00
Nicolas Grekas
9305aab3e0 minor #17176 [Process] Fix a transient test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Fix a transient test

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

Commits
-------

7e2c67c [Process] Fix a transient test
2015-12-30 10:15:14 +01:00
Nicolas Grekas
b78eab561e bug #17163 [Form] fix Catchable Fatal Error if choices is not an array (Gladhon, nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fix Catchable Fatal Error if choices is not an array

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

Since 2.7.8 I got a BC-Break Error

Catchable Fatal Error: Argument 1 passed to Symfony\Component\Form\Extension\Core\Type\ChoiceType::normalizeLegacyChoices() must be of the type array, null given

normalizeLegacyChoices work only with array, so if choices not an array, just don't try to normlize.

Commits
-------

f3c2a9b [Form] fix Catchable Fatal Error if choices is not an array
2015-12-30 10:03:39 +01:00
Gladhon
f3c2a9beda [Form] fix Catchable Fatal Error if choices is not an array 2015-12-30 10:03:36 +01:00
Nicolas Grekas
7e2c67c9dc [Process] Fix a transient test 2015-12-30 09:47:47 +01:00
Nicolas Grekas
99fc428bdc [Process] Fix potential race condition leading to transient tests 2015-12-30 09:46:06 +01:00
Hugo Hamon
26d31eb9ac [Routing] removed unused variable in PhpMatcherDumperTest class. 2015-12-29 18:08:17 +01:00
Hugo Hamon
ba7213c280 [DependencyInjection] fixes typo in triggered deprecation notice. 2015-12-29 17:31:38 +01:00
Hugo Hamon
787853673b [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class. 2015-12-29 10:59:52 +01:00
Nicolas Grekas
a63dd194ed Merge branch '2.3' into 2.7
* 2.3:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
2015-12-28 14:11:03 +01:00
Nicolas Grekas
a89fe42811 minor #17086 CS: use nowdoc instead of heredoc (gharlan)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: use nowdoc instead of heredoc

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

if this is accepted, we could add the fixer to symfony level of php-cs-fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1580

Commits
-------

3dca549 use nowdoc instead of heredoc
2015-12-28 14:03:05 +01:00
Fabien Potencier
c4bef7233c minor #17145 Do not use HttpKernel Extension when not needed (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

Do not use HttpKernel Extension when not needed

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

HttpKernel Extension only adds `addClassesToCompile`. So the class hierarchy should be slim if it's not used.

Commits
-------

4978e19 Do not use HttpKernel Extension when not needed
2015-12-28 10:12:53 +01:00
Dariusz Ruminski
4f0f8a2395 CS: Single line comments should use double slashes (//) and not hash (#). 2015-12-27 17:45:57 +01:00
Tobias Schultze
cc64c54cfa Do not use HttpKernel Extension when not needed for 2.7 2015-12-26 18:53:53 +01:00
Tobias Schultze
4978e196ca Do not use HttpKernel Extension when not needed 2015-12-26 18:41:33 +01:00
Fabien Potencier
d222bd3213 bumped Symfony version to 2.7.9 2015-12-26 16:49:24 +01:00
Fabien Potencier
e680b91f6e updated VERSION for 2.7.8 2015-12-26 16:01:55 +01:00
Fabien Potencier
f409dd2589 bumped Symfony version to 2.3.37 2015-12-26 15:52:28 +01:00
Fabien Potencier
b7362dc730 updated VERSION for 2.3.36 2015-12-26 15:07:57 +01:00
Fabien Potencier
778884acdd Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
This reverts commit e60889ac4d.
2015-12-26 15:05:15 +01:00
Fabien Potencier
3c907cebed Merge branch '2.3' into 2.7
* 2.3:
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
2015-12-26 15:02:48 +01:00
Fabien Potencier
e60889ac4d Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
This reverts commit af3f4eaa2b, reversing
changes made to 021ab8a7b3.
2015-12-26 15:02:40 +01:00
Fabien Potencier
97cf53f9bd Merge branch '2.3' into 2.7
* 2.3:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:43 +01:00
Fabien Potencier
7660fb8c89 bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fix indented line handling in folded blocks

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

Commits
-------

756834c [Yaml] fix indented line handling in folded blocks
2015-12-26 13:21:40 +01:00
Graham Campbell
2b0721d0e4 [2.7] Fixed flatten exception recursion with errors 2015-12-26 13:17:22 +01:00
Mihai Stancu
38fdda669f Embedded identifier support 2015-12-26 13:11:49 +01:00
WouterJ
61b863b7ba Also transform inline mappings to objects 2015-12-26 13:08:46 +01:00
Fabien Potencier
494b4a466d minor #17114 [Serializer] Make metadata interfaces internal (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Make metadata interfaces internal

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17113#discussion_r48291776
| License       | MIT
| Doc PR        | n/a

Introducing such interfaces was a (my) mistake. Serializer metadata are value objects. Nobody will (nor should) implement these interfaces. Composition is better for "extending" metadata.

They were not marked as `@api` and should now be marked as `@internal` (or even deprecated but it will cause some maintenance headaches).

Commits
-------

3f6cfcd [Serializer] Make metadata interfaces internal
2015-12-26 13:07:05 +01:00
Fabien Potencier
f24690e493 bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Fix array sort on normalization in edge case

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

Commits
-------

eca41a8 [Config] Fix array sort on normalization in edge case
2015-12-26 13:02:10 +01:00
Mathieu MARCHOIS
85c271b7a2 Change the ExtensionInterface load method definition to bo identical to the documentation. 2015-12-26 13:00:54 +01:00
Tigran Azatyan
54e6fb4911 add and correct armenian translations 2015-12-26 12:56:14 +01:00
Romain Neutron
eca41a8fbf [Config] Fix array sort on normalization in edge case 2015-12-24 14:08:45 +01:00
Tobias Schultze
45a006046d minor #17069 improve BrowserKit test coverage p1 (eventhorizonpl)
This PR was merged into the 2.3 branch.

Discussion
----------

improve BrowserKit test coverage p1

Hi,

This PR improves BrowserKit test coverage.

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

I rebased previous PR https://github.com/symfony/symfony/pull/16549 to 2.3

Commits
-------

0261b48 improve BrowserKit test coverage p1
2015-12-24 02:02:08 +01:00
Jakub Zalas
4bec98000f [Security] Run tests on all PHP versions
Symfony 2.7 supports PHP >= 5.3.9
2015-12-23 19:13:52 +01:00
Maxime Steinhausser
211d58956f [Console][2.7] Fix merge #17040 2015-12-23 12:17:38 +01:00
Nicolas Grekas
cd94014b07 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:39 +01:00
Nicolas Grekas
088fcfe093 [Process] Fix the fix for --enable-sigchild php 2015-12-23 12:02:45 +01:00
Nicolas Grekas
3bb3f3bdb3 minor #17070 [Process] Make tests more deterministic (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Make tests more deterministic

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

This makes running the Process tests faster and more deterministic.

Commits
-------

0dc9389 [Process] Make tests more deterministic
2015-12-23 08:54:37 +01:00
Nicolas Grekas
53b0d77419 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix transient test on Windows
2015-12-23 08:54:09 +01:00
Nicolas Grekas
5517368265 [Process] Fix transient test on Windows 2015-12-23 08:53:52 +01:00
Nicolas Grekas
0dc9389982 [Process] Make tests more deterministic 2015-12-23 08:33:19 +01:00
Nicolas Grekas
5dc2bb30ca Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
  [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
  [Process] More robustness and deterministic tests

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/ProcessTest.php
2015-12-23 07:54:35 +01:00
Fabien Potencier
b598fcadbd bug #17094 [Process] More robustness and deterministic tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] More robustness and deterministic tests

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

Commits
-------

d1a178a [Process] More robustness and deterministic tests
2015-12-23 07:40:46 +01:00
Kévin Dunglas
3f6cfcdf42 [Serializer] Make metadata interfaces internal 2015-12-22 21:37:45 +01:00
Alessandro Chitolina
d0c0294a7b [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17102
| License       | MIT
| Doc PR        |
2015-12-22 18:06:45 +01:00
Nicolas Grekas
cb23212bd6 [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM 2015-12-22 14:55:19 +01:00
Nicolas Grekas
68b3d2d6a8 Merge branch '2.3' into 2.7
* 2.3:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms

Conflicts:
	.travis.yml
2015-12-22 14:04:37 +01:00
Nicolas Grekas
d1a178a43c [Process] More robustness and deterministic tests 2015-12-22 13:58:57 +01:00
Nicolas Grekas
337957ad26 minor #17073 [Security] skip bcrypt tests on incompatible platforms (Christian Flothmann, xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] skip bcrypt tests on incompatible platforms

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

Not all PHP versions before 5.3.7 have backported fixes that make it
possible to use `password_hash()` function. Therefore, we have to skip
tests on not supported platforms.

Commits
-------

2a6fa7b use requires annotation
65eb188 skip bcrypt tests on incompatible platforms
2015-12-22 12:51:12 +01:00
Nicolas Grekas
478a0312fd [Routing] Reduce memory usage of a high consuming test case 2015-12-22 12:36:46 +01:00
Nicolas Grekas
6755f87476 Fix merge 2015-12-22 11:27:42 +01:00
Nicolas Grekas
b7f998f744 Merge branch '2.3' into 2.7
* 2.3:
  [SecurityBundle] Removing test insulations for a huge perf win
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
2015-12-22 11:07:22 +01:00
Christian Flothmann
2a6fa7bbab use requires annotation 2015-12-22 09:19:23 +01:00
Fabien Potencier
bbc53dd83f minor #16999 [SecurityBundle] Removing test insulations for a huge perf win (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] Removing test insulations for a huge perf win

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

Commits
-------

b8fa471 [SecurityBundle] Removing test insulations for a huge perf win
2015-12-21 19:31:12 +01:00
Nicolas Grekas
b8fa471f8a [SecurityBundle] Removing test insulations for a huge perf win 2015-12-21 17:08:45 +01:00
Gregor Harlan
3dca549b95 use nowdoc instead of heredoc 2015-12-21 17:05:00 +01:00
Ener-Getick
1fbbe84007 [Validator] Use the new interface in the README 2015-12-21 13:16:02 +01:00
Christian Flothmann
65eb18849a skip bcrypt tests on incompatible platforms
Not all PHP versions before 5.3.7 have backported fixes that make it
possible to use `password_hash()` function. Therefore, we have to skip
tests on not supported platforms.
2015-12-19 15:13:08 +01:00
Christian Flothmann
9050f676af [Filesystem] fix tests on 2.3
The test introduced in #16797 used the `assertFilePermissions()` method
to test for the expected result. This worked quite well for the PR as it
was submitted for the `master` branch. However, the tests now fail on
2.3 as the `FilesystemTestCase` class which contains this method was
introduced with Symfony 2.4.
2015-12-19 12:15:11 +01:00
Christian Flothmann
756834c8dd [Yaml] fix indented line handling in folded blocks 2015-12-19 10:10:51 +01:00
Michal Piotrowski
0261b48168 improve BrowserKit test coverage p1
improve BrowserKit test coverage p2

improve BrowserKit test coverage p3

improve BrowserKit test coverage p4

improve BrowserKit test coverage p5
2015-12-18 18:35:00 +01:00
Filippo Tessarotto
fb75651a81 [Filesystem] Recursivly widen non-executable directories 2015-12-18 18:05:29 +01:00
Fabien Potencier
6a92f4e03f Merge branch '2.3' into 2.7
* 2.3:
  [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too
  updated validators.bg.xlf
  [Security] Enable bcrypt validation and result length tests on all PHP versions
  [Security] Verify if a password encoded with bcrypt is no longer than 72 characters
  [Console] Avoid extra blank lines when rendering exceptions
  [Yaml] do not remove "comments" in scalar blocks
2015-12-18 17:59:46 +01:00
Fabien Potencier
f371445eff bug #17040 [Console] Avoid extra blank lines when rendering exceptions (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Avoid extra blank lines when rendering exceptions

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

Don't know if it can be considered as a bug fix as it is the behavior since a while (https://github.com/symfony/symfony/pull/9055), but I let you see by yourself the old vs new rendering:

![Console exception rendering](https://cloud.githubusercontent.com/assets/2211145/11857447/92cebfbe-a458-11e5-9d3d-6147b0338080.PNG)

Commits
-------

2e158df [Console] Avoid extra blank lines when rendering exceptions
2015-12-18 17:54:05 +01:00
Fabien Potencier
68bd2c19a1 bug #17055 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Verify if a password encoded with bcrypt is no longer than 72 characters

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

From the [password_hash() docs](http://php.net/password_hash):

> Caution Using the PASSWORD_BCRYPT as the algorithm, will result in the password parameter being truncated to a maximum length of 72 characters.

Commits
-------

0a496e7 [Security] Enable bcrypt validation and result length tests on all PHP versions
5c30266 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters
2015-12-18 17:49:25 +01:00
Fabien Potencier
baa5b7db29 bug #16959 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too (HeahDude)
This PR was squashed before being merged into the 2.3 branch (closes #16959).

Discussion
----------

[Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too

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

Commits
-------

b4b5d63 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too
2015-12-18 17:43:49 +01:00
Jules Pietri
b4b5d63660 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too 2015-12-18 17:43:43 +01:00
Fabien Potencier
8d010230ef bug #16860 [Yaml] do not remove "comments" in scalar blocks (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] do not remove "comments" in scalar blocks

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

Inside scalar blocks, lines starting with a `#` character must be
treated like every other strings and must not be ignored as comments.

Commits
-------

3c72fcc [Yaml] do not remove "comments" in scalar blocks
2015-12-18 17:24:33 +01:00
Fabien Potencier
dae4267216 bug #17002 [Console][Table] fixed render row that contains multiple cells. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console][Table] fixed render row that contains multiple cells.

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

Commits
-------

3790ac7 [Console][Table] fixed render row with multiple cells.
2015-12-18 17:14:15 +01:00
Roumen Damianoff
862b8722b3 updated validators.bg.xlf 2015-12-18 17:08:09 +01:00
Nicolas Grekas
85814de44c Merge branch '2.3' into 2.7
* 2.3:
  prefer phpunit 5.x on hhvm
  [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
  [travis] Auto-conf deps=high matrix line
  Fix the logout path when not using the router
  [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
  [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
2015-12-18 16:35:58 +01:00
Nicolas Grekas
6b13708ab6 bug #16971 [HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers (jakzal, Sander-Toonen)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers

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

Commits
-------

1da3d61 [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
dd129b7 [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers
2015-12-18 11:44:19 +01:00
Nicolas Grekas
c2b7ccb36c bug #17048 Fix the logout path when not using the router (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix the logout path when not using the router

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

This needs to use the base url, not the base path, so that it goes through the front controller when not using url rewriting.

Commits
-------

1a2567e Fix the logout path when not using the router
2015-12-18 10:38:22 +01:00
Christian Flothmann
17fcef5aff [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands 2015-12-18 10:21:31 +01:00
Jakub Zalas
0a496e7011 [Security] Enable bcrypt validation and result length tests on all PHP versions 2015-12-17 18:05:04 +00:00
Jakub Zalas
5c302669eb [Security] Verify if a password encoded with bcrypt is no longer than 72 characters 2015-12-17 18:04:54 +00:00
Christophe Coevoet
542b877424 Fix the logout path when not using the router
This needs to use the base url, not the base path, so that it goes
through the front controller when not using url rewriting.
2015-12-17 14:04:43 +01:00
Christophe Coevoet
1a2567e19e Fix the logout path when not using the router
This needs to use the base url, not the base path, so that it goes
through the front controller when not using url rewriting.
2015-12-17 13:54:40 +01:00
Maxime Steinhausser
2e158df2c7 [Console] Avoid extra blank lines when rendering exceptions 2015-12-17 00:47:15 +01:00
Tobias Schultze
2d48af7745 bug #17006 [Form] Fix casting regression in DoctrineChoiceLoader (bendavies)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix casting regression in DoctrineChoiceLoader

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

In symfony 2.7, the [DoctrineChoiceLoader](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php) and [IdReader](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php) were introduce to replace the deprecated [EntityChoiceList](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php)

There appears to have been a change in behaviour in the refactor, as the old `EntityChoiceList` [casts ID to strings](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php (L248)), whereas the new `DoctrineChoiceLoader` [does not](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php#L159). The casting behavior was [maintained elsewhere](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php#L122), however.

Since the new `DoctrineChoiceLoader` deprecated `EntityChoiceList`, i'm calling this a regression.

Commits
-------

54bbade [Form] cast IDs to match deprecated behaviour of EntityChoiceList
2015-12-15 20:21:59 +01:00
Ben Davies
54bbade3e6 [Form] cast IDs to match deprecated behaviour of EntityChoiceList 2015-12-15 11:02:11 +00:00
Tobias Schultze
88d586b447 Merge branch '2.3' into 2.7 2015-12-15 02:31:17 +01:00
Ilya Antipenko
457b3f0047 [PropertyAccessor] A little refactor
- Remove obsolete code
 - Remove excessive actions
 - Fix phpdoc & comments
2015-12-15 02:27:13 +01:00
Kévin Dunglas
6c9bb86b47 [PropertyAccess] minor: constants as internal and removed unused var 2015-12-15 02:21:26 +01:00
Krzysztof Piasecki
5dc9bd9fe3 Remove unnecessary test
Question interface guarantees, that $validator is callable or null
2015-12-14 19:14:08 +01:00
Abdellatif Ait boudad
3790ac7ba1 [Console][Table] fixed render row with multiple cells. 2015-12-14 12:15:32 +00:00
Sander-Toonen
1da3d616a3 [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile 2015-12-12 19:44:35 +00:00
Tobias Schultze
c2cad23357 minor #16936 [Security] backported phpdoc from Guard component. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] backported phpdoc from Guard component.

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

Commits
-------

cab6fd5 [Security] backported phpdoc from Guard component.
2015-12-12 15:43:15 +01:00
Maxime Steinhausser
1eaef57c13 [2.7][Console] Table: fix some PhpDoc 2015-12-11 19:18:28 +01:00
Jakub Zalas
dd129b71e3 [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers 2015-12-11 17:13:59 +00:00
Abdellatif Ait boudad
369b2d4876 [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper. 2015-12-11 07:55:10 +00:00
Nicolas Grekas
c7f7a9a569 minor #16946 Clean useless deprecation silencing (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Clean useless deprecation silencing

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

We added these when we triggered unsilenced notices. But we silence them now.

Commits
-------

9953550 Clean useless deprecation silencing
2015-12-11 08:22:19 +01:00
Nicolas Grekas
f253d624a0 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Enhance compatiblity with --enable-sigchild
  [Process] Always call proc_close
  [Validator] Updated Luxembourgish translations for 2.8
  [FrameworkBundle] prevent cache:clear creating too long paths

Conflicts:
	src/Symfony/Component/Process/Tests/ProcessTest.php
	src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
	src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
	src/Symfony/Component/Process/Tests/SimpleProcessTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf
2015-12-10 17:58:22 +01:00
Nicolas Grekas
423f83f75e bug #16915 [Process] Enhance compatiblity with --enable-sigchild (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Enhance compatiblity with --enable-sigchild

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

This is complete rewrite of the fallback `--enable-sigchild` handling in the Process class.
It removes most of the differences between this and a non-sigchild-enabled php.
Which means the test suite doesn't need anymore to be replayed 3 times (which is how I started this PR, looking for a way to test this component in less time).

I validated this with a locally compiled php, sigchild-enabled. Green.
Changes affect only this special-mode php.

Ping @romainneutron and @Seldaek (original writer of the sigchild support)

Submitted on 2.3 as bugfix, which it is to me.

Commits
-------

e7cc4aa [Process] Enhance compatiblity with --enable-sigchild
2015-12-10 17:39:45 +01:00
Nicolas Grekas
e7cc4aa715 [Process] Enhance compatiblity with --enable-sigchild 2015-12-10 16:01:44 +01:00
Nicolas Grekas
99535506e8 Clean useless deprecation silencing 2015-12-10 15:12:08 +01:00
Kévin Dunglas
23431e99d6 [FrameworkBundle] Compute the kernel root hash only one time 2015-12-10 11:46:31 +01:00
Hugo Hamon
cab6fd531e [Security] backported phpdoc from Guard component. 2015-12-10 09:14:03 +01:00
Tobias Schultze
4cde2d1e33 bug #16829 [FrameworkBundle] prevent cache:clear creating too long paths (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] prevent cache:clear creating too long paths

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

Commits
-------

6e279c5 [FrameworkBundle] prevent cache:clear creating too long paths
2015-12-10 01:42:36 +01:00
Evgeniy Sokolov
70afcc8023 fix short array syntax for php 5.3 2015-12-09 12:45:47 +01:00
Konstantin Simon Maria Möllers
6110bd9c60 [Serializer] Fixed on array of objects in . 2015-12-08 21:34:12 +01:00
Fabien Potencier
420da14156 bug #16757 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command (jeremyFreeAgent)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command

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

Currently when you run the TranslationUpdateCommand and want to write the translation in the domain file without a `translations` directory the output is `[OK] Success` but the file is not created.

This PR fix the creation of the directory.

Commits
-------

8c45107 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command
2015-12-08 19:14:24 +01:00
Fabien Potencier
d6dd9a48dd minor #16894 Backport: [Validator] Updated Luxembourgish translations for 2.8 (mweimerskirch)
This PR was merged into the 2.3 branch.

Discussion
----------

Backport: [Validator] Updated Luxembourgish translations for 2.8

| Q             | A
| ------------- | ---
| Fixed tickets | https://github.com/symfony/symfony/pull/16847#discussion-diff-46756549
| License       | MIT

Commits
-------

f9a811b [Validator] Updated Luxembourgish translations for 2.8
2015-12-08 19:06:43 +01:00
Nicolas Grekas
ed226961ab minor #16875 [Process] Always call proc_close (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Always call proc_close

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

This should fix one more transient test, and a wrong behavior.

Commits
-------

ccb67d7 [Process] Always call proc_close
2015-12-08 18:10:57 +01:00
Nicolas Grekas
ccb67d7bd2 [Process] Always call proc_close 2015-12-08 18:02:07 +01:00
Michel Weimerskirch
f9a811b4de [Validator] Updated Luxembourgish translations for 2.8
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf
2015-12-08 00:21:08 +01:00
Fabien Potencier
b8fbe69bb8 bug #16871 [FrameworkBundle] Disable built-in server commands when Process component is missing (gnugat, xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Disable built-in server commands when Process component is missing

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

This also backports the improvement for the `suggest` section from #16650 to the `2.7` branch and improves it by also mentioning the other built-in server commands.

Commits
-------

972c4ca disable server commands without Process component
dd82b64 list all server command names in suggestion
d18fb9b Suggested Process dependency
2015-12-07 22:55:06 +01:00
Fabien Potencier
52915ede0f Merge branch '2.3' into 2.7
* 2.3:
  disable server:run cmd without Process component
  Suggested Process dependency
2015-12-07 22:53:02 +01:00
Christian Flothmann
972c4caae8 disable server commands without Process component 2015-12-06 23:34:46 +01:00
Christian Flothmann
dd82b6459d list all server command names in suggestion 2015-12-06 23:34:45 +01:00
Loïc Faugeron
d18fb9bbbe Suggested Process dependency
The `server:run` command requires the Process component.
2015-12-06 23:33:58 +01:00
Christian Flothmann
99d174176a disable server:run cmd without Process component 2015-12-06 23:31:12 +01:00
Loïc Faugeron
604174c963 Suggested Process dependency
The `server:run` command requires the Process component.
2015-12-06 23:31:09 +01:00
Christophe Coevoet
0cef1ef54c Fix the exception message expectation
The message was changed between 2.3 and 2.7.
2015-12-05 19:10:05 +01:00
Christophe Coevoet
237b13c56c Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix stopping a process on Windows
  Added a test case for the Logger class.
  CS: general fixes
2015-12-05 18:37:09 +01:00
Christophe Coevoet
800232c3d6 minor #16813 [Process] Fix stopping a process on Windows (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix stopping a process on Windows

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

Commits
-------

80fb51c [Process] Fix stopping a process on Windows
2015-12-05 16:09:16 +01:00
Christian Flothmann
3c72fccc1b [Yaml] do not remove "comments" in scalar blocks
Inside scalar blocks, lines starting with a `#` character must be
treated like every other strings and must not be ignored as comments.
2015-12-05 14:17:16 +01:00
Christophe Coevoet
2d14689485 minor #16790 CS: general fixes (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: general fixes

| 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

Commits
-------

d3f671e CS: general fixes
2015-12-05 13:33:53 +01:00
Christophe Coevoet
d3247d83c8 minor #16850 [MonologBridge] Added a test case for the Logger class (derrabus)
This PR was merged into the 2.3 branch.

Discussion
----------

[MonologBridge] Added a test case for the Logger class

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

So far, there is no test case that ensures that the `Symfony\Bridge\Monolog\Logger` can be instantiated. Because of this, bug #16837 was not discovered by the tests. This PR adds a simple test case that tests some basic functionality of that particular class.

Commits
-------

78c0a6e Added a test case for the Logger class.
2015-12-05 13:32:04 +01:00
Nicolas Grekas
80fb51c3af [Process] Fix stopping a process on Windows 2015-12-05 13:06:52 +01:00
Christophe Coevoet
0bbbb01fbe Merge branch '2.3' into 2.7
* 2.3:
  [Process] Unset callback after stop to free memory
  Improve error message for undefined DIC aliases
  Fix typo
  CS: remove unneeded parentheses around control statements
2015-12-05 12:06:38 +01:00
Dominik Ritter
a1c207c7d1 Set the redraw frequency at least to 1. Setting it to 0 would otherwise produce an error. 2015-12-05 12:03:00 +01:00
Christophe Coevoet
42a9da9588 minor #16773 [TwigBridge] Clean deps now that 2.8.0 is tagged (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] Clean deps now that 2.8.0 is tagged

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

Commits
-------

e6efe7e [TwigBridge] Clean deps now that 2.8.0 is tagged
2015-12-05 11:51:33 +01:00
Alexander M. Turek
78c0a6e3a4 Added a test case for the Logger class. 2015-12-05 11:47:18 +01:00
Filippo Tessarotto
ec93b9a7f7 [Process] Unset callback after stop to free memory 2015-12-05 11:16:20 +01:00
Christophe Coevoet
fbc353dcda bug #16799 Improve error message for undefined DIC aliases (mpdude)
This PR was squashed before being merged into the 2.3 branch (closes #16799).

Discussion
----------

Improve error message for undefined DIC aliases

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

Additionally, I think the arguments need to be the other way round (`templating` is an alias pointing to `templating.engine.twig`).

Commits
-------

9195cd3 Improve error message for undefined DIC aliases
2015-12-05 11:09:09 +01:00
Matthias Pigulla
9195cd3e44 Improve error message for undefined DIC aliases 2015-12-05 11:09:07 +01:00
Christophe Coevoet
26d9a6f822 minor #16810 [DependencyInjection] Validate class names and factory methods (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] Validate class names and factory methods

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

Because, you know, people do mistakes... I saw this happening during a workshop: when e.g. the factory tag has no `method` attribute, we generate an container that embeds a parse error.

Commits
-------

b2e3850 [DependencyInjection] Validate class names and factory methods
2015-12-05 11:07:33 +01:00
Antoine LA
a72efb91c5 [VarDumper] fixed .sf-dump z-index 2015-12-05 11:02:55 +01:00
Tobias Schultze
6e279c5f8a [FrameworkBundle] prevent cache:clear creating too long paths 2015-12-05 03:07:20 +01:00
Nicolas Grekas
b2e3850d85 [DependencyInjection] Validate class names and factory methods 2015-12-03 12:23:33 +01:00
Sébastien Santoro
717caaa1a9 ampq → amqp
Fixed typo in code comment.
2015-12-03 11:46:32 +01:00
Tobias Schultze
8ab107c905 minor #16780 CS: remove unneeded parentheses around control statements (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: remove unneeded parentheses around control statements

| 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

Commits
-------

45d250d CS: remove unneeded parentheses around control statements
2015-12-03 10:03:30 +01:00
Jeremy Benoist
230acb2841 Fix typo 2015-12-03 06:49:53 +01:00
Christophe Coevoet
d1d9ab7d2a Merge branch '2.3' into 2.7
* 2.3:
  Refactoring EntityUserProvider::__construct() to not do work, cause cache warm error
2015-12-02 17:04:31 +01:00
Ryan Weaver
44a28612da Refactoring EntityUserProvider::__construct() to not do work, cause cache warm error 2015-12-02 16:35:49 +01:00
Dariusz Ruminski
d3f671e8f6 CS: general fixes 2015-12-01 23:08:33 +01:00
Dariusz Ruminski
45d250d25f CS: remove unneeded parentheses around control statements 2015-12-01 12:58:24 +01:00
Nicolas Grekas
e6efe7ee5c [TwigBridge] Clean deps now that 2.8.0 is tagged 2015-12-01 07:51:36 +01:00
Jérémy Romey
8c45107856 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command 2015-11-30 14:03:45 +01:00
Fabien Potencier
13fda1c7c5 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix signaling/stopping logic on Windows
  [Yaml] minor CS cleaning
  [Console] do not encode backslashes in console default description
2015-11-30 13:32:50 +01:00
Nicolas Grekas
9afbea27e9 [Process] Fix signaling/stopping logic on Windows 2015-11-30 11:29:50 +01:00
Nicolas Grekas
ef61e5481f Forward compatibility with AbstractLayout* 2.8 tests 2015-11-29 18:06:34 +01:00
Martin Hujer
613804d0cf [Yaml] minor CS cleaning 2015-11-29 11:53:50 +01:00
Nicolas Grekas
beb8525fe4 [Bridge/Twig] Fix lowest form dep 2015-11-29 10:55:05 +01:00
Tobias Schultze
873a5417a8 [Console] do not encode backslashes in console default description 2015-11-28 23:15:59 +01:00
Nicolas Grekas
6001644ffe [Form] Fix tests and reference usage 2015-11-28 17:53:21 +01:00
Fabien Potencier
e3f4278d59 Merge branch '2.3' into 2.7
* 2.3:
  [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released
2015-11-28 12:02:41 +01:00
Fabien Potencier
b2899a6c2e bug #16312 [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released (mpdude)
This PR was squashed before being merged into the 2.3 branch (closes #16312).

Discussion
----------

[HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released

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

I've been trying to debug #15813 and modified the Store in a way to keep unique request IDs in the .lck file. That way, I was hoping to find out which request is blocking and/or if the request is actually still running.

It turned out that `is_file()` would claim that a lock file still exists, but a subsequent attempt to read the information from that file returned "file not found" errors.

So, my assumption is that the `is_file()` result is based on the fstat cache and wrong once a process has seen the lock file.

@jakzal said in https://github.com/symfony/symfony/issues/15813#issuecomment-149013691 that `unlink()`ing the lock file should clear the statcache, but I doubt this is true across PHP processes.

Commits
-------

982710f [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released
2015-11-28 11:48:57 +01:00
Matthias Pigulla
982710ff18 [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released 2015-11-28 11:48:55 +01:00
Pieter
a35d3d44d0 [WIP] [Form] [TwigBridge] Bootstrap horizontal theme missing tests 2015-11-28 11:44:04 +01:00
Michal Piotrowski
62b3cb2805 AssetBundle - fix docs 2015-11-28 11:26:33 +01:00
Fabien Potencier
0cb308f634 minor #16697 CS: remove impossible default argument value (keradus)
This PR was merged into the 2.7 branch.

Discussion
----------

CS: remove impossible default argument value

| 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

Commits
-------

acef3a3 CS: remove impossible default argument value
2015-11-28 11:22:51 +01:00
Nicolas Grekas
60b02fcc97 Merge branch '2.3' into 2.7
* 2.3:
  [ci] Force update of ./phpunit deps
  [Process] Don't catch RuntimeException when it complicates tests debugging
  [appveyor] Workaround transient segfault when APCu is enabled
2015-11-28 10:05:32 +01:00
Nicolas Grekas
d628d925c1 bug #16685 [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false

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

Commits
-------

1179f07 [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false
2015-11-27 23:37:53 +01:00
Bernhard Schussek
1179f0727b [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false 2015-11-27 15:25:47 +01:00
Nicolas Grekas
2a16e87aec [Form] Fix missing choices_as_values=true in tests 2015-11-27 14:50:51 +01:00
Bernhard Schussek
3ab8189080 [Form] Deprecated setting "choices_as_values" to "false" 2015-11-27 10:37:24 +01:00
Nicolas Grekas
8588a4f63b [Process] Don't catch RuntimeException when it complicates tests debugging 2015-11-27 09:37:23 +01:00
Fabien Potencier
d65b92469e Merge branch '2.3' into 2.7
* 2.3:
  Fixed the wrong source name and the ja translation
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset
2015-11-27 06:41:56 +01:00
hainey
90f3b941d3 Fixed the wrong source name and the ja translation 2015-11-27 06:41:08 +01:00
Dariusz Ruminski
acef3a3b34 CS: remove impossible default argument value 2015-11-26 23:11:33 +01:00
Fabien Potencier
98f827beab minor #16664 [Debug] fix readme: DebugClassLoader moved to debug itself (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] fix readme: DebugClassLoader moved to debug itself

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/16663#discussion_r45866385
| License       | MIT
| Doc PR        | -

Commits
-------

123a300 [Debug] fix readme: DebugClassLoader moved to debug itself
2015-11-26 21:07:32 +01:00
Tobias Schultze
123a300ad7 [Debug] fix readme: DebugClassLoader moved to debug itself 2015-11-26 21:02:12 +01:00
Tobias Schultze
55f84a3369 [SecurityBundle] disable the init:acl command if ACL is not used 2015-11-26 20:19:29 +01:00
Tobias Schultze
478375d664 [DI] remove useless condition around unset 2015-11-26 18:53:25 +01:00
Fabien Potencier
99c05b3fc4 bug #16679 [Form] Disabled view data validation if "data_class" is set to null (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Disabled view data validation if "data_class" is set to null

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

After this PR, Form::setData() does not validate the view data anymore when "data_class" is set to `null`. This way it is possible to create fields with dynamic view data types (see #14877).

Commits
-------

f495410 [Form] Disabled view data validation if "data_class" is set to null
2015-11-26 18:18:04 +01:00
Nicolas Grekas
0a40b543e4 Merge branch '2.3' into 2.7
* 2.3:
  [HttpFoundation] Workaround HHVM rewriting HTTP response line

Conflicts:
	src/Symfony/Component/HttpFoundation/Response.php
2015-11-26 10:20:19 +01:00
Bernhard Schussek
f495410d25 [Form] Disabled view data validation if "data_class" is set to null 2015-11-26 10:11:54 +01:00
Nicolas Grekas
d1a50a2b61 Merge branch '2.3' into 2.7
* 2.3:
  Always enable clock-mock for HttpFoundation
  [ClassLoader] Fix parsing namespace when token_get_all() is missing
  Bug #16343 [Router] Too many Routes ?
2015-11-26 08:00:48 +01:00
Nicolas Grekas
5013f9895f [HttpFoundation] Workaround HHVM rewriting HTTP response line 2015-11-26 07:58:58 +01:00
Nicolas Grekas
4a17c9e6af [ClassLoader] Fix parsing namespace when token_get_all() is missing 2015-11-25 18:16:22 +01:00
Jelte Steijaert
0113ac3ce2 Bug #16343 [Router] Too many Routes ? 2015-11-25 13:20:52 +01:00
Nicolas Grekas
01c08fccf4 [Debug] Ensure class declarations are loaded only once 2015-11-24 12:55:28 +01:00
Fabien Potencier
fc0ee0efd5 bumped Symfony version to 2.7.8 2015-11-23 13:27:27 +01:00
Fabien Potencier
d99f2410b3 updated VERSION for 2.7.7 2015-11-23 12:57:49 +01:00
Fabien Potencier
03eb2e909d bumped Symfony version to 2.3.36 2015-11-23 12:27:40 +01:00
Fabien Potencier
3b790dd0da updated VERSION for 2.3.35 2015-11-23 11:44:06 +01:00
Fabien Potencier
5edc71e2fc Merge branch '2.3' into 2.7
* 2.3:
  migrate session after remember me authentication
  prevent timing attacks in digest auth listener
  mitigate CSRF timing attack vulnerability
  fix potential timing attack issue
2015-11-23 11:34:14 +01:00
Fabien Potencier
f95078c409 security #16631 n/a (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

n/a

n/a

Commits
-------

f88e600 migrate session after remember me authentication
2015-11-23 11:22:15 +01:00
Fabien Potencier
d12cf1904c fixed tests 2015-11-23 11:17:36 +01:00
Christian Flothmann
f88e600833 migrate session after remember me authentication 2015-11-23 11:04:06 +01:00
Christian Flothmann
819aa54fe4 prevent timing attacks in digest auth listener 2015-11-23 11:02:49 +01:00
Christian Flothmann
557ea17eeb mitigate CSRF timing attack vulnerability 2015-11-23 11:02:49 +01:00
Christian Flothmann
f1fd7686c5 fix potential timing attack issue 2015-11-23 11:02:49 +01:00
Nicolas Grekas
c91638f826 Merge branch '2.3' into 2.7
* 2.3:
  Sent out a status text for unknown HTTP headers.
  [DependencyInjection] Unescape parameters for all types of injection
2015-11-20 18:41:18 +01:00
Daniel Wehner
eec6fbc768 Sent out a status text for unknown HTTP headers. 2015-11-19 17:24:57 +01:00
Fabien Potencier
16fb7016c8 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix trailing space in PHP binary finder
  Remove tmp addition of zend-stdlib
2015-11-19 17:11:24 +01:00
Tristan Darricau
331a0469c1 [DependencyInjection] Unescape parameters for all types of injection 2015-11-19 15:08:33 +01:00
Nicolas Grekas
1728dcca82 minor #16599 [Process] Fix trailing space in PHP binary finder (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix trailing space in PHP binary finder

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

Commits
-------

f15e6e0 [Process] Fix trailing space in PHP binary finder
2015-11-19 13:57:32 +01:00
Nicolas Grekas
f15e6e0ba9 [Process] Fix trailing space in PHP binary finder 2015-11-19 13:49:26 +01:00
Nicolas Grekas
6e015e7e0e Remove tmp addition of zend-stdlib 2015-11-19 13:33:53 +01:00
Nicolas Grekas
aa82cd338a Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix PhpProcess with phpdbg runtime

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
2015-11-18 17:27:55 +01:00
Nicolas Grekas
9669238af6 [Process] Fix PhpProcess with phpdbg runtime 2015-11-18 16:41:59 +01:00
Nicolas Grekas
a8d21b5ca9 Merge branch '2.3' into 2.7
* 2.3:
  Fix undefined array $server
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
	src/Symfony/Component/Security/phpunit.xml.dist
2015-11-18 14:41:01 +01:00
Fabien Potencier
6f72d6346e minor #16580 Add missing exclusions from phpunit.xml.dist (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Add missing exclusions from phpunit.xml.dist

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

Commits
-------

d4880c4 Add missing exclusions from phpunit.xml.dist
2015-11-18 11:16:24 +01:00
Eugene Wissner
75aa6f68f8 Fix undefined array $server 2015-11-18 11:13:04 +01:00
Kevin Bond
c4068d923d Fix bug in windows detection 2015-11-18 10:54:26 +01:00