Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 97bd3042348e · 2019-03-10T11:08:12.000+01:00
* 3.4:
  cs fix
  cs fix
  [PHPUnit-Bridge] override some environment variables
  [TwigBridge] Remove use spaceless tag
  [translation] Update defaut format from yml to yaml
  Change default log level for output streams
  update docblock to match the actual behavior
  compatibility with phpunit8
  [Debug][DebugClassLoader] Detect annotations before blank docblock lines on final and internal methods
  Added translations for chineese language.
diff --git a/Container.php b/Container.php
@@ -138,7 +138,7 @@ public function setParameter($name, $value)
     /**
      * Sets a service.
      *
-     * Setting a service to null resets the service: has() returns false and get()
+     * Setting a synthetic service to null resets it: has() returns false and get()
      * behaves in the same way as if the service was never created.
      *
      * @param string $id      The service identifier

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function setParameter($name, $value)`
`138`	`138`	`/**`
`139`	`139`	`* Sets a service.`
`140`	`140`	`*`
`141`		`- * Setting a service to null resets the service: has() returns false and get()`
	`141`	`+ * Setting a synthetic service to null resets it: has() returns false and get()`
`142`	`142`	`* behaves in the same way as if the service was never created.`
`143`	`143`	`*`
`144`	`144`	`* @param string $id The service identifier`