Merge branch '2.8' into profilerStopwatch

Author: SimonHeimberg

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,12 @@
+Code of Conduct
+===============
+
+This project follows a [Code of Conduct][code_of_conduct] in order to ensure an
+open and welcoming environment. Please read the full text for understanding the
+accepted and unaccepted behavior.
+
+Please read also the [reporting guidelines][guidelines], in case you encountered
+or witnessed any misbehavior.
+
+[code_of_conduct]: https://symfony.com/doc/current/contributing/code_of_conduct/code_of_conduct.html
+[guidelines]: https://symfony.com/doc/current/contributing/code_of_conduct/reporting_guidelines.html

CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -2,6 +2,4 @@ Contributing
 ------------
 
 We love contributors! For more information on how you can contribute to the
-Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
-and notice the [Pull Request Format](https://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format)
-that helps us merge your pull requests faster!
+Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html).

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+<!--
+
+If your pull request fixes a BUG, use the oldest maintained branch that contains
+the bug (see https://symfony.com/roadmap for the list of maintained branches).
+
+If your pull request documents a NEW FEATURE, use the same Symfony branch where
+the feature was introduced (and `master` for features of unreleased versions).
+
+-->

.gitignore

@@ -1,2 +1,3 @@
-/_build
+/_build/doctrees
+/_build/html
 *.pyc

.platform.app.yaml

@@ -46,10 +46,16 @@ disk: 512
 # Build time dependencies.
 dependencies:
   python:
-    sphinx: ">=1"
+    virtualenv: 15.1.0
 
 # The hooks that will be performed when the package is deployed.
 hooks:
     build: |
-      pip install git+https://github.com/fabpot/sphinx-php.git
-      make html
+      virtualenv .virtualenv
+      . .virtualenv/bin/activate
+      # Platform.sh currently sets PIP_USER=1.
+      export PIP_USER=
+      pip install pip==9.0.1 wheel==0.29.0
+      pip install -r _build/.requirements.txt
+      find .virtualenv -type f -name "*.rst" -delete
+      make -C _build html

.travis.yml

@@ -1,17 +1,14 @@
 language: python
 
-python: "2.7"
+python: 2.7
 
 sudo: false
-
 cache:
-    directories:
-        - $HOME/.cache/pip
-        - _build
+  directories: [$HOME/.cache/pip]
 
-install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git
+install: pip install -r _build/.requirements.txt
 
-script: sphinx-build -nW -b html -d _build/doctrees . _build/html
+script: make -C _build SPHINXOPTS=-nW html
 
 branches:
   except:

Dockerfile

@@ -0,0 +1,16 @@
+FROM  python:2-stretch as builder
+
+WORKDIR /www
+
+COPY ./_build/.requirements.txt _build/
+
+RUN pip install  pip==9.0.1 wheel==0.29.0 \
+    && pip install -r _build/.requirements.txt
+
+COPY . /www
+
+RUN make -C _build html
+
+FROM  nginx:latest
+
+COPY --from=builder /www/_build/html /usr/share/nginx/html

README.markdown

@@ -7,8 +7,8 @@ Contributing
 ------------
 
 >**Note**
->Unless you're documenting a feature that was introduced *after* Symfony 2.3
->(e.g. in Symfony 2.4), all pull requests must be based off of the **2.3** branch,
+>Unless you're documenting a feature that was introduced *after* Symfony 2.8
+>(e.g. in Symfony 3.4), all pull requests must be based off of the **2.8** branch,
 >**not** the master or older branches.
 
 We love contributors! For more information on how you can contribute to the
@@ -19,3 +19,17 @@ Platform.sh
 -----------
 
 Pull requests are automatically built by [Platform.sh](https://platform.sh).
+
+Docker
+------
+
+You can build the doc locally with these commands:
+
+```bash
+# build the image...
+$ docker build . -t symfony-docs
+
+# ...and serve it locally on http//:127.0.0.1:8080
+# (if it's already in use, change the '8080' port by any other port)
+$ docker run --rm -p 8080:80 symfony-docs
+```

_build/.requirements.txt

@@ -0,0 +1,13 @@
+alabaster==0.7.10
+Babel==2.4.0
+docutils==0.13.1
+imagesize==0.7.1
+Jinja2==2.9.6
+MarkupSafe==1.0
+Pygments==2.2.0
+pytz==2017.2
+requests==2.12.5
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.3.6
+git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php

Makefile renamed to _build/Makefile

@@ -5,12 +5,12 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = .
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -c $(BUILDDIR) -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ../
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .