Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 038c4decc823 · 2017-09-03T16:49:52.000+02:00
* 3.4:
  [HttpKernel] Deprecate EnvParametersResource
  [Lock] Check TTL expiration in lock acquisition
  Fix race condition in tests between cache and lock
  Improved how links are displayed in exception messages
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ CHANGELOG
  * deprecated commands auto registration
  * added `AddCacheClearerPass`
  * added `AddCacheWarmerPass`
+ * deprecated `EnvParametersResource`
 
 3.3.0
 -----
diff --git a/Config/EnvParametersResource.php b/Config/EnvParametersResource.php
@@ -17,6 +17,8 @@
  * EnvParametersResource represents resources stored in prefixed environment variables.
  *
  * @author Chris Wilkinson <chriswilkinson84@gmail.com>
+ *
+ * @deprecated since version 3.4, to be removed in 4.0
  */
 class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable
 {
diff --git a/Tests/Config/EnvParametersResourceTest.php b/Tests/Config/EnvParametersResourceTest.php
@@ -14,6 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Config\EnvParametersResource;
 
+/**
+ * @group legacy
+ */
 class EnvParametersResourceTest extends TestCase
 {
     protected $prefix = '__DUMMY_';

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`* EnvParametersResource represents resources stored in prefixed environment variables.`
`18`	`18`	`*`
`19`	`19`	`* @author Chris Wilkinson <chriswilkinson84@gmail.com>`
	`20`	`+ *`
	`21`	`+ * @deprecated since version 3.4, to be removed in 4.0`
`20`	`22`	`*/`
`21`	`23`	`class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\HttpKernel\Config\EnvParametersResource;`
`16`	`16`
	`17`	`+/**`
	`18`	`+ * @group legacy`
	`19`	`+ */`
`17`	`20`	`class EnvParametersResourceTest extends TestCase`
`18`	`21`	`{`
`19`	`22`	`protected $prefix = '__DUMMY_';`