Commitf8c9ce3

committed

Merge branch '2.7' into 2.8

2 parents6e8d5fc +9b7fe51 commitf8c9ce3Copy full SHA for f8c9ce3

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,8 @@ that, you can write normalizers. Normalizers are executed after validating an`
`427`	`427`	`option. You can configure a normalizer by calling`
`428`	`428`	:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizer`::
`429`	`429`
	`430`	`+ use Symfony\Component\OptionsResolver\Options;`
	`431`	`+`
`430`	`432`	`// ...`
`431`	`433`	`class Mailer`
`432`	`434`	`{`
`@@ -436,7 +438,7 @@ option. You can configure a normalizer by calling`
`436`	`438`	`{`
`437`	`439`	`// ...`
`438`	`440`
`439`		`- $resolver->setNormalizer('host', function ($options, $value) {`
	`441`	`+ $resolver->setNormalizer('host', function (Options$options, $value) {`
`440`	`442`	`if ('http://' !== substr($value, 0, 7)) {`
`441`	`443`	`$value = 'http://'.$value;`
`442`	`444`	`}`
`@@ -462,7 +464,7 @@ if you need to use other options during normalization::`
`462`	`464`	`public function configureOptions(OptionsResolver $resolver)`
`463`	`465`	`{`
`464`	`466`	`// ...`
`465`		`- $resolver->setNormalizer('host', function ($options, $value) {`
	`467`	`+ $resolver->setNormalizer('host', function (Options$options, $value) {`
`466`	`468`	`if (!in_array(substr($value, 0, 7), array('http://', 'https://'))) {`
`467`	`469`	`if ('ssl' === $options['encryption']) {`
`468`	`470`	`$value = 'https://'.$value;`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,9 @@ your autoloader to load the Routing component::`
`48`	`48`
`49`	`49`	`..note::`
`50`	`50`
`51`		- Be careful when using ``$_SERVER['REQUEST_URI']``, as it may include
`52`		`- any query parameters on the URL, which will cause problems with route`
`53`		`- matching. An easy way to solve this is to use the HttpFoundation component`
`54`		- as explained:ref:`below<components-routing-http-foundation>`.
	`51`	+ The:class:`Symfony\\Component\\Routing\\RequestContext` parameters can be populated
	`52`	+ with the values stored in ``$_SERVER``, but it's easier to use the HttpFoundation
	`53`	+ component as explained:ref:`below<components-routing-http-foundation>`.
`55`	`54`
`56`	`55`	`You can add as many routes as you like to a`
`57`	`56`	:class:`Symfony\\Component\\Routing\\RouteCollection`.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -49,7 +49,7 @@ in the ``Product`` entity::
`49`	`49`	Note that the type of the ``brochure`` column is ``string`` instead of ``binary``
`50`	`50`	or ``blob`` because it just stores the PDF file name instead of the file contents.
`51`	`51`
`52`		-Then, add a new ``brochure`` field to the form thatmanage the ``Product`` entity::
	`52`	+Then, add a new ``brochure`` field to the form thatmanages the ``Product`` entity::
`53`	`53`
`54`	`54`	`// src/AppBundle/Form/ProductType.php`
`55`	`55`	`namespace AppBundle\Form;`
`@@ -133,7 +133,7 @@ Finally, you need to update the code of the controller that handles the form::`
`133`	`133`
`134`	`134`	`// Update the 'brochure' property to store the PDF file name`
`135`	`135`	`// instead of its contents`
`136`		`- $product->setBrochure($filename);`
	`136`	`+ $product->setBrochure($fileName);`
`137`	`137`
`138`	`138`	`// ... persist the $product variable or any other work`
`139`	`139`

Comments

(0)