Skip to content

Commit 392140a

Browse files
author
Joe Bennett
committed
Merge remote-tracking branch 'origin/5.0' into 27345-added-lock-mongodb-store
2 parents e8d6e49 + 528d155 commit 392140a

File tree

263 files changed

+3212
-1819
lines changed

Some content is hidden

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

263 files changed

+3212
-1819
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ whitelist:
7575
- '.. versionadded:: 1.11' # MakerBundle
7676
- '.. versionadded:: 1.3' # MakerBundle
7777
- '.. versionadded:: 1.8' # MakerBundle
78+
- '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
7879
- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
7980
- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
8081
- '123,' # assertion for var_dumper - components/var_dumper.rst

.github/workflows/ci.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
on:
2+
push:
3+
branches-ignore:
4+
- 'github-comments'
5+
pull_request:
6+
branches-ignore:
7+
- 'github-comments'
8+
9+
name: CI
10+
11+
jobs:
12+
build:
13+
name: Build
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: "Checkout"
19+
uses: actions/checkout@v2
20+
21+
- name: "Set up Python 3.7"
22+
uses: actions/setup-python@v1
23+
with:
24+
python-version: '3.7' # Semantic version range syntax or exact version of a Python version
25+
26+
- name: "Display Python version"
27+
run: python -c "import sys; print(sys.version)"
28+
29+
- name: "Install Sphinx dependencies"
30+
run: sudo apt-get install python-dev build-essential
31+
32+
- name: "Install Sphinx"
33+
run: pip install --user sphinx
34+
35+
- name: "Install custom requirements via pip"
36+
run: pip install -r _build/.requirements.txt
37+
38+
- name: "Build documentation"
39+
run: make -C _build SPHINXOPTS=-nW html
40+
41+
doctor-rst:
42+
name: DOCtor-RST
43+
44+
runs-on: ubuntu-latest
45+
46+
steps:
47+
- name: "Checkout"
48+
uses: actions/checkout@v2
49+
50+
- name: "Run DOCtor-RST"
51+
uses: docker://oskarstark/doctor-rst
52+
with:
53+
args: --short

.github/workflows/lint.yaml

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/_build/doctrees
2+
/_build/spelling
23
/_build/html
34
*.pyc

.travis.yml

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

_build/.requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ pytz==2017.2
99
requests==2.20.0
1010
six==1.10.0
1111
snowballstemmer==1.2.1
12-
Sphinx==1.3.6
12+
sphinx==1.3.6
1313
git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php

_build/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@
3737
'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo',
3838
'sensio.sphinx.refinclude', 'sensio.sphinx.configurationblock', 'sensio.sphinx.phpcode', 'sensio.sphinx.bestpractice', 'sensio.sphinx.codeblock',
3939
'symfonycom.sphinx'
40+
#,'sphinxcontrib.spelling'
4041
]
4142

43+
#spelling_show_sugestions=True
44+
#spelling_lang='en_US'
45+
#spelling_word_list_filename='_build/spelling_word_list.txt'
46+
4247
# Add any paths that contain templates here, relative to this directory.
4348
# templates_path = ['_theme/_templates']
4449

_build/redirection_map

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,3 +475,8 @@
475475
/best_practices/web-assets /best_practices
476476
/best_practices/tests /best_practices
477477
/components/debug https://github.com/symfony/debug
478+
/components/translation https://github.com/symfony/translation
479+
/components/translation/usage /translation
480+
/components/translation/custom_formats https://github.com/symfony/translation
481+
/components/translation/custom_message_formatter https://github.com/symfony/translation
482+
/components/notifier https://github.com/symfony/notifier

0 commit comments

Comments
 (0)