Commitd31465b

committed

Merge branch '2.4'

2 parents34551d2 +7c1b2c3 commitd31465bCopy full SHA for d31465b

File tree

56 files changed

+1204

-582

lines changed

book
components/console
- introduction.rst
contributing/code
- patches.rst
cookbook
- console
  - logging.rst
- doctrine
  - custom_dql_functions.rst
- logging
- map.rst.inc
- security
- session
  - locale_sticky_session.rst
quick_tour
- the_controller.rst
reference
- configuration
  - monolog.rst
- constraints
  - Valid.rst
- forms/types

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1204

-582

lines changed

`‎book/controller.rst‎`

Lines changed: 27 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -590,8 +590,6 @@ Accessing other Services`
`590`	`590`	`When extending the base controller class, you can access any Symfony2 service`
`591`	`591`	via the ``get()`` method. Here are several common services you might need::
`592`	`592`
`593`		`- $request = $this->getRequest();`
`594`		`-`
`595`	`593`	`$templating = $this->get('templating');`
`596`	`594`
`597`	`595`	`$router = $this->get('router');`
`@@ -660,16 +658,21 @@ by using the native PHP sessions.`
`660`	`658`	`Storing and retrieving information from the session can be easily achieved`
`661`	`659`	`from any controller::`
`662`	`660`
`663`		`- $session = $this->getRequest()->getSession();`
	`661`	`+ use Symfony\Component\HttpFoundation\Request;`
	`662`	`+`
	`663`	`+ public function indexAction(Request $request)`
	`664`	`+ {`
	`665`	`+ $session = $request->getSession();`
`664`	`666`
`665`		`- // store an attribute for reuse during a later user request`
`666`		`- $session->set('foo', 'bar');`
	`667`	`+// store an attribute for reuse during a later user request`
	`668`	`+$session->set('foo', 'bar');`
`667`	`669`
`668`		`- // in another controller for another request`
`669`		`- $foo = $session->get('foo');`
	`670`	`+// in another controller for another request`
	`671`	`+$foo = $session->get('foo');`
`670`	`672`
`671`		`- // use a default value if the key doesn't exist`
`672`		`- $filters = $session->get('filters', array());`
	`673`	`+ // use a default value if the key doesn't exist`
	`674`	`+ $filters = $session->get('filters', array());`
	`675`	`+ }`
`673`	`676`
`674`	`677`	`These attributes will remain on the user for the remainder of that user's`
`675`	`678`	`session.`
`@@ -687,11 +690,13 @@ These types of messages are called "flash" messages.`
`687`	`690`
`688`	`691`	`For example, imagine you're processing a form submit::`
`689`	`692`
`690`		`- public function updateAction()`
	`693`	`+ use Symfony\Component\HttpFoundation\Request;`
	`694`	`+`
	`695`	`+ public function updateAction(Request $request)`
`691`	`696`	`{`
`692`	`697`	`$form = $this->createForm(...);`
`693`	`698`
`694`		`- $form->handleRequest($this->getRequest());`
	`699`	`+ $form->handleRequest($request);`
`695`	`700`
`696`	`701`	`if ($form->isValid()) {`
`697`	`702`	`// do some sort of processing`
`@@ -783,17 +788,22 @@ The Request Object`
`783`	`788`	`------------------`
`784`	`789`
`785`	`790`	`Besides the values of the routing placeholders, the controller also has access`
`786`		-to the ``Request`` object when extending the base ``Controller`` class::
	`791`	+to the ``Request`` object. The framework injects the ``Request`` object in the
	`792`	`+controller if a variable is type-hinted with`
	`793`	+`Symfony\Component\HttpFoundation\Request`::
`787`	`794`
`788`		`-$request = $this->getRequest();`
	`795`	`+use Symfony\Component\HttpFoundation\Request;`
`789`	`796`
`790`		`- $request->isXmlHttpRequest(); // is it an Ajax request?`
	`797`	`+ public function indexAction(Request $request)`
	`798`	`+ {`
	`799`	`+ $request->isXmlHttpRequest(); // is it an Ajax request?`
`791`	`800`
`792`		`- $request->getPreferredLanguage(array('en', 'fr'));`
	`801`	`+$request->getPreferredLanguage(array('en', 'fr'));`
`793`	`802`
`794`		`- $request->query->get('page'); // get a $_GET parameter`
	`803`	`+$request->query->get('page'); // get a $_GET parameter`
`795`	`804`
`796`		`- $request->request->get('page'); // get a $_POST parameter`
	`805`	`+ $request->request->get('page'); // get a $_POST parameter`
	`806`	`+ }`
`797`	`807`
`798`	`808`	Like the ``Response`` object, the request headers are stored in a ``HeaderBag``
`799`	`809`	`object and are easily accessible.`

`‎book/http_cache.rst‎`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -557,12 +557,14 @@ each ``ETag`` must be unique across all representations of the same resource.
`557`	`557`
`558`	`558`	`To see a simple implementation, generate the ETag as the md5 of the content::`
`559`	`559`
`560`		`- public function indexAction()`
	`560`	`+ use Symfony\Component\HttpFoundation\Request;`
	`561`	`+`
	`562`	`+ public function indexAction(Request $request)`
`561`	`563`	`{`
`562`	`564`	`$response = $this->render('MyBundle:Main:index.html.twig');`
`563`	`565`	`$response->setETag(md5($response->getContent()));`
`564`	`566`	`$response->setPublic(); // make sure the response is public/cacheable`
`565`		`- $response->isNotModified($this->getRequest());`
	`567`	`+ $response->isNotModified($request);`
`566`	`568`
`567`	`569`	`return $response;`
`568`	`570`	`}`
`@@ -604,7 +606,9 @@ For instance, you can use the latest update date for all the objects needed to`
`604`	`606`	compute the resource representation as the value for the ``Last-Modified``
`605`	`607`	`header value::`
`606`	`608`
`607`		`- public function showAction($articleSlug)`
	`609`	`+ use Symfony\Component\HttpFoundation\Request;`
	`610`	`+`
	`611`	`+ public function showAction($articleSlug, Request $request)`
`608`	`612`	`{`
`609`	`613`	`// ...`
`610`	`614`
`@@ -617,7 +621,7 @@ header value::`
`617`	`621`	`// Set response as public. Otherwise it will be private by default.`
`618`	`622`	`$response->setPublic();`
`619`	`623`
`620`		`- if ($response->isNotModified($this->getRequest())) {`
	`624`	`+ if ($response->isNotModified($request)) {`
`621`	`625`	`return $response;`
`622`	`626`	`}`
`623`	`627`
@@ -653,8 +657,9 @@ the better. The ``Response::isNotModified()`` method does exactly that by
`653`	`657`	`exposing a simple and efficient pattern::`
`654`	`658`
`655`	`659`	`use Symfony\Component\HttpFoundation\Response;`
	`660`	`+ use Symfony\Component\HttpFoundation\Request;`
`656`	`661`
`657`		`- public function showAction($articleSlug)`
	`662`	`+ public function showAction($articleSlug, Request $request)`
`658`	`663`	`{`
`659`	`664`	`// Get the minimum information to compute`
`660`	`665`	`// the ETag or the Last-Modified value`
`@@ -671,7 +676,7 @@ exposing a simple and efficient pattern::`
`671`	`676`	`$response->setPublic();`
`672`	`677`
`673`	`678`	`// Check that the Response is not modified for the given Request`
`674`		`- if ($response->isNotModified($this->getRequest())) {`
	`679`	`+ if ($response->isNotModified($request)) {`
`675`	`680`	`// return the 304 Response immediately`
`676`	`681`	`return $response;`
`677`	`682`	`} else {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitd31465b

File tree

56 files changed

Some content is hidden

56 files changed

`‎book/controller.rst‎`

`‎book/http_cache.rst‎`

0 commit comments