Merge branch '3.4' into 4.1

sroze · sroze · commit 464c708f2a76 · 2018-09-02T18:33:37.000+01:00
* 3.4:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs
  bumped Symfony version to 3.4.16
  updated VERSION for 3.4.15
  updated CHANGELOG for 3.4.15
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -353,11 +353,9 @@ public function getDefinedOptions()
      *
      * The normalizer should be a closure with the following signature:
      *
-     * ```php
-     * function (Options $options, $value) {
-     *     // ...
-     * }
-     * ```
+     *     function (Options $options, $value) {
+     *         // ...
+     *     }
      *
      * The closure is invoked when {@link resolve()} is called. The closure
      * has access to the resolved values of other options through the passed

Original file line number	Diff line number	Diff line change
`@@ -353,11 +353,9 @@ public function getDefinedOptions()`
`353`	`353`	`*`
`354`	`354`	`* The normalizer should be a closure with the following signature:`
`355`	`355`	`*`
`356`		- * ```php
`357`		`- * function (Options $options, $value) {`
`358`		`- * // ...`
`359`		`- * }`
`360`		- * ```
	`356`	`+ * function (Options $options, $value) {`
	`357`	`+ * // ...`
	`358`	`+ * }`
`361`	`359`	`*`
`362`	`360`	`* The closure is invoked when {@link resolve()} is called. The closure`
`363`	`361`	`* has access to the resolved values of other options through the passed`