Commit Graph

43033 Commits

Author SHA1 Message Date
Jérémy Derussé
d098c11539
Remove calls to deprecated function assertAttributeX 2019-08-04 11:25:45 +02:00
Roland Franssen
867e3de92f [Intl] Order alpha2 to alpha3 mapping + phpdoc fixes 2019-08-04 08:27:02 +02:00
Roland Franssen
724f1f524f [Intl] Order alpha2 to alpha3 mapping 2019-08-04 08:13:19 +02:00
Fabien Potencier
8863f0675d [Routing] added a warning about the getRouteCollection() method 2019-08-04 04:46:49 +02:00
Fabien Potencier
2b0f2de485 bug #32682 [HttpFoundation] Revert getClientIp @return docblock (ossinkine)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpFoundation] Revert getClientIp @return docblock

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

<!--
Replace this notice by a short README for your feature/bugfix. This will help people
understand your PR and can be used as a start for the documentation.

Additionally (see https://symfony.com/roadmap):
 - Bug fixes must be submitted against the lowest maintained 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 branch 4.4.
 - Legacy code removals go to the master branch.
-->

This PR reverts https://github.com/symfony/symfony/pull/22418, see the comment https://github.com/symfony/symfony/pull/22418#issuecomment-513256687

Commits
-------

7568d3452d [HttpFoundation] Revert getClientIp @return docblock
2019-08-04 04:30:15 +02:00
Nicolas Grekas
69ef436481 Merge branch '3.4' into 4.3
* 3.4:
  Fix tests on console
  cs fix
  Fix path to phpunit binary
  [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given
2019-08-04 00:32:39 +02:00
Nicolas Grekas
8f87a85c07 minor #32914 [Console] Fix tests not executed (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[Console] Fix tests not executed

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

Commits
-------

bfd5d4e362 Fix tests on console
2019-08-04 00:31:35 +02:00
Jérémy Derussé
bfd5d4e362
Fix tests on console 2019-08-04 00:21:34 +02:00
Nicolas Grekas
9188261014 bug #32910 [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given (Aleksandr Dankovtsev)
This PR was merged into the 3.4 branch.

Discussion
----------

[Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given

[Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given

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

In additional for PR: https://github.com/symfony/symfony/pull/32862

Commits
-------

faef73888e [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given
2019-08-04 00:13:25 +02:00
Nicolas Grekas
9b41f67a1b minor #32913 [travis] Fix path to phpunit binary (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[travis] Fix path to phpunit binary

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

Phpunit cache path change in 4.4 branch. This PR fixes it path

Commits
-------

3b3582eeaf Fix path to phpunit binary
2019-08-04 00:10:26 +02:00
Nicolas Grekas
f1cb5559c9 cs fix 2019-08-04 00:08:43 +02:00
Nicolas Grekas
64e3a327bc Merge branch '3.4' into 4.3
* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset
2019-08-03 23:50:52 +02:00
Jérémy Derussé
3b3582eeaf
Fix path to phpunit binary 2019-08-03 23:41:59 +02:00
Nicolas Grekas
ce30848f15 minor #32889 [PhpUnitBridge] Remove use of ForwardCompatTrait (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] Remove use of ForwardCompatTrait

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

With #32882 the ForwardCompatibilityTrait is injected in TestCase which now act as a true polyfill

Commits
-------

ac6242f36b Remove use of ForwardCompatTrait
2019-08-03 23:29:20 +02:00
Jérémy Derussé
ac6242f36b
Remove use of ForwardCompatTrait 2019-08-03 23:15:25 +02:00
Nicolas Grekas
6604a3e70a minor #32909 [PhpUnitBridge] Remove deprecated methods assertArraySubset (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] Remove deprecated methods assertArraySubset

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

This PR removes the 2 occurrences of assertArraySubset

Commits
-------

114ec6c41b Remove deprecated methods assertArraySubset
2019-08-03 21:11:55 +02:00
Nicolas Grekas
c7afa28b6b Merge branch '3.4' into 4.3
* 3.4:
  #32853 Check if $this->parameters is array.
  [Validator] Improve Fa translations
2019-08-03 20:28:12 +02:00
Nicolas Grekas
8890be6a96 bug #32870 #32853 Check if $this->parameters is array. (ABGEO07)
This PR was submitted for the 4.3 branch but it was squashed and merged into the 3.4 branch instead (closes #32870).

Discussion
----------

| Q             | A
| ------------- | ---
| Branch?     | 4.3
| Bug fix?      | yes
| New feature?  | no
| Tests pass?   | yes
| Fixed tickets | #32853
| License       | MIT

Commits
-------

7cf9ed613b #32853 Check if $this->parameters is array.
2019-08-03 20:20:39 +02:00
ABGEO
7cf9ed613b #32853 Check if $this->parameters is array. 2019-08-03 20:11:58 +02:00
Jérémy Derussé
114ec6c41b
Remove deprecated methods assertArraySubset 2019-08-03 19:55:54 +02:00
Aleksandr Dankovtsev
faef73888e [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given 2019-08-03 20:55:11 +03:00
Fabien Potencier
d4e97c0f6c minor #32892 [Validator] Improve Fa translations (Arman-Hosseini)
This PR was merged into the 3.4 branch.

Discussion
----------

[Validator] Improve Fa translations

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

The following lines contain bugs:

675d463cf5/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf (L291)

675d463cf5/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf (L295)

675d463cf5/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf (L299)

Commits
-------

2e7f43ed7f [Validator] Improve Fa translations
2019-08-03 16:14:10 +02:00
Nicolas Grekas
07bade03e4 Merge branch '3.4' into 4.3
* 3.4:
  Adopt `@PHPUnit55Migration:risky` rule of php-cs-fixer
2019-08-03 16:00:31 +02:00
Nicolas Grekas
61894106d4 minor #32885 [PhpUnitBridge] Use PHPUnit75Migration in CS fixer (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] Use PHPUnit75Migration in CS fixer

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes (not yet) need #32882, #32886, #32893
| Fixed tickets | #32844
| License       | MIT
| Doc PR        | NA

Bump php-cs-fixer rule to PHPUnit75Migration:risky which add
- php_unit_dedicate_assert_internal_type
- php_unit_expectation
- php_unit_mock
- php_unit_no_expectation_annotation

which are (or will be) all polyfillyed

- [x] need to polyfill `createPartialMock`

Commits
-------

9fb1c421f3 Adopt `@PHPUnit55Migration:risky` rule of php-cs-fixer
2019-08-03 15:51:03 +02:00
Nicolas Grekas
9fb1c421f3 Adopt @PHPUnit55Migration:risky rule of php-cs-fixer 2019-08-03 15:46:27 +02:00
Vincent Langlet
1451c0b915
Allow sutFqcnResolver to return array 2019-08-03 14:01:57 +02:00
Fabien Potencier
0470ac33e8 bug #32899 [Mailer] fix wrong error message when connection closes unexpectedly (fabpot)
This PR was merged into the 4.3 branch.

Discussion
----------

[Mailer] fix wrong error message when connection closes unexpectedly

| Q             | A
| ------------- | ---
| Branch?       | 4.3
| Bug fix?      | yes
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- please 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

When the initial connection to the SMTP is closed immediately by the server, the error is now  more explicit.

Commits
-------

887f27d513 [Mailer] fixed wrong error message when connection closes unexpectedly
2019-08-03 11:37:54 +02:00
Fabien Potencier
887f27d513 [Mailer] fixed wrong error message when connection closes unexpectedly 2019-08-03 11:36:03 +02:00
Fabien Potencier
e248345e5d bug #32895 [Mailer] Fix error not being thrown properly (fabpot)
This PR was merged into the 4.3 branch.

Discussion
----------

[Mailer] Fix error not being thrown properly

| Q             | A
| ------------- | ---
| Branch?       | 4.3
| Bug fix?      | yes
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- please 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

When the SMTP server returns a fatal error, the error is not thrown properly as catched and another error (empty) is thrown. That makes debugging very difficult and what we would expect anyway.

Commits
-------

15dbe4b948 [Mailer] fixed error that is masked by another error
2019-08-03 10:58:03 +02:00
Fabien Potencier
8e3161b00b minor #32894 [Mailer] Change the order of authenticators (fabpot)
This PR was merged into the 4.3 branch.

Discussion
----------

[Mailer] Change the order of authenticators

| Q             | A
| ------------- | ---
| Branch?       | 4.3
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- please 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

This PR uses the same order of SMTP authenticators as Swiftmailer. It should not change anything, but it does not hurt while I'm hunting for #32148 :)

Commits
-------

0800e90fde [Mailer] fixed the order of authenticators
2019-08-03 10:45:38 +02:00
Fabien Potencier
15dbe4b948 [Mailer] fixed error that is masked by another error 2019-08-03 10:22:01 +02:00
Fabien Potencier
0800e90fde [Mailer] fixed the order of authenticators 2019-08-03 09:24:14 +02:00
Arman Hosseini
2e7f43ed7f
[Validator] Improve Fa translations 2019-08-03 01:59:27 +04:30
Nicolas Grekas
8f1d9d2c5d Merge branch '3.4' into 4.3
* 3.4:
  Run the phpunit-bridge from a PR
2019-08-02 17:55:06 +02:00
Nicolas Grekas
5d0711f26c minor #32887 Run the phpunit-bridge from a PR (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

Run the phpunit-bridge from a PR

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

7bdd8ff872 Run the phpunit-bridge from a PR
2019-08-02 17:54:47 +02:00
Nicolas Grekas
7bdd8ff872 Run the phpunit-bridge from a PR 2019-08-02 17:46:19 +02:00
Nicolas Grekas
1b56d7f04d Merge branch '3.4' into 4.3
* 3.4:
  Fix tests
  Fix deprecated phpunit annotation
2019-08-02 14:15:04 +02:00
Nicolas Grekas
8173dafda4 minor #32875 [PhpUnitBridge] Remove @expectedException annotation (jderusse)
This PR was squashed before being merged into the 3.4 branch (closes #32875).

Discussion
----------

[PhpUnitBridge] Remove @expectedException annotation

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

this PR replaces the deprecated annotation `@expectedException` by calls to the method `expectException`.

To automate the process, I used rector/rector:
```
./vendor/bin/rector process src/Symfony --set phpunit60 -a .phpunit/phpunit-6.5/vendor/autoload.php
```
Which also replace `PHPUnit_Framework_Error_X` by `\PHPUnit\Framework\Error\X`

Commits
-------

a22a9c453f Fix tests
3a626e8778 Fix deprecated phpunit annotation
2019-08-02 09:38:25 +02:00
Robin Chalas
5d739704f2 [Messenger] Fix incompatibility with FrameworkBundle <4.3.1 2019-08-02 08:32:23 +02:00
Jérémy Derussé
a22a9c453f
Fix tests 2019-08-02 01:40:18 +02:00
Jérémy Derussé
3a626e8778
Fix deprecated phpunit annotation 2019-08-02 00:48:42 +02:00
Nicolas Grekas
4b3d545014 fix merge 2019-08-01 23:24:21 +02:00
Nicolas Grekas
e6e68e83cc Merge branch '3.4' into 4.3
* 3.4:
  cs fix
  Replace calls to setExpectedException by Pollyfill
2019-08-01 23:16:14 +02:00
Nicolas Grekas
725187ff77 cs fix 2019-08-01 23:06:09 +02:00
Nicolas Grekas
6d499132c0 minor #32872 Replace calls to setExpectedException by Pollyfill (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

Replace calls to setExpectedException by Pollyfill

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | need #32869 to be merged
| Fixed tickets | #32844
| License       | MIT
| Doc PR        | NA

PhpUnit method `setExceptionException` has been deprecated seens 5.7. This PR replace theme by `exceptException` provide by the pollyfill.

Commits
-------

41c02d7ead Replace calls to setExpectedException by Pollyfill
2019-08-01 23:04:58 +02:00
Jérémy Derussé
41c02d7ead
Replace calls to setExpectedException by Pollyfill 2019-08-01 22:42:50 +02:00
Nicolas Grekas
f53b42b70b [Bridge/Twig] fix slow dep resolution on deps=low 2019-08-01 21:33:05 +02:00
Nicolas Grekas
c3c233c130 Merge branch '3.4' into 4.3
* 3.4:
  Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
2019-08-01 16:31:46 +02:00
Nicolas Grekas
b5df8819b2 bug #32868 [PhpUnitBridge] Allow symfony/phpunit-bridge > 4.2 to be installed with phpunit 4.8 (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] Allow symfony/phpunit-bridge > 4.2 to be installed with phpunit 4.8

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

phpunit/phpunit 4.8 defined the composer.json config.platform to php 5.3 which is not compatible with symfony/phpunit-bridge > 4.2

This PR removes the config from composer.json

Commits
-------

a0f68aa554 Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite
2019-08-01 16:29:42 +02:00
Jérémy Derussé
a0f68aa554
Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite 2019-08-01 16:28:16 +02:00