Commit Graph

38569 Commits

Author SHA1 Message Date
Christian Flothmann
7efc487333 Merge branch '3.4' into 4.1
* 3.4:
  Fix docs
  enabled short array notation in CS
  [fabbot] enable short arrays
  bumped Symfony version to 3.4.22
  updated VERSION for 3.4.21
  update CONTRIBUTORS for 3.4.21
  updated CHANGELOG for 3.4.21
2019-01-10 08:32:51 +01:00
Fabien Potencier
a5c52b81f2 minor #29815 [Console] Fix phpdoc for InputOption shortcut (tvlooy)
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #29815).

Discussion
----------

[Console] Fix phpdoc for InputOption shortcut

symfony documentation tells people to pass null, and it is the default, but the method docs don't allow it so static analyzers complain about it (spotted by phan)

| Q             | A
| ------------- | ---
| Branch?       |  3.4 (careful when merging)
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

64a65e9cd1 Fix docs
2019-01-09 19:02:33 +01:00
Tom Van Looy
64a65e9cd1 Fix docs
symfony documentation tells people to pass null, and it is the default, but the method docs don't allow it so static analyzers complain about it (spotted by phan)
2019-01-09 19:02:24 +01:00
Fabien Potencier
3245cb48da enabled short array notation in CS 2019-01-08 09:38:39 +01:00
Fabien Potencier
cb07a3b551 minor #29811 [fabbot] enable short arrays (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[fabbot] enable short arrays

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

Let's move to short arrays, but let's do it in a smooth way.
This PR enables short arrays for php-cs-fixer, making PRs red when they don't follow the CS.
We should then ask all authors of pending PRs to rebase their PR and apply the CS patch.
This will need some time.
Then, in 1-2 months, we'll be able to move all the code base to short arrays without creating hundred merge conflicts with all pending PRs, hopefully.

Commits
-------

84e72e0061 [fabbot] enable short arrays
2019-01-08 08:25:04 +01:00
Nicolas Grekas
84e72e0061 [fabbot] enable short arrays 2019-01-07 21:28:45 +01:00
Fabien Potencier
4ef814a19d bumped Symfony version to 4.1.11 2019-01-06 17:18:42 +01:00
Fabien Potencier
96e5fca388
Merge pull request #29802 from fabpot/release-4.1.10
released v4.1.10
2019-01-06 17:16:32 +01:00
Fabien Potencier
379d486959 updated VERSION for 4.1.10 2019-01-06 17:16:13 +01:00
Fabien Potencier
0a7cfd365e updated CHANGELOG for 4.1.10 2019-01-06 17:16:07 +01:00
Fabien Potencier
7f04e55856 bumped Symfony version to 3.4.22 2019-01-06 17:15:41 +01:00
Fabien Potencier
c7a57e0bcc
Merge pull request #29801 from fabpot/release-3.4.21
released v3.4.21
2019-01-06 16:54:26 +01:00
Fabien Potencier
32863ef27b updated VERSION for 3.4.21 2019-01-06 16:53:59 +01:00
Fabien Potencier
4b6edcc4f8 update CONTRIBUTORS for 3.4.21 2019-01-06 16:53:38 +01:00
Fabien Potencier
6cce0c3001 updated CHANGELOG for 3.4.21 2019-01-06 16:53:08 +01:00
Fabien Potencier
64999e62d4 Merge branch '3.4' into 4.1
* 3.4:
  Add Japanese translation for #28479
2019-01-06 15:13:40 +01:00
Fabien Potencier
e12bbf2eb3 minor #29799 [Validator] Add Japanese translation for #28479 (issei-m)
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #29799).

Discussion
----------

[Validator] Add Japanese translation for #28479

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

7a0bddedea Add Japanese translation for #28479
2019-01-06 15:07:17 +01:00
Issei.M
7a0bddedea Add Japanese translation for #28479 2019-01-06 15:07:11 +01:00
Robin Chalas
1fa24cb363 Merge branch '3.4' into 4.1
* 3.4:
  properly fix tests on PHP 5
  fix tests on PHP 5
  bug #29697 [DI] Fixed wrong factory method in exception (Wojciech Gorczyca)
  Changed gender choice types to color
  remove no longer needed PHP version checks
  Fixed groupBy argument value in DefaultChoiceListFactoryTest
  [HttpKernel] Correctly Render Signed URIs Containing Fragments
  [HttpFoundation] Fix request uri when it starts with double slashes
2019-01-05 17:36:16 +01:00
Robin Chalas
7af9c5d39f minor #29792 [DependencyInjection] properly fix tests on PHP 5 (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[DependencyInjection] properly fix tests on PHP 5

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

Commits
-------

c8ced3a properly fix tests on PHP 5
2019-01-05 17:31:25 +01:00
Christian Flothmann
c8ced3a9a2 properly fix tests on PHP 5 2019-01-05 13:26:58 +01:00
Christian Flothmann
6d84aeb131 fix tests on PHP 5 2019-01-05 13:04:54 +01:00
Fabien Potencier
96b962d8c4 minor #29791 [PropertyAccess] remove doubled dot from exception message (xabbuh)
This PR was merged into the 4.1 branch.

Discussion
----------

[PropertyAccess] remove doubled dot from exception message

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

Commits
-------

4c04328b59 remove doubled dot from exception message
2019-01-05 12:58:34 +01:00
Christian Flothmann
4c04328b59 remove doubled dot from exception message 2019-01-05 12:52:22 +01:00
Fabien Potencier
3299f272fc minor #29782 [Intl] make type-hinted arguments nullable (xabbuh)
This PR was merged into the 4.1 branch.

Discussion
----------

[Intl] make type-hinted arguments nullable

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

Commits
-------

16ebeb395f [Intl] make type-hinted arguments nullable
2019-01-05 12:46:06 +01:00
Fabien Potencier
0a3d3d4dff bug #29697 [DI] Fixed wrong factory method in exception (Wojciech Gorczyca)
This PR was submitted for the 4.2 branch but it was merged into the 4.1 branch instead (closes #29697).

Discussion
----------

[DI] Fixed wrong factory method in exception

| Q             | A
| ------------- | ---
| Branch?       |  4.2 <!-- see below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #29678   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | n/a <!-- required for new features -->

When a service definition with a factory defines invalid arguments, the [resulting exception message ](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php#L70)incorrectly specifies the factory constructor instead of the factory method as not having the specified named arguments.

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

922885c892 [DI] Fixed wrong factory method in exception
2019-01-05 10:39:43 +01:00
Christian Flothmann
16ebeb395f [Intl] make type-hinted arguments nullable 2019-01-05 09:55:10 +01:00
Fabien Potencier
e38b5d2990 bug #29494 [HttpFoundation] Fix request uri when it starts with double slashes (alquerci)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpFoundation] Fix request uri when it starts with double slashes

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

When the `REQUEST_URI` starts with a slash no need to `parse_url()`. However to keep the same behaviour regarding the fragment we need to add a logic to remove it. While `parse_url()` handle all cases itself.

Commits
-------

cf850c1a15 [HttpFoundation] Fix request uri when it starts with double slashes
2019-01-05 09:05:37 +01:00
Fabien Potencier
9093e86887 bug #29697 [DI] Fixed wrong factory method in exception (Wojciech Gorczyca)
This PR was submitted for the 4.2 branch but it was merged into the 4.1 branch instead (closes #29697).

Discussion
----------

[DI] Fixed wrong factory method in exception

| Q             | A
| ------------- | ---
| Branch?       |  4.2 <!-- see below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #29678   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | n/a <!-- required for new features -->

When a service definition with a factory defines invalid arguments, the [resulting exception message ](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php#L70)incorrectly specifies the factory constructor instead of the factory method as not having the specified named arguments.

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

922885c892 [DI] Fixed wrong factory method in exception
2019-01-05 08:48:11 +01:00
Wojciech Gorczyca
922885c892 [DI] Fixed wrong factory method in exception 2019-01-05 08:48:02 +01:00
Fabien Potencier
482f49afde bug #29679 [HttpKernel] Correctly Render Signed URIs Containing Fragments (zanbaldwin)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel] Correctly Render Signed URIs Containing Fragments

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

- Rebuild the URL with the computed hash instead of appending it onto the end of the fragment.
- Update unit tests, and add new unit test to cover URIs that include fragments.

Commits
-------

b9ece6bde7 [HttpKernel] Correctly Render Signed URIs Containing Fragments
2019-01-05 08:46:55 +01:00
Fabien Potencier
8555ffc77e minor #29788 Changed gender choice types to color (aaronsomi)
This PR was merged into the 3.4 branch.

Discussion
----------

Changed gender choice types to color

| Q             | A
| ------------- | ---
| Branch?       | 3.4 <!-- see below -->
| Bug fix?      |no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? |no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #29737  <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | - <!-- required for new features -->

Commits
-------

fdf98af58b Changed gender choice types to color
2019-01-05 08:37:22 +01:00
Aaron Somi
fdf98af58b Changed gender choice types to color
Signed-off-by: Aaron Somi <aaronsomi@gmail.com>
2019-01-05 06:17:43 +00:00
Fabien Potencier
a1c8da08f6 minor #29769 [Form] Fix FormDefaultChoiceListFactory test (vudaltsov)
This PR was merged into the 3.4 branch.

Discussion
----------

[Form] Fix FormDefaultChoiceListFactory test

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

`$groupBy` is either `null` or `callable`. Passing `array()` is wrong.

Commits
-------

b8f6390ef9 Fixed groupBy argument value in DefaultChoiceListFactoryTest
2019-01-04 16:47:57 +01:00
Fabien Potencier
3ee1adbd90 minor #29776 remove no longer needed PHP version checks (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

remove no longer needed PHP version checks

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

Commits
-------

99448c6e78 remove no longer needed PHP version checks
2019-01-04 16:46:05 +01:00
Fabien Potencier
34c8a8b7ae minor #29778 remove no longer needed PHP version checks (xabbuh)
This PR was merged into the 4.1 branch.

Discussion
----------

remove no longer needed PHP version checks

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

Commits
-------

7a132fe156 remove no longer needed PHP version checks
2019-01-04 16:44:56 +01:00
Robin Chalas
2d84041a66 Merge branch '3.4' into 4.1
* 3.4:
  Ensure final input of CommandTester works with default
  [Intl] handle null date and time types
  Do not ignore the choice groups for caching
2019-01-04 16:13:30 +01:00
Christian Flothmann
7a132fe156 remove no longer needed PHP version checks 2019-01-04 16:09:47 +01:00
Christian Flothmann
99448c6e78 remove no longer needed PHP version checks 2019-01-04 14:48:06 +01:00
Robin Chalas
b645c07085 bug #29754 Ensure final input of CommandTester works with default (Firehed)
This PR was merged into the 3.4 branch.

Discussion
----------

Ensure final input of CommandTester works with default

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

If the final element of `CommandTester::setInputs()` is an empty string (to send the default value), the internal stream the tester uses hits EOF and triggers the `Aborted` exception. This appends an additional EOL to the stream after the `implode` to simulate one final return key, allowing the final input to use the default value when used in the tester's documented style.

A test has been added to cover the new behavior, which failed before this change.

Commits
-------

6b87b67 Ensure final input of CommandTester works with default
2019-01-04 05:56:21 +01:00
Eric Stern
6b87b67cf0 Ensure final input of CommandTester works with default
If the final element of `CommandTester::setInputs()` is an empty string (to send the default value), the internal stream the tester uses hits EOF and triggers the `Aborted` exception. This appends an additional EOL to the stream after the `implode` to simulate one final return key, allowing the final input to use the default value when used in the tester's documented style.
2019-01-04 05:42:43 +01:00
Valentin
b8f6390ef9 Fixed groupBy argument value in DefaultChoiceListFactoryTest 2019-01-04 02:14:05 +03:00
Fabien Potencier
44bb34680d bug #29695 [Form] Do not ignore the choice groups for caching (vudaltsov)
This PR was merged into the 3.4 branch.

Discussion
----------

[Form] Do not ignore the choice groups for caching

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

While working on a different issue I suddenly came over a strange behaviour.

```php
$builder
    ->add('choice1', ChoiceType::class, [
        'choices' => [
            'a' => 'a',
            'b' => 'b',
            'c' => 'c',
        ],
        'multiple' => true,
    ])
    ->add('choice2', ChoiceType::class, [
        'choices' => [
            'ab' => [
                'a' => 'a',
                'b' => 'b',
            ],
            'c' => 'c',
        ],
        'multiple' => true,
    ]);
```
The code above will result in two identical selects:

![image](https://user-images.githubusercontent.com/2552865/50459865-b3e36980-0980-11e9-8f3d-17f9cfa9a7f8.png)

The reason for this is hash generation in `Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator::createListFromChoices()` — it does not take array structure into account. See [the comment and the code below it](7f46dfb1c4/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php (L116)).

The comment says that the same choice list should be returned for the same collection of choices no matter the structure. This is wrong, because `ChoiceListInterface` has a method `getStructuredValues()` and thus a list instance cannot identified by a hash which does not take structure into account.

I propose a simple change that fixes this and allows for similar choice fields with different groupings.

ping @HeahDude

Commits
-------

9007911a85 Do not ignore the choice groups for caching
2019-01-03 16:02:55 +01:00
Nicolas Grekas
c573cfb4f5 bug #29738 [Intl] handle null date and time types (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[Intl] handle null date and time types

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

Commits
-------

6ded31a3b9 [Intl] handle null date and time types
2019-01-03 15:54:54 +01:00
Christian Flothmann
6ded31a3b9 [Intl] handle null date and time types 2019-01-03 13:58:33 +01:00
Christian Flothmann
4973a5e9e1 Merge branch '3.4' into 4.1
* 3.4:
  Fix: Adjust DocBlock
  \"ParserTest->getParserTestData()\" -> only some more tests
  [Lock] Pedantic improvements for lock
  [EventDispatcher] Fixed phpdoc on interface
  update year in license files
  [Console] Fix help text for single command applications
  Fix random test failure on lock
  improve error message when using test client without the BrowserKit component
  [Event Dispatcher] fixed 29703: TraceableEventDispatcher reset now sets callStack to null with test to dispatch after reset.
  Fixed minor typos
  Fix: Method can also return null
  [Stopwatch] Fixed phpdoc for category name
2019-01-03 10:05:57 +01:00
Fabien Potencier
05efd1243f minor #29752 [Process] Fix: Adjust DocBlock (localheinz)
This PR was merged into the 3.4 branch.

Discussion
----------

[Process] Fix: Adjust DocBlock

| Q             | A
| ------------- | ---
| Branch?       | `3.4`
| 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 PR

* [x] adjusts a DocBlock

Follows https://github.com/symfony/symfony/pull/29702#discussion_r244786824.

Commits
-------

f8be46be0e Fix: Adjust DocBlock
2019-01-03 04:13:23 +01:00
Andreas Möller
f8be46be0e
Fix: Adjust DocBlock 2019-01-02 22:24:08 +01:00
Fabien Potencier
bfebee84f7 minor #29723 "ParserTest->getParserTestData()" -> only some more tests (voku)
This PR was submitted for the master branch but it was squashed and merged into the 3.4 branch instead (closes #29723).

Discussion
----------

"ParserTest->getParserTestData()" -> only some more tests

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

Added only some more tests, because I missed to add ' into my selector and then I got this error ```SyntaxErrorException : Expected "]", but <delimiter "["``` ... so I tested my use-case directly here in the unit-tests.

Commits
-------

a95a8e418b \"ParserTest->getParserTestData()\" -> only some more tests
2019-01-02 10:30:59 +01:00
Lars Moelleken
a95a8e418b \"ParserTest->getParserTestData()\" -> only some more tests 2019-01-02 10:30:52 +01:00