Skip to content

Commit afab849

Browse files
author
Joe Bennett
committed
Merge remote-tracking branch 'origin/4.4' into 27345-added-lock-mongodb-store
2 parents bfe48ec + bc6fdea commit afab849

File tree

286 files changed

+6797
-6289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+6797
-6289
lines changed

.doctor-rst.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
rules:
2+
no_inheritdoc: ~
3+
avoid_repetetive_words: ~
4+
blank_line_after_directive: ~
5+
short_array_syntax: ~
6+
no_app_console: ~
7+
typo: ~
8+
replacement: ~
9+
composer_dev_option_not_at_the_end: ~
10+
yarn_dev_option_at_the_end: ~
11+
versionadded_directive_should_have_version: ~
12+
deprecated_directive_should_have_version: ~
13+
no_composer_req: ~
14+
no_php_open_tag_in_code_block_php_directive: ~
15+
no_blank_line_after_filepath_in_php_code_block: ~
16+
no_blank_line_after_filepath_in_yaml_code_block: ~
17+
no_blank_line_after_filepath_in_xml_code_block: ~
18+
no_blank_line_after_filepath_in_twig_code_block: ~
19+
php_prefix_before_bin_console: ~
20+
use_deprecated_directive_instead_of_versionadded: ~
21+
no_space_before_self_xml_closing_tag: ~
22+
no_explicit_use_of_code_block_php: ~
23+
ensure_order_of_code_blocks_in_configuration_block: ~
24+
american_english: ~
25+
valid_use_statements: ~
26+
lowercase_as_in_use_statements: ~
27+
ordered_use_statements: ~
28+
no_namespace_after_use_statements: ~
29+
correct_code_block_directive_based_on_the_content: ~
30+
max_blank_lines:
31+
max: 2
32+
replace_code_block_types: ~
33+
use_https_xsd_urls: ~
34+
blank_line_before_directive: ~
35+
extension_xlf_instead_of_xliff: ~
36+
valid_inline_highlighted_namespaces: ~
37+
indention: ~
38+
unused_links: ~
39+
yaml_instead_of_yml_suffix: ~
40+
extend_abstract_controller: ~
41+
# no_app_bundle: ~
42+
43+
# 4.x
44+
versionadded_directive_major_version:
45+
major_version: 4
46+
47+
versionadded_directive_min_version:
48+
min_version: '4.0'
49+
50+
deprecated_directive_major_version:
51+
major_version: 4
52+
53+
deprecated_directive_min_version:
54+
min_version: '4.0'
55+
56+
# do not report as violation
57+
whitelist:
58+
regex:
59+
- '/FOSUserBundle(.*)\.yml/'
60+
- '/``.yml``/'
61+
- '/(.*)\.orm\.yml/' # currently DoctrineBundle only supports .yml
62+
lines:
63+
- 'in config files, so the old ``app/config/config_dev.yml`` goes to'
64+
- '#. The most important config file is ``app/config/services.yml``, which now is'
65+
- 'code in production without a proxy, it becomes trivially easy to abuse your'
66+
- '.. _`EasyDeployBundle`: https://github.com/EasyCorp/easy-deploy-bundle'
67+
- 'The bin/console Command'
68+
- '# username is your full Gmail or Google Apps email address'
69+
- '.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection'
70+
- '.. versionadded:: 0.21.0' # Encore
71+
- '.. versionadded:: 2.4.0' # SwiftMailer
72+
- '.. versionadded:: 1.26' # Twig
73+
- '.. versionadded:: 1.30' # Twig
74+
- '.. versionadded:: 1.2' # MakerBundle
75+
- '.. versionadded:: 1.11' # MakerBundle
76+
- '.. versionadded:: 1.3' # MakerBundle
77+
- '.. versionadded:: 1.8' # MakerBundle
78+
- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
79+
- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
80+
- '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
81+
- "`Deploying Symfony 4 Apps on Heroku`_."
82+
- ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"

.github/CODEOWNERS

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Console
2+
/console* @chalasr
3+
/components/console* @chalasr
4+
5+
# Form
6+
/forms.rst @xabbuh
7+
/components/form* @xabbuh
8+
/reference/forms* @xabbuh
9+
10+
# PropertyInfo
11+
/components/property_info* @dunglas
12+
13+
# Security
14+
/security* @chalasr
15+
/components/security* @chalasr
16+
17+
# Validator
18+
/validation/*
19+
/components/validator* @xabbuh
20+
/reference/constraints* @xabbuh
21+
22+
# Workflow
23+
/workflow* @lyrixx
24+
/components/workflow* @lyrixx
25+
26+
# Yaml
27+
/components/yaml* @xabbuh

.github/workflows/lint.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
on: [push, pull_request]
2+
name: Lint
3+
jobs:
4+
doctor-rst:
5+
name: DOCtor-RST
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@master
9+
- name: DOCtor-RST
10+
uses: docker://oskarstark/doctor-rst
11+
with:
12+
args: --short

CODE_OF_CONDUCT.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
Code of Conduct
2+
===============
3+
4+
Our Pledge
5+
----------
6+
7+
In the interest of fostering an open and welcoming environment, we as
8+
contributors and maintainers pledge to making participation in our project and
9+
our community a harassment-free experience for everyone, regardless of age, body
10+
size, disability, ethnic origin, gender identity and expression, level of
11+
experience, education, socio-economic status, nationality, personal appearance,
12+
religion, or sexual identity and orientation.
13+
14+
Our Standards
15+
-------------
16+
17+
Examples of behavior that contributes to creating a positive environment
18+
include:
19+
20+
* Using welcoming and inclusive language
21+
* Being respectful of differing viewpoints and experiences
22+
* Gracefully accepting constructive criticism
23+
* Focusing on what is best for the community
24+
* Showing empathy towards other community members
25+
26+
Examples of unacceptable behavior by participants include:
27+
28+
* The use of sexualized language or imagery and unwelcome sexual attention or
29+
advances
30+
* Trolling, insulting/derogatory comments, and personal or political attacks
31+
* Public or private harassment
32+
* Publishing others' private information, such as a physical or electronic
33+
address, without explicit permission
34+
* Other conduct which could reasonably be considered inappropriate in a
35+
professional setting
36+
37+
Our Responsibilities
38+
--------------------
39+
40+
[CoC Active Response Ensurers, or CARE][1], are responsible for clarifying the
41+
standards of acceptable behavior and are expected to take appropriate and fair
42+
corrective action in response to any instances of unacceptable behavior.
43+
44+
CARE team members have the right and responsibility to remove, edit, or reject
45+
comments, commits, code, wiki edits, issues, and other contributions that are
46+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
47+
contributor for other behaviors that they deem inappropriate, threatening,
48+
offensive, or harmful.
49+
50+
Scope
51+
-----
52+
53+
This Code of Conduct applies both within project spaces and in public spaces
54+
when an individual is representing the project or its community. Examples of
55+
representing a project or community include using an official project e-mail
56+
address, posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event. Representation of a project may be
58+
further defined and clarified by CARE team members.
59+
60+
Enforcement
61+
-----------
62+
63+
Instances of abusive, harassing, or otherwise unacceptable behavior
64+
[may be reported][2] by contacting the [CARE team members][1].
65+
All complaints will be reviewed and investigated and will result in a response
66+
that is deemed necessary and appropriate to the circumstances. The CARE team is
67+
obligated to maintain confidentiality with regard to the reporter of an
68+
incident. Further details of specific enforcement policies may be posted
69+
separately.
70+
71+
CARE team members who do not follow or enforce the Code of Conduct in good
72+
faith may face temporary or permanent repercussions as determined by the
73+
[core team][3].
74+
75+
Attribution
76+
-----------
77+
78+
This Code of Conduct is adapted from the [Contributor Covenant version 1.4][4].
79+
80+
[1]: https://symfony.com/doc/current/contributing/code_of_conduct/care_team.html
81+
[2]: https://symfony.com/doc/current/contributing/code_of_conduct/reporting_guidelines.html
82+
[3]: https://symfony.com/doc/current/contributing/code/core_team.html
83+
[4]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

0 commit comments

Comments
 (0)