Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit 6bfddaca4542 · 2018-11-28T09:43:20.000+01:00
* 2.8:
  change targetEntity format
  Less code
  Wrong function name
diff --git a/best_practices/business-logic.rst b/best_practices/business-logic.rst
@@ -273,7 +273,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
@@ -236,7 +236,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/doctrine/associations.rst b/doctrine/associations.rst
@@ -381,11 +381,7 @@ following method to the ``ProductRepository`` class::
             WHERE p.id = :id'
         )->setParameter('id', $productId);
 
-        try {
-            return $query->getSingleResult();
-        } catch (\Doctrine\ORM\NoResultException $exception) {
-            return null;
-        }
+        return $query->getOneOrNullResult();
     }
 
 Now, you can use this method in your controller to query for a ``Product``
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -469,7 +469,7 @@ you will learn about next!).
             // ...
 
             /**
-             * @ORM\ManyToMany(targetEntity="Tag", cascade={"persist"})
+             * @ORM\ManyToMany(targetEntity="App\Entity\Tag", cascade={"persist"})
              */
             protected $tags;
 
@@ -481,7 +481,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
@@ -222,7 +222,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
`@@ -236,7 +236,7 @@ logic to a separate service::`
`236`	`236`	`$fileName = md5(uniqid()).'.'.$file->guessExtension();`
`237`	`237`
`238`	`238`	`try {`
`239`		`- $file->move($this->getTargetDir(), $fileName);`
	`239`	`+ $file->move($this->getTargetDirectory(), $fileName);`
`240`	`240`	`} catch (FileException $e) {`
`241`	`241`	`// ... handle exception if something happens during file upload`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ Consider this example:`
`222`	`222`	`class Service`
`223`	`223`	`{`
`224`	`224`	`/**`
`225`		`- * @ORM\ManyToOne(targetEntity="Host")`
	`225`	`+ * @ORM\ManyToOne(targetEntity="App\Entity\Host")`
`226`	`226`	`*/`
`227`	`227`	`public $host;`
`228`	`228`