Commitcb5848e

committed

Merge branch '4.2' into 4.3

* 4.2: Use correct filepaths for 4.2 Ordered use statements

2 parentsd2ca845 +fa7e98c commitcb5848eCopy full SHA for cb5848e

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -103,14 +103,14 @@ which is a common practice when following the `ADR pattern`_
`103`	`103`
`104`	`104`	`..code-block::yaml`
`105`	`105`
`106`		`-#app/config/routing.yml`
	`106`	`+# config/routes.yaml`
`107`	`107`	`hello:`
`108`	`108`	`path:/hello/{name}`
`109`	`109`	`defaults:{ _controller: app.hello_controller }`
`110`	`110`
`111`	`111`	`..code-block::xml`
`112`	`112`
`113`		`-<!--app/config/routing.xml-->`
	`113`	`+<!-- config/routes.xml-->`
`114`	`114`	`<?xml version="1.0" encoding="UTF-8" ?>`
`115`	`115`	`<routesxmlns="http://symfony.com/schema/routing"`
`116`	`116`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class that processes the login submit and 4) updates the main security config fi`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		-Edit the ``security.yml`` file in order to allow access for anyone to the
	`77`	+Edit the ``security.yaml`` file in order to allow access for anyone to the
`78`	`78`	``/login`` route:
`79`	`79`
`80`	`80`	`..configuration-block::`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ like this:`
`46`	`46`
`47`	`47`	`..code-block::yaml`
`48`	`48`
`49`		`-#app/config/config.yml`
	`49`	`+# config/framework.yaml`
`50`	`50`	`framework:`
`51`	`51`	`workflows:`
`52`	`52`	`blog_publishing:`
`@@ -197,8 +197,8 @@ As configured, the following property is used by the marking store::`
`197`	`197`	With this workflow named ``blog_publishing``, you can get help to decide
`198`	`198`	`what actions are allowed on a blog post::`
`199`	`199`
`200`		`- use Symfony\Component\Workflow\Exception\LogicException;`
`201`	`200`	`use App\Entity\BlogPost;`
	`201`	`+ use Symfony\Component\Workflow\Exception\LogicException;`
`202`	`202`
`203`	`203`	`$post = BlogPost();`
`204`	`204`
`@@ -680,8 +680,8 @@ requires:`
`680`	`680`
`681`	`681`	`Then you can access this metadata in your controller as follows::`
`682`	`682`
`683`		`- use Symfony\Component\Workflow\Registry;`
`684`	`683`	`use App\Entity\BlogPost;`
	`684`	`+ use Symfony\Component\Workflow\Registry;`
`685`	`685`
`686`	`686`	`public function myController(Registry $registry, BlogPost $post)`
`687`	`687`	`{`

Comments

(0)