Merge branch '4.1' into 4.2

javiereguiluz · javiereguiluz · commit 54aa0daa2e68 · 2018-11-28T09:45:06.000+01:00
* 4.1:
  change targetEntity format
  Less code
  Wrong function name
diff --git a/best_practices/business-logic.rst b/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
          * )
diff --git a/controller/upload_file.rst b/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
             }
diff --git a/form/form_collections.rst b/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
diff --git a/reference/constraints/UniqueEntity.rst b/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;
 

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ logic to a separate service::`
`241`	`241`	`$fileName = md5(uniqid()).'.'.$file->guessExtension();`
`242`	`242`
`243`	`243`	`try {`
`244`		`- $file->move($this->getTargetDir(), $fileName);`
	`244`	`+ $file->move($this->getTargetDirectory(), $fileName);`
`245`	`245`	`} catch (FileException $e) {`
`246`	`246`	`// ... handle exception if something happens during file upload`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ Consider this example:`
`218`	`218`	`class Service`
`219`	`219`	`{`
`220`	`220`	`/**`
`221`		`- * @ORM\ManyToOne(targetEntity="Host")`
	`221`	`+ * @ORM\ManyToOne(targetEntity="App\Entity\Host")`
`222`	`222`	`*/`
`223`	`223`	`public $host;`
`224`	`224`