Skip to content

Commit d7fca48

Browse files
authored
Merge branch '5.x' into patch-1
2 parents bc4e647 + ff6c750 commit d7fca48

File tree

142 files changed

+2663
-1201
lines changed

Some content is hidden

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

142 files changed

+2663
-1201
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ whitelist:
8888
- '.. versionadded:: 1.3' # MakerBundle
8989
- '.. versionadded:: 1.8' # MakerBundle
9090
- '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
91+
- '.. versionadded:: 1.0.0' # Encore
9192
- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
9293
- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
9394
- '123,' # assertion for var_dumper - components/var_dumper.rst

_build/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"require": {
1717
"php": ">=7.2.9",
18-
"symfony/console": "^4.1",
19-
"symfony/docs-builder": "dev-master",
20-
"symfony/process": "9999999-dev"
18+
"symfony/console": "^4.4",
19+
"symfony/docs-builder": "^0.12.0",
20+
"symfony/process": "^4.4"
2121
}
2222
}

0 commit comments

Comments
 (0)