Commit Graph

37802 Commits

Author SHA1 Message Date
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
Nicolas Grekas
07cf82793c Merge branch '4.0' into 4.1
* 4.0:
  [Form] fix truncating form views in data collector
  [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 17:02:27 +02:00
Nicolas Grekas
9d4abf842f Merge branch '3.4' into 4.0
* 3.4:
  [Form] fix truncating form views in data collector
  [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 17:02:07 +02:00
Fabien Potencier
a57549d0a1 bumped Symfony version to 2.8.44 2018-07-23 16:56:24 +02:00
Nicolas Grekas
707e52afd7 minor #28037 [Form] fix truncating form views in data collector (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[Form] fix truncating form views in data collector

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no (fixing a non released patch)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Fixes #27923.

Commits
-------

5fa1f12f3c [Form] fix truncating form views in data collector
2018-07-23 16:49:37 +02:00
Nicolas Grekas
ad316675f5 minor #28036 [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge

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

Commits
-------

8869b296b8 [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge
2018-07-23 15:28:27 +02:00
Nicolas Grekas
5fa1f12f3c [Form] fix truncating form views in data collector 2018-07-23 14:58:27 +02:00
Nicolas Grekas
8869b296b8 [TwigBridge][Form] fix tests by moving AbstractBootstrap* cases to the bridge 2018-07-23 14:38:31 +02:00
Nicolas Grekas
ffb515d415 Merge branch '4.1'
* 4.1:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:47 +02:00
Nicolas Grekas
53d64d7a99 Merge branch '4.0' into 4.1
* 4.0:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:29 +02:00
Nicolas Grekas
dcf55f4f22 Merge branch '3.4' into 4.0
* 3.4:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:38:04 +02:00
Nicolas Grekas
d61bedabd5 Merge branch '2.8' into 3.4
* 2.8:
  updated VERSION for 2.8.43
  update CONTRIBUTORS for 2.8.43
  updated CHANGELOG for 2.8.43
  backported translations
  Fixed templateExists on parse error of the template name
2018-07-23 13:36:14 +02:00
Samuel ROZE
98bb64c32a Chaining senders with their aliases should work 2018-07-23 12:44:09 +02:00
Fabien Potencier
e7f50768f1
Merge pull request #28031 from fabpot/release-2.8.43
released v2.8.43
2018-07-23 11:03:03 +02:00
Fabien Potencier
78ef2a0740 updated VERSION for 2.8.43 2018-07-23 11:02:45 +02:00
Fabien Potencier
d74b11f877 update CONTRIBUTORS for 2.8.43 2018-07-23 11:02:44 +02:00
Fabien Potencier
6f97c89340 updated CHANGELOG for 2.8.43 2018-07-23 11:02:31 +02:00
Fabien Potencier
b2ec4aaf76 bug #28005 [HttpKernel] Fixed templateExists on parse error of the template name (yceruto)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel] Fixed templateExists on parse error of the template name

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

9bfa971bc5/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php (L49-L51)

Commits
-------

53347c42fd Fixed templateExists on parse error of the template name
2018-07-23 10:31:26 +02:00