Commit Graph

37821 Commits

Author SHA1 Message Date
Nicolas Grekas 510977dd19 Merge branch '4.1'
* 4.1:
  Enable native_constant_invocation CS fixer
2018-07-26 13:25:51 +02:00
Nicolas Grekas c4d10c4d4d Merge branch '4.0' into 4.1
* 4.0:
  Enable native_constant_invocation CS fixer
2018-07-26 13:24:31 +02:00
Nicolas Grekas b5143233d2 Merge branch '3.4' into 4.0
* 3.4:
  Enable native_constant_invocation CS fixer
2018-07-26 13:22:46 +02:00
Nicolas Grekas f569f58b66 Merge branch '2.8' into 3.4
* 2.8:
  Enable native_constant_invocation CS fixer
2018-07-26 13:19:56 +02:00
Nicolas Grekas 2ba0fa4a14 Enable native_constant_invocation CS fixer 2018-07-26 13:13:39 +02:00
Nicolas Grekas f51a76c583 Merge branch '4.1'
* 4.1:
  Fix tests for legacy phpunit versions
  Add missing Ukrainian translations
  Use an empty string as default for assertEquals
2018-07-26 13:01:15 +02:00
Nicolas Grekas 091c5f690d Merge branch '4.0' into 4.1
* 4.0:
  Fix tests for legacy phpunit versions
  Add missing Ukrainian translations
  Use an empty string as default for assertEquals
2018-07-26 13:00:49 +02:00
Nicolas Grekas 7e01f9b138 Merge branch '3.4' into 4.0
* 3.4:
  Fix tests for legacy phpunit versions
  Add missing Ukrainian translations
  Use an empty string as default for assertEquals
2018-07-26 13:00:39 +02:00
Nicolas Grekas dcdd803f40 Merge branch '2.8' into 3.4
* 2.8:
  Add missing Ukrainian translations
2018-07-26 12:58:10 +02:00
Nicolas Grekas bf7e25f759 Fix tests for legacy phpunit versions 2018-07-26 12:58:07 +02:00
Nicolas Grekas af5f7d34ba minor #28025 Use an empty string as default for assertEquals (DavidPrevot)
This PR was merged into the 3.4 branch.

Discussion
----------

Use an empty string as default for assertEquals

Make sure it isn’t interpreted as a type NULL, making the test fail with PHPUnit 7.2.

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

This shouldn’t break the existing tests, but will also make them work with recent PHPUnit.

Commits
-------

31353147a3 Use an empty string as default for assertEquals
2018-07-26 12:03:52 +02:00
Nicolas Grekas 2f6125f4cc minor #28034 [Validator] Add missing Ukrainian translations (azhurb)
This PR was merged into the 2.8 branch.

Discussion
----------

[Validator] Add missing Ukrainian translations

| Q             | A
| ------------- | ---
| Branch?       | 2.8 <!-- 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 -->
| License       | MIT

Add missing Ukrainian translations.

<!--
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
-------

b7d55ede15 Add missing Ukrainian translations
2018-07-26 11:27:25 +02:00
Nicolas Grekas f834c9262b Merge branch '4.1'
* 4.1:
  Alpha-ordering for "use" statements
2018-07-26 11:13:01 +02:00
Nicolas Grekas a23a4a4398 Merge branch '4.0' into 4.1
* 4.0:
  Alpha-ordering for "use" statements
2018-07-26 11:10:45 +02:00
Nicolas Grekas 6b7e951fdc Merge branch '3.4' into 4.0
* 3.4:
  Alpha-ordering for "use" statements
2018-07-26 11:08:35 +02:00
Nicolas Grekas 7b80bc2c78 Merge branch '2.8' into 3.4
* 2.8:
  Alpha-ordering for "use" statements
2018-07-26 11:06:28 +02:00
Nicolas Grekas 528eef336b Alpha-ordering for "use" statements 2018-07-26 11:03:18 +02:00
Nicolas Grekas e81285249b Merge branch '4.1'
* 4.1:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:59:12 +02:00
Nicolas Grekas 933b774844 Merge branch '4.0' into 4.1
* 4.0:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:55:25 +02:00
Nicolas Grekas b9433001cb Merge branch '3.4' into 4.0
* 3.4:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:51:09 +02:00
Nicolas Grekas f5939a8336 Merge branch '2.8' into 3.4
* 2.8:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
2018-07-26 10:45:46 +02:00
Nicolas Grekas 82d13dae31 minor #27852 Fix coding standards (stof)
This PR was squashed before being merged into the 2.8 branch (closes #27852).

Discussion
----------

Fix coding standards

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

This PR is mostly about running the PHP-CS-Fixer (v2.12.1) in the whole codebase.

- I updated the exclude rule to avoid some false positives for the `error_suppression` fixer (we have more files triggering unsilenced deprecations on purpose than when building the initial whitelist, mostly).
- I ran the fixer with this updated config. Most changes were related to fully-qualifying some constants, with the new fixer implemented in https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3127, for which @nicolas-grekas and I suggested a config to include in the Symfony ruleset. Based on the output, I suggested a feature request in https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/3872 as we might want to avoid the `\` in non-namespaced files to improve readability. We might want to remove the second commit of this PR if we decide to wait for the feature to be implemented (update: implementation is contributed in https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3876)
- I added the `native_function_invocation` fixer explicitly, to automatically fully-qualify calls to compiler-optimized functions. This feature was implemented in PHP-CS-Fixer based on our feature request (as currently, we do such thing only manually in some hot path, because it could not be automated). I opened https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3873 to include it in the ruleset automatically.

TODOs:
- [x] agree on the updated rules
- [x] update fabbot to use the new version of PHP-CS-Fixer
- [ ] make separate PRs for newer branches with their own updates (exclude rules, and CS fixes), once this PR gets merged.

Commits
-------

538c69dc26 Fix Clidumper tests
04654cfeb3 Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
f00b3279ea Apply fixers
720ed4d379 Disable the native_constant_invocation fixer until it can be scoped
8892b98627 Update the list of excluded files for the CS fixer
2018-07-26 10:30:16 +02:00
Nicolas Grekas 1730b7d9ef Merge branch '4.1'
* 4.1:
  fix merge
  bumped Symfony version to 4.1.3
  [PhpUnitBridge] Describe weak_vendors properly
  [HttpKernel] Fix merging bindings for controllers' locators
  updated VERSION for 4.1.2
  updated CHANGELOG for 4.1.2
  bumped Symfony version to 4.0.14
  updated VERSION for 4.0.13
  updated CHANGELOG for 4.0.13
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
  Chaining senders with their aliases should work
2018-07-26 10:29:03 +02:00
Nicolas Grekas 8305d615ab fix merge 2018-07-26 10:28:23 +02:00
Nicolas Grekas abe2a237a0 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] Fix merging bindings for controllers' locators
  bumped Symfony version to 4.0.14
  updated VERSION for 4.0.13
  updated CHANGELOG for 4.0.13
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
2018-07-26 10:24:24 +02:00
Nicolas Grekas cdc4f7ddd1 bumped Symfony version to 4.1.3 2018-07-26 10:23:27 +02:00
Nicolas Grekas 097ac83a50 Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] Fix merging bindings for controllers' locators
  bumped Symfony version to 3.4.14
  updated VERSION for 3.4.13
  updated CHANGELOG for 3.4.13
  bumped Symfony version to 2.8.44
2018-07-26 10:19:20 +02:00
Nicolas Grekas 3349ec66a7 Merge branch '2.8' into 3.4
* 2.8:
  bumped Symfony version to 2.8.44
2018-07-26 10:16:47 +02:00
Nicolas Grekas 1b9baa48bd bug #28052 [HttpKernel] Fix merging bindings for controllers' locators (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel] Fix merging bindings for controllers' locators

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

Commits
-------

94b620ebc2 [HttpKernel] Fix merging bindings for controllers' locators
2018-07-25 10:23:09 +02:00
Nicolas Grekas abc4ef2566 minor #28046 [PhpUnitBridge] Describe weak_vendors properly (greg0ire)
This PR was squashed before being merged into the 4.1 branch (closes #28046).

Discussion
----------

[PhpUnitBridge] Describe weak_vendors properly

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

The `weak_vendors` mode now displays deprecations, this behavior has changed since https://github.com/symfony/symfony/pull/25997

Commits
-------

336008c5d3 [PhpUnitBridge] Describe weak_vendors properly
2018-07-25 10:19:41 +02:00
Grégoire Paris 336008c5d3 [PhpUnitBridge] Describe weak_vendors properly 2018-07-25 10:19:35 +02:00
Samuel ROZE 975421c868 bug #28014 [Messenger] Fix chaining senders with their aliases (sroze)
This PR was merged into the 4.1 branch.

Discussion
----------

[Messenger] Fix chaining senders with their aliases

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

Turns out chaining senders when using their alias as the name is broken. This PR fixes it :)

Commits
-------

98bb64c32a Chaining senders with their aliases should work
2018-07-25 09:59:22 +02:00
Christophe Coevoet 538c69dc26 Fix Clidumper tests 2018-07-24 14:25:56 +02:00
Christophe Coevoet 04654cfeb3 Enable the fixer enforcing fully-qualified calls for compiler-optimized functions 2018-07-24 12:05:38 +02:00
Christophe Coevoet f00b3279ea Apply fixers 2018-07-24 09:48:17 +02:00
Christophe Coevoet 720ed4d379 Disable the native_constant_invocation fixer until it can be scoped
We don't want to run it on non-namespaced code to reduce visual clutter.
2018-07-24 09:45:01 +02:00
Christophe Coevoet 8892b98627 Update the list of excluded files for the CS fixer 2018-07-24 09:39:57 +02:00
Nicolas Grekas 94b620ebc2 [HttpKernel] Fix merging bindings for controllers' locators 2018-07-24 09:03:36 +02:00
Fabien Potencier c42cc18492
Merge pull request #28043 from fabpot/release-4.1.2
released v4.1.2
2018-07-23 19:16:40 +02:00
Fabien Potencier 971445977f updated VERSION for 4.1.2 2018-07-23 19:16:22 +02:00
Fabien Potencier 52c642b1f4 updated CHANGELOG for 4.1.2 2018-07-23 19:16:16 +02:00
Fabien Potencier b067f31147 bumped Symfony version to 4.0.14 2018-07-23 19:15:26 +02:00
Fabien Potencier b2fc878468
Merge pull request #28042 from fabpot/release-4.0.13
released v4.0.13
2018-07-23 19:13:11 +02:00
Fabien Potencier 89959a4ca1 updated VERSION for 4.0.13 2018-07-23 19:12:53 +02:00
Fabien Potencier c710c7431f updated CHANGELOG for 4.0.13 2018-07-23 19:12:47 +02:00
Fabien Potencier 0ff03c9b3d bumped Symfony version to 3.4.14 2018-07-23 19:11:49 +02:00
Fabien Potencier c406c5a4f1
Merge pull request #28039 from fabpot/release-3.4.13
released v3.4.13
2018-07-23 18:37:45 +02:00
Fabien Potencier 7446a290ad updated VERSION for 3.4.13 2018-07-23 18:37:31 +02:00
Fabien Potencier 30b834bdaf updated CHANGELOG for 3.4.13 2018-07-23 18:37:26 +02:00
Nicolas Grekas 0eea077522 Merge branch '4.1'
* 4.1:
  [Form] fix truncating form views in data collector
  [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 17:02:41 +02:00