Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc3ec07e

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: Fixed ambiguous sentence [Contribution] Document the different types of tests run in CI Added header removal notice Minor clarification Minor change at email_validation_mode
2 parentsc97ab7b +903ddbe commitc3ec07e

File tree

4 files changed

+69
-6
lines changed

4 files changed

+69
-6
lines changed

‎contributing/code/pull_requests.rst‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,68 @@ After the `Psalm phar is installed`_, the analysis can be run locally with:
429429
430430
$ psalm.phar src/Symfony/Component/Workflow
431431
432+
Automated Tests
433+
~~~~~~~~~~~~~~~
434+
435+
A series of automated tests will run when submitting the pull request.
436+
These test the code under different conditions, to be sure nothing
437+
important is broken. Test failures can be unrelated to your changes. If you
438+
think this is the case, you can check if the target branch has the same
439+
errors and leave a comment on your PR.
440+
441+
Otherwise, the test failure might be caused by your changes. The following
442+
test scenarios run on each change:
443+
444+
``PHPUnit / Tests``
445+
This job runs on Ubuntu using multiple PHP versions (each in their
446+
own job). These jobs run the testsuite just like you would do locally.
447+
448+
A failure in these jobs often indicates a bug in the code.
449+
450+
``PHPUnit / Tests (high-deps)``
451+
This job checks each package (bridge, bundle or component) in ``src/``
452+
individually by calling ``composer update`` and ``phpunit`` from inside
453+
each package.
454+
455+
A failure in this job often indicates a missing package in the
456+
``composer.json`` of the failing package (e.g.
457+
``src/Symfony/Bundle/FrameworkBundle/composer.json``).
458+
459+
This job also runs relevant packages using a "flipped" test (indicated
460+
by a ``^`` suffix in the package name). These tests checkout the
461+
previous major release (e.g. ``4.4`` for a pull requests on ``5.4``)
462+
and run the tests with your branch as dependency.
463+
464+
A failure in these flipped tests indicate a backwards compatibility
465+
break in your changes.
466+
467+
``PHPUnit / Tests (low-deps)``
468+
This job also checks each package individually, but then uses
469+
``composer update --prefer-lowest`` before running the tests.
470+
471+
A failure in this job often indicates a wrong version range or a
472+
missing package in the ``composer.json`` of the failing package.
473+
474+
``continuous-integration/appveyor/pr``
475+
This job runs on Windows using the x86 architecture and the lowest
476+
supported PHP version. All tests first run without extra PHP
477+
extensions. Then, all skipped tests are run using all required PHP
478+
extensions.
479+
480+
A failure in this job often indicate that your changes do not support
481+
Windows, x86 or PHP with minimal extensions.
482+
483+
``Integration / Tests``
484+
Integration tests require other services (e.g. Redis or RabbitMQ) to
485+
run. This job only runs the tests in the ``integration`` PHPUnit group.
486+
487+
A failure in this job indicates a bug in the communication with these
488+
services.
489+
490+
``PHPUnit / Tests (experimental)``
491+
This job always passes (even with failing tests) and is used by the
492+
core team to prepare for the upcoming PHP versions.
493+
432494
.. _rework-your-patch:
433495

434496
Rework your Pull Request

‎mailer.rst‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,13 +1100,14 @@ This can be configured by replacing the ``dsn`` configuration entry with a
11001100
],
11011101
]);
11021102
1103-
By default the first transport is used. The other transports can be used by
1104-
adding a text header ``X-Transport`` to an email::
1103+
By default the first transport is used. The other transports can be selected by
1104+
adding an ``X-Transport`` header (which Mailer will remove automatically from
1105+
the final email)::
11051106

1106-
// Send using first "main" transport ...
1107+
// Send using firsttransport ("main"):
11071108
$mailer->send($email);
11081109

1109-
// ... or use the "alternative" one
1110+
// ... or use thetransport"alternative":
11101111
$email->getHeaders()->addTextHeader('X-Transport', 'alternative');
11111112
$mailer->send($email);
11121113

‎reference/configuration/framework.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2633,7 +2633,7 @@ email_validation_mode
26332633

26342634
**type**: ``string`` **default**: ``loose``
26352635

2636-
It controlstheway email addresses are validated by the
2636+
Setsthedefault value for
26372637
:doc:`/reference/constraints/Email` validator. The possible values are:
26382638

26392639
* ``loose``, it uses a simple regular expression to validate the address (it

‎setup/upgrade_minor.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ probably need to update the version constraint next to each library starting
4141
"...": "...",
4242
4343
"...": "A few libraries starting with
44-
symfony/ follow their versioning scheme. You
44+
symfony/ follow theirownversioning scheme. You
4545
do not need to update these versions: you can
4646
upgrade them independently whenever you want",
4747
"symfony/monolog-bundle": "^3.5",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp