Improve Dotenv messages

seriquynh · seriquynh · commit e871a6a83a03 · 2019-04-11T08:53:16.000+07:00
diff --git a/UPGRADE-4.3.md b/UPGRADE-4.3.md
@@ -48,8 +48,8 @@ Doctrine Bridge
 Dotenv
 ------
 
- * First parameter of `Dotenv::__construct()` will change from `true` to `false` in Symfony 5.0. A deprecation warning
-   is triggered if no parameter is used. Use `$usePutenv = true` to upgrade without breaking changes.  
+ * First parameter of `Dotenv::__construct()` will be changed from `true` to `false` in Symfony 5.0. A deprecation warning
+   is triggered if no parameter is provided. Use `$usePutenv = true` to upgrade without breaking changes.
 
 EventDispatcher
 ---------------
@@ -170,7 +170,7 @@ SecurityBundle
 TwigBridge
 ----------
 
- * deprecated the `$requestStack` and `$requestContext` arguments of the 
+ * deprecated the `$requestStack` and `$requestContext` arguments of the
    `HttpFoundationExtension`, pass a `Symfony\Component\HttpFoundation\UrlHelper`
    instance as the only argument instead
 
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -45,7 +45,7 @@ final class Dotenv
     public function __construct(bool $usePutenv = true)
     {
         if (!\func_num_args()) {
-            @trigger_error(sprintf('The default value of "$usePutenv" argument of "%s\'s constructor will change from "true" to "false" in Symfony 5.0, you should define its value explicitly.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The default value of "$usePutenv" argument of "%s" will be changed from "true" to "false" in Symfony 5.0. You should define its value explicitly.', __METHOD__), E_USER_DEPRECATED);
         }
 
         $this->usePutenv = $usePutenv;
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -417,7 +417,7 @@ public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar()
 
     /**
      * @group legacy
-     * @expectedDeprecation The default value of "$usePutenv" argument of "%s's constructor will change from "true" to "false" in Symfony 5.0, you should define its value explicitly.
+     * @expectedDeprecation The default value of "$usePutenv" argument of "%s" will be changed from "true" to "false" in Symfony 5.0. You should define its value explicitly.
      */
     public function testDeprecationWarning()
     {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ final class Dotenv`
`45`	`45`	`public function __construct(bool $usePutenv = true)`
`46`	`46`	`{`
`47`	`47`	`if (!\func_num_args()) {`
`48`		`- @trigger_error(sprintf('The default value of "$usePutenv" argument of "%s\'s constructor will change from "true" to "false" in Symfony 5.0, you should define its value explicitly.', __METHOD__), E_USER_DEPRECATED);`
	`48`	`+ @trigger_error(sprintf('The default value of "$usePutenv" argument of "%s" will be changed from "true" to "false" in Symfony 5.0. You should define its value explicitly.', __METHOD__), E_USER_DEPRECATED);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`$this->usePutenv = $usePutenv;`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar()`
`417`	`417`
`418`	`418`	`/**`
`419`	`419`	`* @group legacy`
`420`		`- * @expectedDeprecation The default value of "$usePutenv" argument of "%s's constructor will change from "true" to "false" in Symfony 5.0, you should define its value explicitly.`
	`420`	`+ * @expectedDeprecation The default value of "$usePutenv" argument of "%s" will be changed from "true" to "false" in Symfony 5.0. You should define its value explicitly.`
`421`	`421`	`*/`
`422`	`422`	`public function testDeprecationWarning()`
`423`	`423`	`{`