Merge remote-tracking branch 'upstream/3.3' into 3.3

Author: javiereguiluz

.platform.app.yaml

@@ -57,4 +57,5 @@ hooks:
       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

@@ -6,9 +6,9 @@ sudo: false
 cache:
   directories: [$HOME/.cache/pip]
 
-install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
+install: pip install -r _build/.requirements.txt
 
-script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
+script: make -C _build SPHINXOPTS=-nW html
 
 branches:
   except:

_build/.requirements.txt

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

_build/redirection_map

@@ -164,7 +164,7 @@
 /cookbook/form/inherit_data_option /form/inherit_data_option
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
-/cookbook/frontend/bower /frontend/bower
+/cookbook/frontend/bower /frontend
 /cookbook/frontend/index /frontend
 /cookbook/install/unstable_versions /setup/unstable_versions
 /cookbook/install/bundles /setup/bundles

assetic/asset_management.rst

@@ -552,10 +552,11 @@ done from the template and is relative to the public document root:
 
 .. note::
 
-    Symfony also contains a method for cache *busting*, where the final URL
-    generated by Assetic contains a query parameter that can be incremented
-    via configuration on each deployment. For more information, see the
-    :ref:`reference-framework-assets-version` configuration option.
+    Symfony provides various cache busting implementations via the
+    :ref:`version <reference-framework-assets-version>`,
+    :ref:`version_format <reference-assets-version-format>`, and
+    :ref:`json_manifest_path <reference-assets-json-manifest-path>`
+    configuration options.
 
 .. _assetic-dumping:
 

best_practices/controllers.rst

@@ -97,16 +97,16 @@ for the homepage of our app:
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-    use Doctrine\ORM\EntityManagerInterface;
 
     class DefaultController extends Controller
     {
         /**
          * @Route("/", name="homepage")
          */
-        public function indexAction(EntityManagerInterface $em)
+        public function indexAction()
         {
-            $posts = $em->getRepository('AppBundle:Post')
+            $posts = $this->getDoctrine()
+                ->getRepository('AppBundle:Post')
                 ->findLatest();
 
             return $this->render('default/index.html.twig', array(

best_practices/security.rst

@@ -224,9 +224,10 @@ more advanced use-case, you can always do the same security check in PHP:
     /**
      * @Route("/{id}/edit", name="admin_post_edit")
      */
-    public function editAction($id, EntityManagerInterface $em)
+    public function editAction($id)
     {
-        $post = $em->getRepository('AppBundle:Post')
+        $post = $this->getDoctrine()
+            ->getRepository('AppBundle:Post')
             ->find($id);
 
         if (!$post) {

components/workflow.rst

@@ -44,8 +44,8 @@ these statuses are called **places**. You can define the workflow like this::
     use Symfony\Component\Workflow\Workflow;
     use Symfony\Component\Workflow\MarkingStore\SingleStateMarkingStore;
 
-    $definition = new DefinitionBuilder()
-        ->addPlaces(['draft', 'review', 'rejected', 'published'])
+    $definition = new DefinitionBuilder();
+    $definition->addPlaces(['draft', 'review', 'rejected', 'published'])
         // Transitions are defined with a unique name, an origin place and a destination place
         ->addTransition(new Transition('to_review', 'draft', 'review'))
         ->addTransition(new Transition('publish', 'review', 'published'))

contributing/code/standards.rst

@@ -186,7 +186,7 @@ Naming Conventions
 * Use camelCase, not underscores, for variable, function and method
   names, arguments;
 
-* Use underscores for option names and parameter names;
+* Use underscores for configuration options and parameters;
 
 * Use namespaces for all classes;
 

controller/argument_value_resolver.rst

@@ -164,12 +164,12 @@ and adding a priority.
         <!-- app/config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="'http://www.w3.org/2001/XMLSchema-Instance"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-Instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
                 <!-- ... be sure autowiring is enabled -->
-                <defaults autowire="true" ... />
+                <defaults autowire="true" />
                 <!-- ... -->
 
                 <service id="AppBundle\ArgumentResolver\UserValueResolver">