Skip to content

Commit 300c7a6

Browse files
reypmreypm
authored
Merge branch 'symfony:5.4' into master
2 parents 85da88d + 9f3a00b commit 300c7a6

File tree

706 files changed

+42913
-27900
lines changed

Some content is hidden

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

706 files changed

+42913
-27900
lines changed

‎.alexrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"allow": [
3+
"attack",
4+
"attacks",
5+
"bigger",
6+
"color",
7+
"colors",
8+
"failure",
9+
"hook",
10+
"hooks",
11+
"host-hostess",
12+
"invalid",
13+
"remain",
14+
"special"
15+
]
16+
}

‎.doctor-rst.yaml

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,54 @@
11
rules:
2-
no_inheritdoc: ~
2+
american_english: ~
33
avoid_repetetive_words: ~
4+
blank_line_after_anchor: ~
45
blank_line_after_directive: ~
5-
short_array_syntax: ~
6-
no_app_console: ~
7-
typo: ~
8-
replacement: ~
6+
blank_line_before_directive: ~
97
composer_dev_option_not_at_the_end: ~
10-
yarn_dev_option_at_the_end: ~
11-
versionadded_directive_should_have_version: ~
8+
correct_code_block_directive_based_on_the_content: ~
129
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: ~
10+
ensure_exactly_one_space_between_link_definition_and_link: ~
11+
ensure_link_definition_contains_valid_url: ~
2312
ensure_order_of_code_blocks_in_configuration_block: ~
24-
american_english: ~
25-
valid_use_statements: ~
13+
extend_abstract_controller: ~
14+
extension_xlf_instead_of_xliff: ~
15+
indention: ~
2616
lowercase_as_in_use_statements: ~
27-
ordered_use_statements: ~
28-
no_namespace_after_use_statements: ~
29-
correct_code_block_directive_based_on_the_content: ~
3017
max_blank_lines:
3118
max: 2
19+
max_colons: ~
20+
no_app_console: ~
21+
no_blank_line_after_filepath_in_php_code_block: ~
22+
no_blank_line_after_filepath_in_twig_code_block: ~
23+
no_blank_line_after_filepath_in_xml_code_block: ~
24+
no_blank_line_after_filepath_in_yaml_code_block: ~
25+
no_brackets_in_method_directive: ~
26+
no_composer_req: ~
27+
no_directive_after_shorthand: ~
28+
no_explicit_use_of_code_block_php: ~
29+
no_inheritdoc: ~
30+
no_namespace_after_use_statements: ~
31+
no_php_open_tag_in_code_block_php_directive: ~
32+
no_space_before_self_xml_closing_tag: ~
33+
only_backslashes_in_namespace_in_php_code_block: ~
34+
only_backslashes_in_use_statements_in_php_code_block: ~
35+
ordered_use_statements: ~
36+
php_prefix_before_bin_console: ~
3237
replace_code_block_types: ~
38+
replacement: ~
39+
short_array_syntax: ~
40+
space_between_label_and_link_in_doc: ~
41+
space_between_label_and_link_in_ref: ~
42+
string_replacement: ~
43+
typo: ~
44+
unused_links: ~
45+
use_deprecated_directive_instead_of_versionadded: ~
3346
use_https_xsd_urls: ~
34-
blank_line_before_directive: ~
35-
extension_xlf_instead_of_xliff: ~
3647
valid_inline_highlighted_namespaces: ~
37-
indention: ~
38-
unused_links: ~
48+
valid_use_statements: ~
49+
versionadded_directive_should_have_version: ~
3950
yaml_instead_of_yml_suffix: ~
40-
extend_abstract_controller: ~
51+
yarn_dev_option_at_the_end: ~
4152
# no_app_bundle: ~
4253

4354
# master
@@ -59,6 +70,8 @@ whitelist:
5970
- '/FOSUserBundle(.*)\.yml/'
6071
- '/``.yml``/'
6172
- '/(.*)\.orm\.yml/' # currently DoctrineBundle only supports .yml
73+
- '/rst-class/'
74+
- /docker-compose\.yml/
6275
lines:
6376
- 'in config files, so the old ``app/config/config_dev.yml`` goes to'
6477
- '#. The most important config file is ``app/config/services.yml``, which now is'
@@ -67,14 +80,17 @@ whitelist:
6780
- 'The bin/console Command'
6881
- '# username is your full Gmail or Google Apps email address'
6982
- '.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection'
70-
- '.. versionadded:: 0.21.0' # Encore
83+
- '.. versionadded:: 1.9.0' # Encore
84+
- '.. versionadded:: 0.28.4' # Encore
7185
- '.. versionadded:: 2.4.0' # SwiftMailer
72-
- '.. versionadded:: 1.26' # Twig
7386
- '.. versionadded:: 1.30' # Twig
87+
- '.. versionadded:: 1.35' # Twig
7488
- '.. versionadded:: 1.2' # MakerBundle
7589
- '.. versionadded:: 1.11' # MakerBundle
7690
- '.. versionadded:: 1.3' # MakerBundle
7791
- '.. versionadded:: 1.8' # MakerBundle
92+
- '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
93+
- '.. versionadded:: 1.0.0' # Encore
7894
- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
7995
- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
8096
- '123,' # assertion for var_dumper - components/var_dumper.rst
@@ -83,3 +99,12 @@ whitelist:
8399
- "`Deploying Symfony 4 Apps on Heroku`_."
84100
- ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"
85101
- "// 224, 165, 141, 224, 164, 164, 224, 165, 135])"
102+
- '.. versionadded:: 0.2' # MercureBundle
103+
- 'provides a ``loginUser()`` method to simulate logging in in your functional'
104+
- '.. code-block:: twig'
105+
- '.. versionadded:: 3.6' # MonologBundle
106+
- '// bin/console'
107+
- 'End to End Tests (E2E)'
108+
- '.. code-block:: php'
109+
- '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
110+
- '.. End to End Tests (E2E)'

‎.github/CODEOWNERS

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
# GithubActions workflows
2+
/.github/workflows* @OskarStark
3+
14
# Console
25
/console* @chalasr
36
/components/console* @chalasr
47

58
# Form
6-
/forms.rst @xabbuh
7-
/components/form* @xabbuh
8-
/reference/forms* @xabbuh
9+
/forms.rst @xabbuh @HeahDude
10+
/components/form* @xabbuh @HeahDude
11+
/reference/forms* @xabbuh @HeahDude
912

1013
# PropertyInfo
1114
/components/property_info* @dunglas
@@ -15,9 +18,9 @@
1518
/components/security* @chalasr
1619

1720
# Validator
18-
/validation/*
19-
/components/validator* @xabbuh
20-
/reference/constraints* @xabbuh
21+
/validation/* @xabbuh @HeahDude
22+
/components/validator* @xabbuh @HeahDude
23+
/reference/constraints* @xabbuh @HeahDude
2124

2225
# Workflow
2326
/workflow* @lyrixx

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!--
22
33
If your pull request fixes a BUG, use the oldest maintained branch that contains
4-
the bug (see https://symfony.com/roadmap for the list of maintained branches).
4+
the bug (see https://symfony.com/releases for the list of maintained branches).
55
66
If your pull request documents a NEW FEATURE, use the same Symfony branch where
7-
the feature was introduced (and `master` for features of unreleased versions).
7+
the feature was introduced (and `6.x` for features of unreleased versions).
88
99
-->

‎.github/workflows/ci.yaml

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'github-comments'
7+
pull_request:
8+
branches-ignore:
9+
- 'github-comments'
10+
11+
jobs:
12+
symfony-docs-builder-build:
13+
name: Build (symfony-tools/docs-builder)
14+
15+
runs-on: ubuntu-latest
16+
17+
continue-on-error: true
18+
19+
steps:
20+
- name: "Checkout"
21+
uses: actions/checkout@v2
22+
23+
- name: "Set-up PHP"
24+
uses: shivammathur/setup-php@v2
25+
with:
26+
php-version: 8.0
27+
coverage: none
28+
tools: "composer:v2"
29+
30+
- name: Get composer cache directory
31+
id: composercache
32+
working-directory: _build
33+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
34+
35+
- name: Cache dependencies
36+
uses: actions/cache@v2
37+
with:
38+
path: ${{ steps.composercache.outputs.dir }}
39+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
40+
restore-keys: ${{ runner.os }}-composer-
41+
42+
- name: "Install dependencies"
43+
working-directory: _build
44+
run: composer install --prefer-dist --no-progress
45+
46+
- name: "Build the docs"
47+
working-directory: _build
48+
run: php build.php -vvv
49+
50+
- name: Show log file
51+
if: ${{ always() }}
52+
run: cat _build/logs.txt || true
53+
54+
doctor-rst:
55+
name: Lint (DOCtor-RST)
56+
57+
runs-on: ubuntu-latest
58+
59+
steps:
60+
- name: "Checkout"
61+
uses: actions/checkout@v2
62+
63+
- name: "Create cache dir"
64+
run: mkdir .cache
65+
66+
- name: "Extract base branch name"
67+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_BASE_REF:=${GITHUB_REF##*/}})"
68+
id: extract_base_branch
69+
70+
- name: "Cache DOCtor-RST"
71+
uses: actions/cache@v2
72+
with:
73+
path: .cache
74+
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
75+
76+
- name: "Run DOCtor-RST"
77+
uses: docker://oskarstark/doctor-rst
78+
with:
79+
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
80+
81+
symfony-code-block-checker:
82+
name: Code Blocks
83+
runs-on: Ubuntu-20.04
84+
continue-on-error: true
85+
steps:
86+
- name: Checkout code
87+
uses: actions/checkout@v2
88+
with:
89+
path: 'docs'
90+
91+
- name: Set-up PHP
92+
uses: shivammathur/setup-php@v2
93+
with:
94+
php-version: 8.0
95+
coverage: none
96+
97+
- name: Fetch branch from where the PR started
98+
working-directory: docs
99+
run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
100+
101+
- name: Find modified files
102+
id: find-files
103+
working-directory: docs
104+
run: echo "::set-output name=files::$(git diff --name-only origin/${{ github.base_ref }} HEAD | grep ".rst" | tr '\n' ' ')"
105+
106+
- name: Get composer cache directory
107+
id: composercache
108+
working-directory: docs/_build
109+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
110+
111+
- name: Cache dependencies
112+
if: ${{ steps.find-files.outputs.files }}
113+
uses: actions/cache@v2
114+
with:
115+
path: ${{ steps.composercache.outputs.dir }}
116+
key: ${{ runner.os }}-composer-codeBlocks-${{ hashFiles('_checker/composer.lock', '_sf_app/composer.lock') }}
117+
restore-keys: ${{ runner.os }}-composer-codeBlocks-
118+
119+
- name: Install dependencies
120+
if: ${{ steps.find-files.outputs.files }}
121+
run: composer create-project symfony-tools/code-block-checker:@dev _checker
122+
123+
- name: Install test application
124+
if: ${{ steps.find-files.outputs.files }}
125+
run: |
126+
git clone -b ${{ github.base_ref }} --depth 5 --single-branch https://github.com/symfony-tools/symfony-application.git _sf_app
127+
cd _sf_app
128+
composer update
129+
130+
- name: Generate baseline
131+
if: ${{ steps.find-files.outputs.files }}
132+
working-directory: docs
133+
run: |
134+
CURRENT=$(git rev-parse HEAD)
135+
git checkout -m ${{ github.base_ref }}
136+
../_checker/code-block-checker.php verify:docs `pwd` ${{ steps.find-files.outputs.files }} --generate-baseline=baseline.json --symfony-application=`realpath ../_sf_app`
137+
git checkout -m $CURRENT
138+
cat baseline.json
139+
140+
- name: Verify examples
141+
if: ${{ steps.find-files.outputs.files }}
142+
working-directory: docs
143+
run: |
144+
../_checker/code-block-checker.php verify:docs `pwd` ${{ steps.find-files.outputs.files }} --baseline=baseline.json --output-format=github --symfony-application=`realpath ../_sf_app`

‎.github/workflows/lint.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/_build/doctrees
2-
/_build/html
3-
*.pyc
1+
/_build/vendor
2+
/_build/output

0 commit comments

Comments
 (0)