Commit Graph

24879 Commits

Author SHA1 Message Date
Paráda József
ecf4591aae Removed non-existent directory from composer autoload 2016-01-12 08:24:40 +01:00
Tobias Schultze
0df74c8ba4 minor #17332 [2.8] [Routing] cs fix (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] [Routing] cs fix

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

- remove unused use statement in `ServiceRouterLoader`
- add missing param in phpdoc in `RouteCollectionBuilder`

Commits
-------

9982f96 [Routing] cs fix
2016-01-12 01:20:05 +01:00
Peter Rehm
5f4e968cb9 Fixed erroneous deprecation notice for extended Interfaces 2016-01-11 19:57:09 +01:00
Jules Pietri
9982f96caa [Routing] cs fix
- remove unused use statement in `ServiceRouterLoader`
- add missing param in phpdoc in `RouteCollectionBuilder`
2016-01-11 17:43:36 +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
Fabien Potencier
aa9801e8a2 bug #17078 [Bridge] [Doctrine] [Validator] Added support \IteratorAggregate for UniqueEntityValidator (Disparity)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #17078).

Discussion
----------

[Bridge] [Doctrine] [Validator] Added support \IteratorAggregate for UniqueEntityValidator

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

Expand the list of supported types of results returned from the repositories.
Added processing of type \IteratorAggregate (and as a consequence doctrine Collection)

Commits
-------

6ebd179 Added support \IteratorAggregate for UniqueEntityValidator
2016-01-11 11:04:47 +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
Fabien Potencier
ab00f68e2c minor #17319 [Form] fixed phpdoc in tests (mantulo)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17319).

Discussion
----------

[Form] fixed phpdoc in tests

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

fixed phpdoc

Commits
-------

0f8da34 Update AbstractChoiceListTest.php
2016-01-11 11:03:28 +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
Fabien Potencier
4d536bd09a bug #17298 [FrameworkBundle] Use proper class to fetch $versionStrategy property (dosten)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #17298).

Discussion
----------

[FrameworkBundle] Use proper class to fetch $versionStrategy property

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

This is a replacement of #17260

Commits
-------

e38fa13 Use proper class to fetch $versionStrategy property
2016-01-07 19:01:12 +01:00
Diego Saint Esteben
e38fa135ab Use proper class to fetch $versionStrategy property 2016-01-07 19:01:12 +01:00
Fabien Potencier
5d63c554e8 bug #17287 [HttpKernel] Forcing string comparison on query parameters sort in UriSigner (Tim van Densen)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17287).

Discussion
----------

[HttpKernel] Forcing string comparison on query parameters sort in UriSigner

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

The signing of an url fails when using query parameters with integers as keys.
The ksort function in the ```UriSigner``` class changes the order of the query params and causes to generate a different hash which results in a failed check.

In this PR we force a string comparison for ksort which keeps the correct order of parameters.

Commits
-------

2040139 Added sort order SORT_STRING for params in UriSigner
2016-01-07 14:44:10 +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
a16c752bbb Merge branch '2.8' into 3.0
* 2.8:
  [WebProfilerBundle] Remove loading status from AJAX toolbar after error
  Add missing apostrophe in setSaveHandler phpdoc
  [VarDumper] Fix typo
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:38:51 +01:00
Fabien Potencier
4555fecf53 Merge branch '2.7' into 2.8
* 2.7:
  Add missing apostrophe in setSaveHandler phpdoc
  [VarDumper] Fix typo
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:38:40 +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
Fabien Potencier
48b4bcfa47 bug #17063 bug #14246 [Filesystem] dumpFile() negates default file permissions (Hidde Boomsma)
This PR was merged into the 3.0 branch.

Discussion
----------

bug #14246 [Filesystem] dumpFile() negates default file permissions

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

Remain BC compatible with Symfony 2.8.
Without this change a chmod is needed after calling `dumpFile`, making it non atomic.

Commits
-------

53d6d4b bug #14246 [Filesystem] dumpFile() negates default file permissions
2016-01-07 14:25:41 +01:00
Fabien Potencier
ba75435a21 bug #17283 [WebProfilerBundle] Remove loading status from AJAX toolbar after error (kucharovic)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #17283).

Discussion
----------

[WebProfilerBundle] Remove loading status from AJAX toolbar after error

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

Commits
-------

079ab73 [WebProfilerBundle] Remove loading status from AJAX toolbar after error
2016-01-07 14:22:28 +01:00
Jakub Kucharovic
079ab73302 [WebProfilerBundle] Remove loading status from AJAX toolbar after error 2016-01-07 14:22:28 +01:00
Fabien Potencier
61daebfbee minor #17293 [HttpFoundation] Add missing apostrophe in setSaveHandler phpdoc (pawel-lewtak)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17293).

Discussion
----------

[HttpFoundation] Add missing apostrophe in setSaveHandler phpdoc

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

I fixed php code in comment to one of functions as it couldn't be used with simple copy and paste.

Commits
-------

e32f5a2 Add missing apostrophe in setSaveHandler phpdoc
2016-01-07 14:19:31 +01:00
pawel-lewtak
e32f5a2cd2 Add missing apostrophe in setSaveHandler phpdoc 2016-01-07 14:19:31 +01:00
Christophe Coevoet
5d18788dfe minor #17289 [VarDumper] Fix typo (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix typo

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

Commits
-------

cb70360 [VarDumper] Fix typo
2016-01-07 12:43:18 +01:00
Nicolas Grekas
cb7036093e [VarDumper] Fix typo 2016-01-07 12:12:32 +01:00
Hidde Boomsma
53d6d4b5b3 bug #14246 [Filesystem] dumpFile() negates default file permissions 2016-01-06 14:42:56 +01:00
Titouan Galopin
a7b7766983 [FrameworkBundle] Add case in Kernel directory guess for PHPUnit 2016-01-06 11:27:30 +01:00
Nicolas Grekas
d14eae4b8a Merge branch '2.8' into 3.0
* 2.8:
  [Process] Fix potential race condition
  [PhpUnitBridge] Re-enable the garbage collector
  typo
  [FrameworkBundle] Allow to autowire service_container
  [FrameworkBundle] Set the kernel.name properly after a cache warmup
  Fix toolbar display when nvd3 is loaded on page
  Removed spaces before semicolon
  cast arrays to objects after parsing has finished

Conflicts:
	src/Symfony/Bridge/PhpUnit/bootstrap.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
	src/Symfony/Component/Console/Helper/DialogHelper.php
2016-01-06 11:01:25 +01:00
Nicolas Grekas
111f51dfa5 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix potential race condition
  [PhpUnitBridge] Re-enable the garbage collector
  typo
  [FrameworkBundle] Set the kernel.name properly after a cache warmup
  Removed spaces before semicolon
2016-01-06 10:59:23 +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
Nicolas Grekas
21427de1d0 bug #17275 [PhpUnitBridge] Re-enable the garbage collector (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PhpUnitBridge] Re-enable the garbage collector

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

The bug is fixed in PHP and disabling the gc causes issues elsewhere.

Commits
-------

478710f [PhpUnitBridge] Re-enable the garbage collector
2016-01-06 10:57:27 +01:00
Nicolas Grekas
707d359c0c bug #17276 [Process] Fix potential race condition (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix potential race condition

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

As seen at https://travis-ci.org/symfony/symfony/jobs/100448880#L2768, ProcessTest::testRunProcessWithTimeout can create an infinite blocking situation.
I found two potential code paths that could be subject to a race condition. This fixes them.

Commits
-------

b114a85 [Process] Fix potential race condition
2016-01-06 10:56:27 +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
Fabien Potencier
be80b0a40f bug #17261 [FrameworkBundle] Allow to autowire service_container (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Allow to autowire service_container

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

Commits
-------

4e2eef0 [FrameworkBundle] Allow to autowire service_container
2016-01-05 16:33:22 +01:00
Fabien Potencier
e9b8aae787 minor #17264 Fix typo in Locale class annotations (enumag)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17264).

Discussion
----------

Fix typo in Locale class annotations

Commits
-------

eab7e11 typo
2016-01-05 16:32:23 +01:00
Jáchym Toušek
eab7e11be7 typo 2016-01-05 16:32:23 +01:00
Kévin Dunglas
4e2eef08ed [FrameworkBundle] Allow to autowire service_container 2016-01-04 22:21:22 +01:00
Fabien Potencier
19a63356ef bug #17183 [FrameworkBundle] Set the kernel.name properly after a cache warmup (jakzal)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17183).

Discussion
----------

[FrameworkBundle] Set the kernel.name properly after a cache warmup

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

Commits
-------

1438b9a [FrameworkBundle] Set the kernel.name properly after a cache warmup
2016-01-04 18:15:55 +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
Fabien Potencier
5991565286 bug #17197 [Yaml] cast arrays to objects after parsing has finished (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] cast arrays to objects after parsing has finished

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

Casting arrays to objects must happen after the complete YAML string has
been parsed to avoid errors when parsing subsequent lines.

Commits
-------

8251d67 cast arrays to objects after parsing has finished
2016-01-04 17:50:38 +01:00
Fabien Potencier
674c07070d bug #17247 Fix toolbar display when nvd3 is loaded on page (Seldaek)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix toolbar display when nvd3 is loaded on page

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

Minor CSS fix for the toolbar, as nvd3 sets `svg { display: block }` so you end up with something like:

![image](https://cloud.githubusercontent.com/assets/183678/12079564/974aa694-b235-11e5-897e-ecb31ba20f26.png)

Commits
-------

d7010c0 Fix toolbar display when nvd3 is loaded on page
2016-01-04 17:49:06 +01:00
Tobias Schultze
431ea6b4ef Merge branch '2.8' into 3.0 2016-01-04 15:51:01 +01:00
Tobias Schultze
3686ed64b8 Merge branch '2.7' into 2.8 2016-01-04 15:50:03 +01:00
Tobias Schultze
fff265d451 Merge branch '2.3' into 2.7 2016-01-04 15:49:16 +01:00
Tobias Schultze
67ccb2d843 minor #17250 [WebProfilerBundle] Remove duplicated HTML attributes (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfilerBundle] Remove duplicated HTML attributes

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

Commits
-------

7335dee [WebProfilerBundle] Removed duplicated HTML attributes
2016-01-04 15:30:25 +01:00