Commit Graph

24799 Commits

Author SHA1 Message Date
Jules Pietri
ad8e98955f [Form] fixed EntityType test with query_builder option 2016-05-21 20:24:27 +02:00
Nicolas Grekas
7d6e9b20ab minor #18818 fix removed commands wording in upgrade file (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

fix removed commands wording in upgrade file

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

Commits
-------

3234ca4 fix removed commands wording in upgrade file
2016-05-20 17:01:42 +02:00
Christian Flothmann
3234ca491c fix removed commands wording in upgrade file 2016-05-19 21:50:23 +02:00
Nicolas Grekas
39a18cd95d minor #18780 [DX][DependencyInjection] Make Autowiring exceptions more future friendly (lemoinem)
This PR was merged into the 2.8 branch.

Discussion
----------

[DX][DependencyInjection] Make Autowiring exceptions more future friendly

| Q             | A
| ------------- | ---
| Branch?       | 2.8, 3.0
| Bug fix?      | no (forward compatibility)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

This is a follow-up on #18766 (3.1, master) and #18691 (2.8, 3.0).

This PR changes the exception messages to the ones introduced in #18766 and #17877. I also unified the tests so they are exactly the same.

This way the error messages will be the same in 2.8 onward.

Commits
-------

834f550 [DX][DI] Make Autowiring exceptions more future friendly
2016-05-19 09:30:57 +02:00
Mathieu Lemoine
834f550263 [DX][DI] Make Autowiring exceptions more future friendly 2016-05-13 15:42:47 -04:00
Fabien Potencier
bcdf568a19 Merge branch '2.7' into 2.8
* 2.7:
  Fix computation of PR diffs for component matrix lines
  [BUG] Delete class 'control-group' in bootstrap 3
  [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
2016-05-13 13:03:14 -05:00
Fabien Potencier
66da91d030 Merge branch '2.3' into 2.7
* 2.3:
  Fix computation of PR diffs for component matrix lines
2016-05-13 13:02:46 -05:00
Fabien Potencier
76223b2dd6 minor #18775 Fix computation of PR diffs for component matrix lines (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix computation of PR diffs for component matrix lines

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

Validated on https://travis-ci.org/symfony/symfony/jobs/130061271 who fails otherwise.

Commits
-------

e7a3ae7 Fix computation of PR diffs for component matrix lines
2016-05-13 13:00:07 -05:00
Fabien Potencier
208e6b0f9e bug #18774 [console][table] adjust width of colspanned cell. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[console][table] adjust width of colspanned cell.

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

Commits
-------

081ad73 [console][table] adjust width of colspanned cell.
2016-05-13 12:56:25 -05:00
Nicolas Grekas
e7a3ae7103 Fix computation of PR diffs for component matrix lines 2016-05-13 12:34:26 -05:00
Abdellatif Ait boudad
081ad731b6 [console][table] adjust width of colspanned cell. 2016-05-13 16:56:27 +01:00
Fabien Potencier
dd33721f05 bug #18507 [BUG] Delete class 'control-group' in bootstrap 3 (Philippe Degeeter)
This PR was submitted for the 3.0 branch but it was merged into the 2.7 branch instead (closes #18507).

Discussion
----------

[BUG] Delete class 'control-group' in bootstrap 3

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

Commits
-------

99f61d6 [BUG] Delete class 'control-group' in bootstrap 3
2016-05-13 10:45:44 -05:00
Philippe Degeeter
99f61d6df3 [BUG] Delete class 'control-group' in bootstrap 3 2016-05-13 10:45:43 -05:00
Fabien Potencier
0753bd70ae bug #18747 [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper (issei-m)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #18747).

Discussion
----------

[2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper

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

This bug was introduced in PR #17099. So does not represent in 2.8.2 or older.

If we have the following structure form:

```php
$builder = $formFactory->createBuilder();

$form = $builder
    ->add(
        $builder->create('person1_name', FormType::class, ['inherit_data' => true])
            ->add('first', TextType::class, ['property_path' => '[person1_first_name]'])
            ->add('last', TextType::class, ['property_path' => '[person1_last_name]'])
    )
    ->add(
        $builder->create('person2_name', FormType::class, ['inherit_data' => true])
            ->add('first', TextType::class, ['property_path' => '[person2_first_name]'])
            ->add('last', TextType::class, ['property_path' => '[person2_last_name]'])
    )
    ->getForm()
;
```

The following mapping for this form doesn't work correctly:

```php
$mapper = new ViolationMapper();
$mapper->mapViolation(new ConstraintViolation('', '', [], null, 'data[person1_first_name]', null), $form);

$form['person1_name']['first']->getErrors(); // empty
$form->getErrors(); // The violation is mapped to here instead.
```

## Cause

Because ViolationMapper uses `iterator_to_array` in [here](f29d46f29b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php (L165)) to collect the sub forms.

`person1_name` and `person2_name` enable `inherit_data` option. So ViolationMapper will attempt to collect the sub forms of root form like this:

```php
[
    'first' => Form object, // root.person1_name.first
    'last'  => Form object, // root.person1_name.last
    'first' => Form object, // root.person2_name.first
    'last'  => Form object, // root.person2_name.last
]
```

As you can see, The name `first` and `last` are used in two places, thus we cannot get result like that.
(first/last of person1_name are overwritten by person2_name's)

So the violation will finally lost the form where it should map to. It should pass `false` to `iterator_to_array`'s 2nd parameter.

Commits
-------

ae38660 [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
2016-05-13 10:41:05 -05:00
Issei.M
ae38660fde [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper 2016-05-13 10:41:04 -05:00
Fabien Potencier
1253b1d344 Merge branch '2.7' into 2.8
* 2.7:
  added missing constant in Response
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  added StaticVerionStrategyTest
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
  [console][table] adjust width of colspanned cell.
2016-05-13 10:38:45 -05:00
Fabien Potencier
4a065b44dd added missing constant in Response 2016-05-13 10:31:27 -05:00
Fabien Potencier
58f8f5174f Merge branch '2.3' into 2.7
* 2.3:
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
2016-05-13 10:28:37 -05:00
Fabien Potencier
c02eee0664 minor #18650 Update HTTP statuses list (dasmfm)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #18650).

Discussion
----------

Update HTTP statuses list

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

Commits
-------

fa99fbd Update HTTP statuses list
2016-05-13 10:22:51 -05:00
dasmfm
fa99fbd7cf Update HTTP statuses list 2016-05-13 10:22:39 -05:00
Fabien Potencier
f999e77202 bug #18635 [Console] Prevent fatal error when calling Command::getHelper without helperSet (chalasr)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #18635).

Discussion
----------

[Console] Prevent fatal error when calling Command::getHelper without helperSet

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

Patch attached to #18619

Commits
-------

31285c2 [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
2016-05-13 10:18:57 -05:00
Robin Chalas
31285c22fa [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
Use Command::setHelperSet rather than Command#setHelperSet in exception msg

Simplify exception message

Add DidYouForget to exception msg
2016-05-13 10:18:46 -05:00
Fabien Potencier
8648fe2ed3 bug #18686 [console][table] adjust width of colspanned cell. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[console][table] adjust width of colspanned cell.

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

Commits
-------

9b35449 [console][table] adjust width of colspanned cell.
2016-05-13 10:09:02 -05:00
Fabien Potencier
921f615a43 minor #18708 [Asset] added a test for StaticVerionStrategy (danionut90)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #18708).

Discussion
----------

[Asset] added a test for StaticVerionStrategy

| Q             | A
| ------------- | ---
| Branch?       | master
| 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
-------

80300f5 added StaticVerionStrategyTest
2016-05-13 10:01:47 -05:00
danionut90
80300f52d4 added StaticVerionStrategyTest 2016-05-13 10:01:47 -05:00
Fabien Potencier
93938be691 minor #18719 Add SplFileInfo array doc on Finder iterator methods so that IDE will known it (Haehnchen)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #18719).

Discussion
----------

Add SplFileInfo array doc on Finder iterator methods so that IDE will known it

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

Add support for IDE completion of Finder iterator in userland

see #16965, http://stackoverflow.com/questions/37034643/autocomplete-doesnt-work-on-symfonys-splfileinfofinder-method-in-foreach/37055206

Examples:
```php
$finder->size()->in()[0]->getContents();
foreach ($finder->size()->in() as $file) {
    $file->getContents();
}
```

Commits
-------

94b9e44 Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
2016-05-13 09:58:35 -05:00
Daniel Espendiller
94b9e44993 Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns 2016-05-13 09:58:35 -05:00
Fabien Potencier
f8f624b0d5 bug #18761 [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper (issei-m)
This PR was squashed before being merged into the 2.3 branch (closes #18761).

Discussion
----------

[2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper

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

For https://github.com/symfony/symfony/pull/18747

Commits
-------

7101cab [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
2016-05-13 09:43:54 -05:00
Issei.M
7101cab29f [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper 2016-05-13 09:43:53 -05:00
Christophe Coevoet
d9d8ea8910 minor #18770 Updated the link to the list of currency codes (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Updated the link to the list of currency codes

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

Commits
-------

09b70a1 Updated the link to the list of currency codes
2016-05-13 10:26:22 +02:00
Javier Eguiluz
09b70a1df4 Updated the link to the list of currency codes 2016-05-13 09:29:13 +02:00
Nicolas Grekas
c96d76dd5e Merge branch '2.7' into 2.8
* 2.7:
  Drop hirak/prestissimo
  bumped Symfony version to 2.7.14
  updated VERSION for 2.7.13
  updated CHANGELOG for 2.7.13
  bumped Symfony version to 2.3.42
  [Debug] Fix fatal error handlers on PHP 7
  updated VERSION for 2.3.41
  update CONTRIBUTORS for 2.3.41
  updated CHANGELOG for 2.3.41

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2016-05-12 10:20:14 -05:00
Nicolas Grekas
215c891310 Merge branch '2.3' into 2.7
* 2.3:
  Drop hirak/prestissimo
  bumped Symfony version to 2.3.42
  updated VERSION for 2.3.41
  update CONTRIBUTORS for 2.3.41
  updated CHANGELOG for 2.3.41

Conflicts:
	appveyor.yml
	src/Symfony/Component/HttpKernel/Kernel.php
2016-05-12 10:18:46 -05:00
Nicolas Grekas
b3da5df715 minor #18757 Drop hirak/prestissimo (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Drop hirak/prestissimo

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

unstable (see #18743 on appveyor)

Commits
-------

8f136ab Drop hirak/prestissimo
2016-05-12 10:16:26 -05:00
Nicolas Grekas
8f136ab665 Drop hirak/prestissimo 2016-05-12 07:44:15 -05:00
Fabien Potencier
7e59c71d9a bug #18737 [Debug] Fix fatal error handlers on PHP 7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Fix fatal error handlers on PHP 7

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

Currently, fatal error handlers are broken on PHP 7.

Commits
-------

c7d3b45 [Debug] Fix fatal error handlers on PHP 7
2016-05-10 11:50:18 -05:00
Fabien Potencier
e9ea57f6c7 bumped Symfony version to 2.8.7 2016-05-09 17:09:16 -05:00
Fabien Potencier
8408816780 Merge pull request #18740 from fabpot/release-2.8.6
released v2.8.6
2016-05-09 23:45:54 +02:00
Fabien Potencier
6d3b1e22c4 updated VERSION for 2.8.6 2016-05-09 16:45:36 -05:00
Fabien Potencier
ce1ca0255d updated CHANGELOG for 2.8.6 2016-05-09 16:45:27 -05:00
Fabien Potencier
ebdff4686d bumped Symfony version to 2.7.14 2016-05-09 16:42:27 -05:00
Fabien Potencier
7c23f76ba7 Merge pull request #18739 from fabpot/release-2.7.13
released v2.7.13
2016-05-09 22:35:47 +02:00
Fabien Potencier
d0c233ee4d updated VERSION for 2.7.13 2016-05-09 15:35:33 -05:00
Fabien Potencier
f31a08d69c updated CHANGELOG for 2.7.13 2016-05-09 15:35:20 -05:00
Fabien Potencier
4533220997 bumped Symfony version to 2.3.42 2016-05-09 15:32:07 -05:00
Nicolas Grekas
c7d3b45841 [Debug] Fix fatal error handlers on PHP 7 2016-05-09 15:05:29 -05:00
Fabien Potencier
f3f87ce00d Merge pull request #18738 from fabpot/release-2.3.41
released v2.3.41
2016-05-09 21:45:40 +02:00
Fabien Potencier
efd48596a9 updated VERSION for 2.3.41 2016-05-09 14:45:27 -05:00
Fabien Potencier
f80f588218 update CONTRIBUTORS for 2.3.41 2016-05-09 14:45:18 -05:00
Fabien Potencier
a5c27e37cd updated CHANGELOG for 2.3.41 2016-05-09 14:45:08 -05:00