Skip to content

Commit 610210c

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: Use DOCtor-RST 1.68.0
2 parents e5b258c + 49246b1 commit 610210c

File tree

10 files changed

+14
-13
lines changed

10 files changed

+14
-13
lines changed

.doctor-rst.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ rules:
4949
no_namespace_after_use_statements: ~
5050
no_php_open_tag_in_code_block_php_directive: ~
5151
no_space_before_self_xml_closing_tag: ~
52+
no_typographic_quotes: ~
5253
non_static_phpunit_assertions: ~
5354
only_backslashes_in_namespace_in_php_code_block: ~
5455
only_backslashes_in_use_statements_in_php_code_block: ~

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
7373

7474
- name: "Run DOCtor-RST"
75-
uses: docker://oskarstark/doctor-rst:1.67.0
75+
uses: docker://oskarstark/doctor-rst:1.68.0
7676
with:
7777
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7878

best_practices.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Use Secrets for Sensitive Information
9595
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9696

9797
When your application has sensitive configuration, like an API key, you should
98-
store those securely via :doc:`Symfonys secrets management system </configuration/secrets>`.
98+
store those securely via :doc:`Symfony's secrets management system </configuration/secrets>`.
9999

100100
Use Parameters for Application Configuration
101101
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

components/config/caching.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Caching based on Resources
33

44
When all configuration resources are loaded, you may want to process the
55
configuration values and combine them all in one file. This file acts
6-
like a cache. Its contents dont have to be regenerated every time the
6+
like a cache. Its contents don't have to be regenerated every time the
77
application runs – only when the configuration resources are modified.
88

99
For example, the Symfony Routing component allows you to load all routes,

contributing/code_of_conduct/code_of_conduct.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Examples of unacceptable behavior include:
3434
any kind
3535
* Trolling, insulting or derogatory comments, and personal or political attacks
3636
* Public or private harassment
37-
* Publishing others private information, such as a physical or email address,
37+
* Publishing others' private information, such as a physical or email address,
3838
without their explicit permission
3939
* Other conduct which could reasonably be considered inappropriate in a
4040
professional setting
@@ -128,7 +128,7 @@ Attribution
128128
This Code of Conduct is adapted from the `Contributor Covenant`_, version 2.1,
129129
available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130130

131-
Community Impact Guidelines were inspired by `Mozillas code of conduct enforcement ladder`_.
131+
Community Impact Guidelines were inspired by `Mozilla's code of conduct enforcement ladder`_.
132132

133133
Related Documents
134134
-----------------
@@ -141,4 +141,4 @@ Related Documents
141141
concrete_example_document
142142

143143
.. _Contributor Covenant: https://www.contributor-covenant.org
144-
.. _Mozillas code of conduct enforcement ladder: https://github.com/mozilla/diversity
144+
.. _Mozilla's code of conduct enforcement ladder: https://github.com/mozilla/diversity

contributing/code_of_conduct/concrete_example_document.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ according to the Symfony code of conduct.
99
Concrete Examples
1010
-----------------
1111

12-
* Unwelcome comments regarding a persons lifestyle choices and practices,
12+
* Unwelcome comments regarding a person's lifestyle choices and practices,
1313
including those related to food, health, parenting, drugs, and employment;
1414
* Deliberate misgendering or use of `dead names`_ (The birth name
1515
of a person who has since changed their name, often a transgender person);

contributing/community/review-comments.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ constructive, respectful and helpful reviews and replies.
2828
welcoming place for everyone. **You are free to disagree with
2929
someone's opinions, but don't be disrespectful.**
3030

31-
Its important to accept that many programming decisions are opinions.
31+
It's important to accept that many programming decisions are opinions.
3232
Discuss trade-offs, which you prefer, and reach a resolution quickly.
3333
It's not about being right or wrong, but using what works.
3434

contributing/diversity/further_reading.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Diversity in Open Source
99
`Sage Sharp - What makes a good community? <https://sage.thesharps.us/2015/10/06/what-makes-a-good-community>`_
1010
`Ashe Dryden - The Ethics of Unpaid Labor and the OSS Community <https://www.ashedryden.com/blog/the-ethics-of-unpaid-labor-and-the-oss-community>`_
1111
`Model View Culture - The Dehumanizing Myth of the Meritocracy <https://modelviewculture.com/pieces/the-dehumanizing-myth-of-the-meritocracy>`_
12-
`Annalee - How Good Intent Undermines Diversity and Inclusion <https://thebias.com/2017/09/26/how-good-intent-undermines-diversity-and-inclusion>`_
12+
`Annalee - How "Good Intent" Undermines Diversity and Inclusion <https://thebias.com/2017/09/26/how-good-intent-undermines-diversity-and-inclusion>`_
1313
`Karolina Szczur - Building Inclusive Communities <https://speakerdeck.com/fox/building-inclusive-communities>`_
1414

1515
Code of Conduct
@@ -22,15 +22,15 @@ Code of Conduct
2222
Inclusive language
2323
------------------
2424

25-
`Jenée Desmond-Harris - Why Im finally convinced it's time to stop saying "you guys" <https://www.vox.com/2015/6/11/8761227/you-guys-sexism-language>`_
25+
`Jenée Desmond-Harris - Why I'm finally convinced it's time to stop saying "you guys" <https://www.vox.com/2015/6/11/8761227/you-guys-sexism-language>`_
2626
`inclusive language presentations <https://github.com/hcorona/diversity-inclusion/blob/master/inclusive-language-presentations.md>`_
2727

2828
Other talks and Blog Posts
2929
--------------------------
3030

3131
`Lena Reinhard – A Talk About Nothing <https://www.youtube.com/watch?v=D3e3V66TH2Y>`_
3232
`Lena Reinhard - A Talk about Everything <https://www.youtube.com/watch?v=CZx7rYoq1Uw>`_
33-
`Sage Sharp - SCALE: Improving Diversity with Maslows hierarchy <https://sage.thesharps.us/2016/01/24/scale-improving-diversity-with-maslows-hierarchy>`_
33+
`Sage Sharp - SCALE: Improving Diversity with Maslow's hierarchy <https://sage.thesharps.us/2016/01/24/scale-improving-diversity-with-maslows-hierarchy>`_
3434
`UCSF - Unconscious Bias <https://diversity.ucsf.edu/resources/unconscious-bias>`_
3535
`Responding to harassment reports <http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports>`_
3636
`Unconscious bias at work <https://rework.withgoogle.com/guides/unbiasing-raise-awareness/steps/watch-unconscious-bias-at-work>`_

http_client.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ in your requests::
891891
'extra' => ['trace_content' => false],
892892
]);
893893

894-
This setting wont affect other clients.
894+
This setting won't affect other clients.
895895

896896
Using URI Templates
897897
~~~~~~~~~~~~~~~~~~~

scheduler.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ In your handler, you can check a condition and, if affirmative, access the
579579
{
580580
public function getSchedule(): Schedule
581581
{
582-
$this->removeOldReports = RecurringMessage::cron(3 8 * * 1, new CleanUpOldSalesReport());
582+
$this->removeOldReports = RecurringMessage::cron('3 8 * * 1', new CleanUpOldSalesReport());
583583

584584
return $this->schedule ??= (new Schedule())
585585
->with(

0 commit comments

Comments
 (0)