Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 50556892f3cc · 2019-09-26T23:17:10.000+02:00
* 3.4:
  [FrameworkBundle] Fix framework bundle lock configuration not working as expected
  [Validator] Add the missing translations for the Azerbaijani locale
  [Cache] dont override native Memcached options
  Fix return type of Process::restart().
diff --git a/Process.php b/Process.php
@@ -358,7 +358,7 @@ public function start(callable $callback = null, array $env = [])
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
      *
-     * @return $this
+     * @return static
      *
      * @throws RuntimeException When process can't be launched
      * @throws RuntimeException When process is already running

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ public function start(callable $callback = null, array $env = [])`
`358`	`358`	`* @param callable\|null $callback A PHP callback to run whenever there is some`
`359`	`359`	`* output available on STDOUT or STDERR`
`360`	`360`	`*`
`361`		`- * @return $this`
	`361`	`+ * @return static`
`362`	`362`	`*`
`363`	`363`	`* @throws RuntimeException When process can't be launched`
`364`	`364`	`* @throws RuntimeException When process is already running`