Commit Graph

21604 Commits

Author SHA1 Message Date
Fabien Potencier
e0c058172b minor #15367 [Asset] removed unused private property. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Asset] removed unused private property.

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

Commits
-------

a1772b6 [Asset] removed unused private property.
2015-07-26 10:55:39 +02:00
Christian Flothmann
1e15761ac7 [TwigBridge] type-dependent path discovery
With the introduction of the `AbstractFileExtractor` in Symfony 2.7, the
`extract()` method in the `TwigExtractor` class does not necessarily
deal with `SplFileInfo` instances from the Finder component, but also
receives `\SplFileInfo` objects initialized by the base extractor class.
2015-07-26 08:32:57 +02:00
Marcos Sánchez
2bf78e5f20 Resources as string have the same problem 2015-07-26 08:32:57 +02:00
Marcos Sánchez
aa7cbbd205 Introduce failing test case when a SplFileInfo object is passed to the extract() method in the TwigExtractor.
The problem is that when there's a twig error, symfony expects the `getRelativePath` method that the native object doesn't have.
2015-07-26 08:32:57 +02:00
Vincent AUBERT
e3914460f3 #15331 add infos about deprecated classes to UPGRADE-3.0 2015-07-26 08:07:15 +02:00
Hugo Hamon
a1772b6a23 [Asset] removed unused private property. 2015-07-25 23:47:31 +03:00
Nicolas Grekas
38b9a88968 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] Static Code Analysis for Components
  [Security/Http] Fix test relying on a private property
2015-07-24 10:19:55 +02:00
Fabien Potencier
4b136f9e35 bug #15345 [Twig+FrameworkBundle] Fix forward compat with Form 2.8 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Twig+FrameworkBundle] Fix forward compat with Form 2.8

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

When these layouts are used with form 2.8, the readonly attribute is rendered twice. This has no practical consequence, but it breaks tests. This is the last fix required to make 2.7 green again.

Commits
-------

75dc464 [Twig+FrameworkBundle] Fix forward compat with Form 2.8
2015-07-24 09:08:55 +02:00
Nicolas Grekas
75dc464db8 [Twig+FrameworkBundle] Fix forward compat with Form 2.8 2015-07-23 11:16:04 +02:00
Fabien Potencier
e60795691c bug #15330 [Console] Fix console output with closed stdout (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fix console output with closed stdout

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

Commits
-------

534d9fc [Console] Fix console output with closed stdout
2015-07-23 11:15:22 +02:00
Fabien Potencier
ee98096db0 bug #15339 [Serializer] Fix 2 bugs regarding private setters (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix 2 bugs regarding private setters

| 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

Fix two bugs reported in b5990be491 (commitcomment-12301266)

1. Arguments set in the constructor was not properly removed from `$data`
2. `GetSetMethodNormalizer` was calling private setters, throwing an exception

cc @StanAngeloff

Commits
-------

65e9f26 [Serializer] Fix bugs reported in b5990be491 (commitcomment-12301266)
2015-07-23 04:30:43 +02:00
Fabien Potencier
08f696c3e6 minor #15317 [2.6] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.6 branch (closes #15317).

Discussion
----------

[2.6] 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):
    - fixed couple potential issues when code is running in a phar-file

Commits
-------

37a2353 [2.6] Static Code Analysis for Components
2015-07-23 04:17:28 +02:00
Vladimir Reznichenko
37a235394e [2.6] Static Code Analysis for Components 2015-07-23 04:17:26 +02:00
Fabien Potencier
fa1ab249bc minor #15333 [Security] removed useless else condition in SwitchUserListener class. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] removed useless else condition in SwitchUserListener class.

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

Commits
-------

1fc0315 [Security] removed useless else condition in SwitchUserListener class.
2015-07-23 04:13:32 +02:00
Fabien Potencier
713a8b0b31 minor #15338 [Security/Http] Fix test relying on a private property (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security/Http] Fix test relying on a private property

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

I'm not 100% sure what was tested by this, but this test was using a private property (`AnonymousToken->key`), that has been renamed to `secret` in later Sf versions.

Commits
-------

2d29ac1 [Security/Http] Fix test relying on a private property
2015-07-23 04:10:27 +02:00
Nicolas Grekas
2d29ac1e10 [Security/Http] Fix test relying on a private property 2015-07-22 23:35:10 +02:00
Kévin Dunglas
65e9f268fe [Serializer] Fix bugs reported in b5990be491 (commitcomment-12301266) 2015-07-22 21:42:44 +02:00
Hugo Hamon
1fc03155d4 [Security] removed useless else condition in SwitchUserListener class. 2015-07-22 15:05:05 +02:00
Nicolas Grekas
d3874eca2c [travis] Tests deps=low with PHP 5.6 2015-07-22 13:57:38 +02:00
Nicolas Grekas
5d841a2b03 Merge branch '2.6' into 2.7
* 2.6:
  [HttpKernel] Fix lowest dep

Conflicts:
	src/Symfony/Component/HttpKernel/composer.json
2015-07-22 13:20:14 +02:00
Nicolas Grekas
07b3fa9c1c [HttpKernel] Fix lowest dep 2015-07-22 13:18:53 +02:00
Nicolas Grekas
bf889d3534 Merge branch '2.6' into 2.7
* 2.6:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-07-22 12:11:00 +02:00
Nicolas Grekas
b0d97b71c5 Merge branch '2.3' into 2.6
* 2.3:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-07-22 12:08:40 +02:00
Fabien Potencier
18fe999349 minor #15322 [travis] Fix deps=high/low jobs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Fix deps=high/low jobs

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

Commits
-------

1c9b433 [travis] Fix deps=high jobs
2015-07-22 10:24:19 +02:00
Jakub Zalas
534d9fc560 [Console] Fix console output with closed stdout 2015-07-22 09:03:09 +01:00
Fabien Potencier
0da0f9eb43 bug #15326 [Security] fix check for empty usernames (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fix check for empty usernames

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

Commits
-------

6585fe4 [Security] fix check for empty usernames
2015-07-22 09:58:47 +02:00
Fabien Potencier
4842bfa52b minor #15311 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Simplify AbstractNormalizer::prepareForDenormalization()

| 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

Commits
-------

72dce30 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization()
2015-07-22 09:09:55 +02:00
Christian Flothmann
6585fe45a2 [Security] fix check for empty usernames 2015-07-22 08:52:48 +02:00
Fabien Potencier
45861d4490 minor #15324 [Form] updated exception message of ButtonBuilder::setRequestHandler() (issei-m)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #15324).

Discussion
----------

[Form] updated exception message of ButtonBuilder::setRequestHandler()

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

Commits
-------

b483ee2 [Form] updated exception message of ButtonBuilder::setRequestHandler()
2015-07-22 05:26:59 +02:00
Issei.M
b483ee2d02 [Form] updated exception message of ButtonBuilder::setRequestHandler() 2015-07-22 05:26:59 +02:00
Nicolas Grekas
1c9b43396f [travis] Fix deps=high jobs 2015-07-21 19:12:21 +02:00
Christophe Coevoet
0a7c5834aa minor #15323 Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 (Kevinrob)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7

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

Commits
-------

6ecc38a Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7
2015-07-21 17:42:13 +02:00
Kevin Robatel
6ecc38afd4 Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 2015-07-21 16:40:08 +02:00
Kévin Dunglas
72dce30309 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() 2015-07-19 14:40:25 +02:00
Fabien Potencier
99f3475a2a Merge branch '2.6' into 2.7
* 2.6:
  [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
  bumped Symfony version to 2.6.11
  updated VERSION for 2.6.10
  updated CHANGELOG for 2.6.10
  [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
2015-07-16 14:21:55 +02:00
Fabien Potencier
dcb0255b35 bug #15291 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3

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

Commits
-------

1adb065 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
2015-07-16 14:05:57 +02:00
Fabien Potencier
510b2d2de6 bug #15249 [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content (dunglas)
This PR was squashed before being merged into the 2.3 branch (closes #15249).

Discussion
----------

[HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content

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

* Allows to fix tests of https://github.com/symfony/psr-http-message-bridge with PHP 5.6.
* Ease the transition to PSR-7 (in PSR-7, almost everything is stream - #15186)

Maybe should I open it against 2.8 but it can be considered a bug fix at least for the part "returning a string as a resource".

Commits
-------

059964d [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
2015-07-16 13:32:10 +02:00
Kévin Dunglas
059964daf3 [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content 2015-07-16 13:31:59 +02:00
Nicolas Grekas
1adb065d70 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 2015-07-16 10:44:13 +02:00
Fabien Potencier
d6af4ad7bf bug #15282 [HttpFoundation] Behaviour change in PHP7 for substr (Nicofuma)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Behaviour change in PHP7 for substr

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

In PHP7 the behaviour of substr() changed.
To resume: "Truncating an entire string should result in a string."

See: https://bugs.php.net/bug.php?id=62922

Commits
-------

ba6000b [HttpFoundation] Behaviour change in PHP7 for substr
2015-07-16 01:29:21 +02:00
Fabien Potencier
302b717fce minor #15288 [DependencyInjection] Remove unused code in XmlFileLoader (dunglas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Remove unused code in XmlFileLoader

| 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

Commits
-------

7fa79da [DependencyInjection] Remove unused code in XmlFileLoader
2015-07-16 01:20:23 +02:00
Fabien Potencier
caba8f4cf1 minor #15280 [Console] Set QuestionHelper max attempts in tests (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Set QuestionHelper max attempts in tests

Otherwise the process will block if a test fails.

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

QuestionHelper tests will block the phpunit process if any of tests fails. This is what's currently happening on 2.8 branch. As soon as this is merged to 2.7 and 2.8, I can work on fixing 2.8 tests.

re #14638

Commits
-------

23bc264 [Console] Set QuestionHelper max attempts in tests
2015-07-16 01:18:05 +02:00
Fabien Potencier
be4f2d5b24 bug #15277 [Form] Fix a BC break in the entity (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix a BC break in the entity

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

@webmozart this brings back the old behaviour. Attached test case passes on 2.3 with no code modifications.

Code [here](73bbaa6cc7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php (L199-L206)) promises any integer number can be handled with `createChoiceName()`:

```php
            // If the object has a single-column, numeric ID, use that ID as
            // field name. We can only use numeric IDs as names, as we cannot
            // guarantee that a non-numeric ID contains a valid form name
            if ($idReader->isIntId()) {
                return array(__CLASS__, 'createChoiceName');
            }
            // Otherwise, an incrementing integer is used as name automatically
```

While `createChoiceName()` can only handle natural numbers.

Commits
-------

03642b8 [Form] Fix a BC break in the entity
2015-07-16 01:16:36 +02:00
Kévin Dunglas
7fa79dadba [DependencyInjection] Remove unused code in XmlFileLoader 2015-07-15 23:26:13 +02:00
Christian Flothmann
0199fbf545 [Config] type specific check for emptiness 2015-07-15 19:51:32 +02:00
Tristan Darricau
ba6000baff [HttpFoundation] Behaviour change in PHP7 for substr
In PHP7 the behaviour of substr() changed.
To resume: "Truncating an entire string should result in a string."

See: https://bugs.php.net/bug.php?id=62922
2015-07-15 15:30:38 +02:00
Jakub Zalas
23bc2649ba [Console] Set QuestionHelper max attempts in tests
Otherwise the process will block if a test fails.
2015-07-15 08:34:36 +01:00
Jakub Zalas
03642b8ffe [Form] Fix a BC break in the entity 2015-07-14 19:21:52 +01:00
Fabien Potencier
bb54d8ce33 bug #15271 fix broken ChoiceQuestion (sstok)
This PR was merged into the 2.7 branch.

Discussion
----------

fix broken ChoiceQuestion

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

Commit 175af7f3ac (diff-e1d5cef4b49c9c530f50aae153f6a541) seems to have introduced an unnoticed bug. QuestionHelperTest hangs the tests (due to throwing an undefined index exception internally).

Its a bit strange why this happend but it seems somehow Git messed-up the patch somewhere during the process. The broken commit only exists in the commit and not in any downstream branches.

Commits
-------

3fcf61e fix broken ChoiceQuestion
2015-07-14 17:28:36 +02:00
Sebastiaan Stok
3fcf61e664 fix broken ChoiceQuestion 2015-07-14 11:47:38 +02:00