lp:~xaav/tsep/symfony

Created by xaav on 2011-07-11 and last modified on 2015-05-21

Mirrror of symfony framework.

Get this branch:
bzr branch lp:~xaav/tsep/symfony

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
xaav
Project:
The Search Engine Project
Status:
Mature

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://github.com/symfony/symfony.git.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was on 2015-05-22.

Import started on 2015-05-26 on russkaya and finished on 2015-05-26 taking 30 seconds — see the log
Import started on 2015-05-24 on neumayer and finished on 2015-05-24 taking 50 seconds — see the log
Import started on 2015-05-23 on pear and finished on 2015-05-23 taking 40 seconds — see the log
Import started on 2015-05-22 on pear and finished on 2015-05-22 taking 30 seconds — see the log

Recent revisions

7650. By Fabien Potencier on 2015-05-21

bug #14708 [TwigBridge] use proper class to fetch asset version strategy property (xabbuh)

This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] use proper class to fetch asset version strategy property

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

Commits
-------

01b7dd6 [TwigBridge] use proper class to fetch asset version strategy property

7649. By Fabien Potencier on 2015-05-21

minor #14707 [FrameworkBundle][TwigBundle] add changed debug command names to upgrade file (xabbuh)

This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][TwigBundle] add changed debug command names to upgrade file

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

Thanks to @timglabisch for noticing this in https://github.com/symfony/symfony/pull/11627#issuecomment-66521130.

Commits
-------

4443c4d add changed debug command names to upgrade file

7648. By Fabien Potencier on 2015-05-21

minor #14662 added supported format in commands supporting --format (fabpot)

This PR was merged into the 2.7 branch.

Discussion
----------

added supported format in commands supporting --format

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

replaces #14084

Commits
-------

ea874b6 added supported format in commands supporting --format
c4bf217 deprecated the --xml option for commands

7647. By Fabien Potencier on 2015-05-20

bug #14576 [DoctrineBridge][Form] Fix BC break in DoctrineType (malarzm)

This PR was squashed before being merged into the 2.7 branch (closes #14576).

Discussion
----------

[DoctrineBridge][Form] Fix BC break in DoctrineType

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

Commits
-------

3172d73 [DoctrineBridge][Form] Fix BC break in DoctrineType

7646. By Fabien Potencier on 2015-05-20

bug #14551 [2.7][Form] Fixed ChoiceType with legacy ChoiceList (xelaris)

This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Form] Fixed ChoiceType with legacy ChoiceList

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

The "Backwards compatibility" condition doesn't grap (e.g. when passing a `SimpleChoiceList` as `choice_list` on `ChoiceType`), as the default value for the `ChoiceType` option `preferred_choices` is `array()` instead of `null`. So I changed the condition from `null === $preferredChoices` to `empty($preferredChoices)`.
Then there was an issue with accessing `attr` in `form_div_layout.html.twig`, since the deprecated `Symfony\Component\Form\Extension\Core\View\ChoiceView` doesn't provide an `attr` attribute. Since the docblocks of `Symfony\Component\Form\ChoiceList\View\ChoiceListView` state `$choices` and `$preferredChoices` to be instances of `Symfony\Component\Form\ChoiceList\View\ChoiceView` instead of `Symfony\Component\Form\Extension\Core\View\ChoiceView` I fixed the template issue by mapping the deprecated `ChoiceView` objects to the new one with an empty `attr`.

@webmozart Could you have a look at it, please?

Without this PR the following example would render numeric values as labels:
```php
        $formBuilder->add('choices', 'choice', array(
            'choice_list' => new SimpleChoiceList(array(
                'creditcard' => 'Credit card payment',
                'cash' => 'Cash payment'
            ))
        ));
```

Commits
-------

a98e484 [Form] Fix ChoiceType with legacy ChoiceList

7645. By Fabien Potencier on 2015-05-20

bug #14648 [Console] Fix first choice was invalid when using value (ogizanagi)

This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fix first choice was invalid when using value

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

This PR solves the following issues encountered using question helper and choices questions:
- First choice was not selectable by value.
- ChoiceList with associative choices with mixed string and int keys has same issue with first choice.
- Fix inconsistency by always returning values as strings.

First point exemple:
![screenshot 2015-05-15 a 17 16 12](https://cloud.githubusercontent.com/assets/2211145/7655757/3344b39a-fb26-11e4-9fe7-0775616619bf.PNG)

Last two points are mainly edge cases. Indeed, if a QuestionChoice has something like :
```php
array(
    '0' => 'No environment',
    '1' => 'My environment 1',
    'env_2' => 'My environment 2',
    3 => 'My environment 3',
);
```
as choices, you will not be able to select the first choice and get an `InvalidArgumentException`:

```
There were 2 errors:

1) Symfony\Component\Console\Tests\Helper\QuestionHelperTest::testChoiceFromChoicelistWithMixedKeys with data set #0 ('0', '0')
InvalidArgumentException: Value "0" is invalid

2) Symfony\Component\Console\Tests\Helper\QuestionHelperTest::testChoiceFromChoicelistWithMixedKeys with data set #1 ('No environment', '0')
InvalidArgumentException: Value "No environment" is invalid
```

Moreover, even if you were able to select by value (`No environment`), you'll get an integer instead of a string:
```
Failed asserting that '0' is identical to 0.
```
For more consistency, the solution is to always return a string.

The issue does not exist in 2.6, as the `QuestionChoice::getDefaultValidator` handled things differently.

Commits
-------

03e4ab6 [Console] Fix first choice was invalid when using value

7644. By Fabien Potencier on 2015-05-20

minor #14595 [FrameworkBundle] Applied new styles to translation commands (ogizanagi)

This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Applied new styles to translation commands

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

## Translation debug

_Only the table layout and deprecation note is changed_

![screenshot 2015-05-09 a 17 09 17](https://cloud.githubusercontent.com/assets/2211145/7550802/45f9a53c-f670-11e4-8e33-6ec9de973c99.PNG)
![screenshot 2015-05-09 a 17 13 47](https://cloud.githubusercontent.com/assets/2211145/7551396/d57523e2-f686-11e4-907c-8b4183183ee1.PNG)

## Translation update

### Before:

![screenshot 2015-05-09 a 17 15 51](https://cloud.githubusercontent.com/assets/2211145/7550791/06cee3a4-f670-11e4-80f1-320e2768290c.PNG)

### After:

![screenshot 2015-05-09 a 17 03 59](https://cloud.githubusercontent.com/assets/2211145/7550797/45f3baaa-f670-11e4-9beb-ad6c6b10442c.PNG)
![screenshot 2015-05-09 a 17 04 35](https://cloud.githubusercontent.com/assets/2211145/7550799/45f7ed64-f670-11e4-9b77-9b602ea2920b.PNG)
![screenshot 2015-05-09 a 17 05 06](https://cloud.githubusercontent.com/assets/2211145/7550800/45f97904-f670-11e4-8b60-c73095b74800.PNG)
![screenshot 2015-05-09 a 17 06 07](https://cloud.githubusercontent.com/assets/2211145/7550798/45f6508a-f670-11e4-9c21-7247691df985.PNG)

Commits
-------

812fedc [FrameworkBundle] Applied new styles to translation commands

7643. By Fabien Potencier on 2015-05-20

minor #14665 [HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel (xabbuh)

This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel

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

I agree that we should not trigger the deprecation warning when the `ContainerAwareHttpKernel` is used in the framework code. However, developers using this class in their own code should receive a warning to be able to prepare their applications for Symfony 3.0.

Commits
-------

030731a [HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel

7642. By Fabien Potencier on 2015-05-20

minor #14666 [UPGRADE] Mention the CSS strategy and it's effects (WouterJ)

This PR was squashed before being merged into the 2.7 branch (closes #14666).

Discussion
----------

[UPGRADE] Mention the CSS strategy and it's effects

The CSS strategy, which is automatically applied to Twig CSS files as of Symfony 2.7, results in different behaviour when outputting reserved characters like `#123456`. This has to be documented in the UPGRADE file.

See https://github.com/javiereguiluz/EasyAdminBundle/pull/305 for an example.

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

Commits
-------

8b891ff [UPGRADE] Mention the CSS strategy and it's effects

7641. By Fabien Potencier on 2015-05-19

minor #14688 [Routing] clarify deprecation message (xabbuh)

This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] clarify deprecation message

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

as reported by @javiereguiluz in https://github.com/symfony/symfony/commit/7784b29e5afa4aed419b55e857cf9313627aa408#commitcomment-11229119

Commits
-------

8a99645 [Routing] clarify deprecation message

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers