Commite6f65e0

committed

Merge branch '3.4' into 4.1

* 3.4: change targetEntity format Less code Wrong function name

2 parents2191d35 +6bfddac commite6f65e0Copy full SHA for e6f65e0

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ looking for mapping information::`
`198`	`198`
`199`	`199`	`/**`
`200`	`200`	`* @ORM\OneToMany(`
`201`		`- * targetEntity="Comment",`
	`201`	`+ * targetEntity="App\Entity\Comment",`
`202`	`202`	`* mappedBy="post",`
`203`	`203`	`* orphanRemoval=true`
`204`	`204`	`* )`

Lines changed: 1 addition & 1 deletion

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`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ you will learn about next!).`
`468`	`468`	`// ...`
`469`	`469`
`470`	`470`	`/**`
`471`		`- * @ORM\ManyToMany(targetEntity="Tag", cascade={"persist"})`
	`471`	`+ * @ORM\ManyToMany(targetEntity="App\Entity\Tag", cascade={"persist"})`
`472`	`472`	`*/`
`473`	`473`	`protected $tags;`
`474`	`474`
`@@ -480,7 +480,7 @@ you will learn about next!).`
`480`	`480`	`# ...`
`481`	`481`	`oneToMany:`
`482`	`482`	`tags:`
`483`		`-targetEntity:Tag`
	`483`	`+targetEntity:App\Entity\Tag`
`484`	`484`	`cascade:[persist]`
`485`	`485`
`486`	`486`	`..code-block::xml`

Lines changed: 1 addition & 1 deletion

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`

Comments

(0)