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

Commit0a9e117

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Change wording about time for downstream projects Import use statement for used trait [Diversity] Link to the annual CoC transparency reports
2 parents3941776 +6ef2b7b commit0a9e117

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

‎components/var_dumper.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,11 @@ This will provide you with two new assertions:
244244
Example::
245245

246246
use PHPUnit\Framework\TestCase;
247+
use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
247248

248249
class ExampleTest extends TestCase
249250
{
250-
use\Symfony\Component\VarDumper\Test\VarDumperTestTrait;
251+
use VarDumperTestTrait;
251252

252253
public function testWithDumpEquals()
253254
{

‎contributing/code/security.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ projects. The process works as follows:
7878
date for a joint release (there is no guarantee that all releases will
7979
be at the same time but we will try hard to make them at about the same
8080
time). When the issue is not known to be exploited in the wild, a period
81-
of two weeksseems like a reasonable amount of time.
81+
of two weeksis considered a reasonable amount of time.
8282

8383
The list of downstream projects participating in this process is kept as small
8484
as possible in order to better manage the flow of confidential information

‎contributing/code_of_conduct/care_team.rst‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@ CARE Team
44
Our Pledge
55
----------
66

7-
In the interest of fostering an open and welcoming environment, the CoC Active Response Ensurers, or CARE,
8-
pledge to ensure that the spirit of the:doc:`Code of Conduct</contributing/code_of_conduct/index>`
7+
In the interest of fostering an open and welcoming environment, the "Code of
8+
Conduct Active Response Ensurers", or CARE team, pledge to ensure that the
9+
spirit of the:doc:`Code of Conduct</contributing/code_of_conduct/index>`
910
is respected. Our main priority is to ensure the safety of our community members.
10-
The second goal is to help educate the community as a whole to be aware of the CoC
11-
and how to help implement its spirit throughout the community. In case these goals
12-
conflict, we will prioritize safety of community members over all other goals.
11+
The second goal is to help educate the community as a whole to be aware of the
12+
Code of Conduct and how to help implement its spirit throughout the community.
13+
In case these goals conflict, we will prioritize safety of community members
14+
over all other goals.
1315

14-
If you think there is or has been a violation to thecode ofconduct please contact
16+
If you think there is or has been a violation to theCode ofConduct please contact
1517
the CARE team or if you prefer contact only individual members of the CARE team.
1618

1719
Members
1820
-------
1921

20-
Here are all the members of theCode of ConductCARE team (in alphabetic order).
21-
You can contactany of them directly using the contact details below or you can
22-
also contact allof them at once by emailing **care@symfony.com**:
22+
Here are all the members of the CARE team (in alphabetic order). You can contact
23+
any of them directly using the contact details below or you can also contact all
24+
of them at once by emailing **care@symfony.com**:
2325

2426
* **Emilie Lorenzo**
2527

@@ -46,3 +48,12 @@ The :doc:`Symfony project leader </contributing/code/core_team>` appoints the CA
4648
team with candidates they see fit. The CARE team will consist of at least
4749
3 people. The team should be representing as many demographics as possible,
4850
ideally from different employers.
51+
52+
CARE Team Transparency Reports
53+
------------------------------
54+
55+
The CARE team publishes a transparency report at the end of each year:
56+
57+
* `Symfony Code of Conduct Transparency Report 2018`_.
58+
59+
.. _`Symfony Code of Conduct Transparency Report 2018`:https://symfony.com/blog/symfony-code-of-conduct-transparency-report-2018

0 commit comments

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