Skip to content

Commit 99bdf47

Browse files
Merge branch '6.1' into TristanPouliquen-patch-request-matcher
2 parents 5ee57d9 + 122c5c2 commit 99bdf47

File tree

264 files changed

+2313
-4080
lines changed

Some content is hidden

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

264 files changed

+2313
-4080
lines changed

.doctor-rst.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ rules:
5353

5454
# master
5555
versionadded_directive_major_version:
56-
major_version: 5
56+
major_version: 6
5757

5858
versionadded_directive_min_version:
59-
min_version: '5.0'
59+
min_version: '6.0'
6060

6161
deprecated_directive_major_version:
62-
major_version: 5
62+
major_version: 6
6363

6464
deprecated_directive_min_version:
65-
min_version: '5.0'
65+
min_version: '6.0'
6666

6767
# do not report as violation
6868
whitelist:
@@ -89,7 +89,7 @@ whitelist:
8989
- '.. versionadded:: 1.11' # MakerBundle
9090
- '.. versionadded:: 1.3' # MakerBundle
9191
- '.. versionadded:: 1.8' # MakerBundle
92-
- '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
92+
- '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
9393
- '.. versionadded:: 1.0.0' # Encore
9494
- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
9595
- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst

.github/CODE_OF_CONDUCT.md

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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ If your pull request fixes a BUG, use the oldest maintained branch that contains
44
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 `5.x` 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118

119119
- name: Install dependencies
120120
if: ${{ steps.find-files.outputs.files }}
121-
run: composer create-project symfony-tools/code-block-checker _checker
121+
run: composer create-project symfony-tools/code-block-checker:@dev _checker
122122

123123
- name: Install test application
124124
if: ${{ steps.find-files.outputs.files }}

CODE_OF_CONDUCT.md

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

_build/redirection_map

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,14 @@
513513
/components/stopwatch https://github.com/symfony/stopwatch
514514
/service_container/3.3-di-changes https://symfony.com/doc/3.4/service_container/3.3-di-changes.html
515515
/frontend/encore/shared-entry /frontend/encore/split-chunks
516+
/frontend/encore/page-specific-assets /frontend/encore/simple-example#page-specific-javascript-or-css
516517
/testing/functional_tests_assertions /testing#testing-application-assertions
517518
/components https://symfony.com/components
518519
/components/index https://symfony.com/components
520+
/serializer/normalizers /components/serializer#normalizers
519521
/logging/monolog_regex_based_excludes /logging/monolog_exclude_http_codes
520522
/security/named_encoders /security/named_hashers
523+
/components/inflector /components/string#inflector
521524
/security/experimental_authenticators /security
522525
/security/user_provider /security/user_providers
523526
/security/reset_password /security/passwords#reset-password
@@ -532,3 +535,11 @@
532535
/security/authenticator_manager /security
533536
/security/multiple_guard_authenticators /security/entry_point
534537
/security/guard_authentication /security/custom_authenticator
538+
/components/security/authentication /security#authenticating-users
539+
/components/security/authorization /security#access-control-authorization
540+
/components/security/firewall /security#the-firewall
541+
/components/security/secure_tools /security/passwords
542+
/components/security /security
543+
/email /mailer
544+
/frontend/assetic /frontend
545+
/frontend/assetic/index /frontend

_build/spelling_word_list.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Akamai
33
analytics
44
Ansi
55
Ansible
6-
Assetic
76
async
87
authenticator
98
authenticators
102 KB
Loading
-1.8 KB
Loading
11.5 KB
Loading

0 commit comments

Comments
 (0)