Skip to content

Commit a127976

Browse files
authored
Merge branch 'symfony:7.2' into 7.2
2 parents 0948020 + 26defdf commit a127976

File tree

96 files changed

+2399
-728
lines changed

Some content is hidden

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

96 files changed

+2399
-728
lines changed

.doctor-rst.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rules:
88
correct_code_block_directive_based_on_the_content: ~
99
deprecated_directive_should_have_version: ~
1010
ensure_bash_prompt_before_composer_command: ~
11+
ensure_class_constant: ~
1112
ensure_correct_format_for_phpfunction: ~
1213
ensure_exactly_one_space_before_directive_type: ~
1314
ensure_exactly_one_space_between_link_definition_and_link: ~
@@ -49,6 +50,7 @@ rules:
4950
no_namespace_after_use_statements: ~
5051
no_php_open_tag_in_code_block_php_directive: ~
5152
no_space_before_self_xml_closing_tag: ~
53+
no_typographic_quotes: ~
5254
non_static_phpunit_assertions: ~
5355
only_backslashes_in_namespace_in_php_code_block: ~
5456
only_backslashes_in_use_statements_in_php_code_block: ~
@@ -72,7 +74,6 @@ rules:
7274
versionadded_directive_should_have_version: ~
7375
yaml_instead_of_yml_suffix: ~
7476

75-
# master
7677
versionadded_directive_major_version:
7778
major_version: 7
7879

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
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.69.1
7676
with:
7777
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7878

_build/build.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
->addOption('generate-fjson-files', null, InputOption::VALUE_NONE, 'Use this option to generate docs both in HTML and JSON formats')
1616
->addOption('disable-cache', null, InputOption::VALUE_NONE, 'Use this option to force a full regeneration of all doc contents')
1717
->setCode(function(InputInterface $input, OutputInterface $output) {
18+
// the doc building app doesn't work on Windows
19+
if ('\\' === DIRECTORY_SEPARATOR) {
20+
$output->writeln('<error>ERROR: The application that builds Symfony Docs does not support Windows. You can try using a Linux distribution via WSL (Windows Subsystem for Linux).</error>');
21+
22+
return 1;
23+
}
24+
1825
$io = new SymfonyStyle($input, $output);
1926
$io->text('Building all Symfony Docs...');
2027

_build/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"prefer-stable": true,
44
"config": {
55
"platform": {
6-
"php": "8.1.0"
6+
"php": "8.3"
77
},
88
"preferred-install": {
99
"*": "dist"
@@ -14,9 +14,9 @@
1414
}
1515
},
1616
"require": {
17-
"php": ">=8.1",
17+
"php": ">=8.3",
1818
"symfony/console": "^6.2",
1919
"symfony/process": "^6.2",
20-
"symfony-tools/docs-builder": "^0.21"
20+
"symfony-tools/docs-builder": "^0.27"
2121
}
2222
}

0 commit comments

Comments
 (0)