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">

controller/error_pages.rst

@@ -291,7 +291,7 @@ In that case, you might want to override one or both of the ``showAction()`` and
 
                 <services>
                     <!-- ... be sure autowiring is enabled -->
-                    <defaults autowire="true" ... />
+                    <defaults autowire="true" />
                     <!-- ... -->
 
                     <service id="AppBundle\Controller\CustomExceptionController" public="true">

controller/upload_file.rst

@@ -396,7 +396,7 @@ Now, register this class as a Doctrine listener:
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <!-- ... be sure autowiring is enabled -->
-            <defaults autowire="true" ... />
+            <defaults autowire="true" />
             <!-- ... -->
 
             <service id="AppBundle\EventListener\BrochureUploaderListener">

deployment.rst

@@ -198,7 +198,7 @@ Don't forget that deploying your application also involves updating any dependen
 (typically via Composer), migrating your database, clearing your cache and
 other potential things like pushing assets to a CDN (see `Common Post-Deployment Tasks`_).
 
-.. _`Capifony`: http://capifony.org/
+.. _`Capifony`: https://github.com/everzet/capifony
 .. _`Capistrano`: http://capistranorb.com/
 .. _`sf2debpkg`: https://github.com/liip/sf2debpkg
 .. _`Fabric`: http://www.fabfile.org/

doctrine.rst

@@ -549,12 +549,12 @@ a controller, this is pretty easy. Add the following method to the
     use AppBundle\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
     use Doctrine\ORM\EntityManagerInterface;
-    use Doctrine\Common\Persistence\ManagerRegistry;
 
-    public function createAction(EntityManagerInterface $em)
+    public function createAction()
     {
-        // or fetch the em via the container
-        // $em = $this->get('doctrine')->getManager();
+        // you can fetch the EntityManager via $this->getDoctrine()
+        // or you can add an argument to your action: createAction(EntityManagerInterface $em)
+        $em = $this->get('doctrine')->getManager();
 
         $product = new Product();
         $product->setName('Keyboard');
@@ -571,8 +571,9 @@ a controller, this is pretty easy. Add the following method to the
     }
 
     // if you have multiple entity managers, use the registry to fetch them
-    public function editAction(ManagerRegistry $doctrine)
+    public function editAction()
     {
+        $doctrine = $this->getDoctrine();
         $em = $doctrine->getManager();
         $em2 = $doctrine->getManager('other_connection')
     }
@@ -586,7 +587,7 @@ Take a look at the previous example in more detail:
 
 .. _doctrine-entity-manager:
 
-* **line 10** The ``EntityManagerInterface`` type-hint tells Symfony to pass you Doctrine's
+* **line 13** The ``$this->getDoctrine()->getManager()`` method gets Doctrine's
   *entity manager* object, which is the most important object in Doctrine. It's
   responsible for saving objects to, and fetching objects from, the database.
 
@@ -633,11 +634,10 @@ Fetching an object back out of the database is even easier. For example,
 suppose you've configured a route to display a specific ``Product`` based
 on its ``id`` value::
 
-    use Doctrine\ORM\EntityManagerInterface;
-
-    public function showAction($productId, EntityManagerInterface $em)
+    public function showAction($productId)
     {
-        $product = $em->getRepository('AppBundle:Product')
+        $product = $this->getDoctrine()
+            ->getRepository('AppBundle:Product')
             ->find($productId);
 
         if (!$product) {
@@ -727,11 +727,11 @@ Updating an Object
 Once you've fetched an object from Doctrine, updating it is easy. Suppose
 you have a route that maps a product id to an update action in a controller::
 
-    use Doctrine\ORM\EntityManagerInterface;
-
-    public function updateAction($productId, EntityManagerInterface $em)
+    public function updateAction($productId)
     {
-        $product = $em->getRepository('AppBundle:Product')->find($productId);
+        $product = $this->getDoctrine()
+            ->getRepository('AppBundle:Product')
+            ->find($productId);
 
         if (!$product) {
             throw $this->createNotFoundException(

doctrine/associations.rst

@@ -236,11 +236,10 @@ Now you can see this new code in action! Imagine you're inside a controller::
     use AppBundle\Entity\Category;
     use AppBundle\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
-    use Doctrine\ORM\EntityManagerInterface;
 
     class DefaultController extends Controller
     {
-        public function createProductAction(EntityManagerInterface $em)
+        public function createProductAction()
         {
             $category = new Category();
             $category->setName('Computer Peripherals');
@@ -253,6 +252,7 @@ Now you can see this new code in action! Imagine you're inside a controller::
             // relate this product to the category
             $product->setCategory($category);
 
+            $em = $this->getDoctrine()->getManager();
             $em->persist($category);
             $em->persist($product);
             $em->flush();
@@ -276,11 +276,10 @@ When you need to fetch associated objects, your workflow looks just like it
 did before. First, fetch a ``$product`` object and then access its related
 ``Category`` object::
 
-    use Doctrine\ORM\EntityManagerInterface;
-
-    public function showAction($productId, EntityManagerInterface $em)
+    public function showAction($productId)
     {
-        $product = $em->getRepository('AppBundle:Product')
+        $product = $this->getDoctrine()
+            ->getRepository('AppBundle:Product')
             ->find($productId);
 
         $categoryName = $product->getCategory()->getName();
@@ -304,11 +303,10 @@ the category (i.e. it's "lazily loaded").
 
 You can also query in the other direction::
 
-    use Doctrine\ORM\EntityManagerInterface;
-
-    public function showProductsAction($categoryId, EntityManagerInterface $em)
+    public function showProductsAction($categoryId)
     {
-        $category = $em->getRepository('AppBundle:Category')
+        $category = $this->getDoctrine()
+            ->getRepository('AppBundle:Category')
             ->find($categoryId);
 
         $products = $category->getProducts();
@@ -367,11 +365,11 @@ can avoid the second query by issuing a join in the original query. Add the
 following method to the ``ProductRepository`` class::
 
     // src/AppBundle/Repository/ProductRepository.php
-    use Doctrine\ORM\EntityManagerInterface;
-
     public function findOneByIdJoinedToCategory($productId)
     {
-        $query = $em->createQuery(
+        $query = $this->getDoctrine()
+            ->getManager()
+            ->createQuery(
             'SELECT p, c FROM AppBundle:Product p
             JOIN p.category c
             WHERE p.id = :id'
@@ -387,11 +385,10 @@ following method to the ``ProductRepository`` class::
 Now, you can use this method in your controller to query for a ``Product``
 object and its related ``Category`` with just one query::
 
-    use Doctrine\ORM\EntityManagerInterface;
-
-    public function showAction($productId, EntityManagerInterface $em)
+    public function showAction($productId)
     {
-        $product = $em->getRepository('AppBundle:Product')
+        $product = $this->getDoctrine()
+            ->getRepository('AppBundle:Product')
             ->findOneByIdJoinedToCategory($productId);
 
         $category = $product->getCategory();

doctrine/registration_form.rst

@@ -226,14 +226,13 @@ into the database::
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
-    use Doctrine\ORM\EntityManagerInterface;
 
     class RegistrationController extends Controller
     {
         /**
          * @Route("/register", name="user_registration")
          */
-        public function registerAction(Request $request, UserPasswordEncoderInterface $passwordEncoder, EntityManagerInterface $em)
+        public function registerAction(Request $request, UserPasswordEncoderInterface $passwordEncoder)
         {
             // 1) build the form
             $user = new User();
@@ -248,6 +247,7 @@ into the database::
                 $user->setPassword($password);
 
                 // 4) save the User!
+                $em = $this->getDoctrine()->getManager();
                 $em->persist($user);
                 $em->flush();
 

doctrine/repository.rst

@@ -96,12 +96,12 @@ entities, ordered alphabetically by name.
 
 You can use this new method just like the default finder methods of the repository::
 
-    use Doctrine\ORM\EntityManagerInterface;
     // ...
 
-    public function listAction(EntityManagerInterface $em)
+    public function listAction()
     {
-        $products = $em->getRepository('AppBundle:Product')
+        $products = $this->getDoctrine()
+            ->getRepository('AppBundle:Product')
             ->findAllOrderedByName();
     }
 

form/form_collections.rst

@@ -679,11 +679,11 @@ the relationship between the removed ``Tag`` and ``Task`` object.
         // src/AppBundle/Controller/TaskController.php
 
         use Doctrine\Common\Collections\ArrayCollection;
-        use Doctrine\ORM\EntityManagerInterface;
 
         // ...
-        public function editAction($id, Request $request, EntityManagerInterface $e,)
+        public function editAction($id, Request $request)
         {
+            $em = $this->getDoctrine()->getManager();
             $task = $em->getRepository('AppBundle:Task')->find($id);
 
             if (!$task) {

form/form_dependencies.rst

@@ -32,13 +32,11 @@ create your form::
 
     // src/AppBundle/Controller/DefaultController.php
     use AppBundle\Form\TaskType;
-    use Doctrine\ORM\EntityManagerInterface;
 
     // ...
-    public function newAction(EntityManagerInterface $em)
+    public function newAction()
     {
-        // or fetch the em via the container
-        // $em = $this->get('doctrine')->getManager();
+        $em = $this->getDoctrine()->getManager();
 
         $task = ...;
         $form = $this->createForm(TaskType::class, $task, array(

form/type_guesser.rst

@@ -136,7 +136,7 @@ With this knowledge, you can easily implement the ``guessType()`` method of the
             $phpdoc = $reflectionProperty->getDocComment();
 
             // parse the $phpdoc into an array like:
-            // array('type' => 'string', 'since' => '1.0')
+            // array('var' => 'string', 'since' => '1.0')
             $phpdocTags = ...;
 
             return $phpdocTags;

form/unit_testing.rst

@@ -191,7 +191,7 @@ allows you to return a list of extensions to register::
             $this->validator
                 ->method('validate')
                 ->will($this->returnValue(new ConstraintViolationList()));
-            $validator
+            $this->validator
                 ->method('getMetadataFor')
                 ->will($this->returnValue(new ClassMetadata(Form::class)));