Merge branch '3.4' into 4.1

* 3.4:
  change targetEntity format
  Less code
  Wrong function name

Author: javiereguiluz

best_practices/business-logic.rst

@@ -198,7 +198,7 @@ looking for mapping information::
 
         /**
          * @ORM\OneToMany(
-         *      targetEntity="Comment",
+         *      targetEntity="App\Entity\Comment",
          *      mappedBy="post",
          *      orphanRemoval=true
          * )

controller/upload_file.rst

@@ -241,7 +241,7 @@ logic to a separate service::
             $fileName = md5(uniqid()).'.'.$file->guessExtension();
 
             try {
-                $file->move($this->getTargetDir(), $fileName);
+                $file->move($this->getTargetDirectory(), $fileName);
             } catch (FileException $e) {
                 // ... handle exception if something happens during file upload
             }

form/form_collections.rst

@@ -468,7 +468,7 @@ you will learn about next!).
             // ...
 
             /**
-             * @ORM\ManyToMany(targetEntity="Tag", cascade={"persist"})
+             * @ORM\ManyToMany(targetEntity="App\Entity\Tag", cascade={"persist"})
              */
             protected $tags;
 
@@ -480,7 +480,7 @@ you will learn about next!).
                 # ...
                 oneToMany:
                     tags:
-                        targetEntity: Tag
+                        targetEntity: App\Entity\Tag
                         cascade:      [persist]
 
         .. code-block:: xml

reference/constraints/UniqueEntity.rst

@@ -218,7 +218,7 @@ Consider this example:
         class Service
         {
             /**
-             * @ORM\ManyToOne(targetEntity="Host")
+             * @ORM\ManyToOne(targetEntity="App\Entity\Host")
              */
             public $host;