8000 Merge branch '3.4' · MyDigitalLife/symfony@3a09357 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3a09357

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4'
* 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
2 parents 8c70b39 + c7e61f2 commit 3a09357

20 files changed

+142
-44
lines changed

‎UPGRADE-3.4.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ HttpKernel
154154
* The `getCacheDir()` method of your kernel should not be called while building the container.
155155
Use the `%kernel.cache_dir%` parameter instead. Not doing so may break the `cache:clear` command.
156156

157+
* The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been deprecated and will be removed in 4.0.
158+
157159
Process
158160
-------
159161

‎UPGRADE-4.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,8 @@ HttpKernel
522522
* The `getCacheDir()` method of your kernel should not be called while building the container.
523523
Use the `%kernel.cache_dir%` parameter instead. Not doing so may break the `cache:clear` command.
524524

525+
* The `Symfony\Component\HttpKernel\Config\EnvParametersResource` class has been removed.
526+
525527
Ldap
526528
----
527529

‎src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ header .container { display: flex; justify-content: space-between; }
8484
.exception-message { flex-grow: 1; }
8585
.exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; }
8686
.exception-message.long { font-size: 18px; }
87-
.exception-message a { text-decoration: none; }
88-
.exception-message a:hover { text-decoration: underline; }
87+
.exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; }
88+
.exception-message a:hover { border-bottom-color: #ffffff; }
8989

9090
.exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }
9191

‎src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public static function setupBeforeClass()
4141

4242
public static function tearDownAfterClass()
4343
{
44-
self::$redis->flushDB();
4544
self::$redis = null;
4645
}
4746
}

‎src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public static function setupBeforeClass()
2121

2222
public static function tearDownAfterClass()
2323
{
24-
self::$redis->getConnection()->getConnectionByKey('foo')->executeCommand(self::$redis->createCommand('FLUSHDB'));
2524
self::$redis = null;
2625
}
2726
}

‎src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public static function setupBeforeClass()
4141

4242
public static function tearDownAfterClass()
4343
{
44-
self::$redis->flushDB();
4544
self::$redis = null;
4645
}
4746
}

‎src/Symfony/Component/Debug/ExceptionHandler.php

Lines changed: 2 additions & 2 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ public function getStylesheet(FlattenException $exception)
310310
.exception-message { flex-grow: 1; padding: 30px 0; }
311311
.exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; }
312312
.exception-message.long { font-size: 18px; }
313-
.exception-message a { text-decoration: none; }
314-
.exception-message a:hover { text-decoration: underline; }
313+
.exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; }
314+
.exception-message a:hover { border-bottom-color: #ffffff; }
315315
316316
.exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }
317317

‎src/Symfony/Component/HttpKernel/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CHANGELOG
2929
* deprecated commands auto registration
3030
* added `AddCacheClearerPass`
3131
* added `AddCacheWarmerPass`
32+
* deprecated `EnvParametersResource`
3233

3334
3.3.0
3435
-----

‎src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* EnvParametersResource represents resources stored in prefixed environment variables.
1818
*
1919
* @author Chris Wilkinson <chriswilkinson84@gmail.com>
20+
*
21+
* @deprecated since version 3.4, to be removed in 4.0
2022
*/
2123
class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable
2224
{

‎src/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\HttpKernel\Config\EnvParametersResource;
1616

17+
/**
18+
* @group legacy
19+
*/
1720
class EnvParametersResourceTest extends TestCase
1821
{
1922
protected $prefix = '__DUMMY_';

0 commit comments

Comments
 (0)
0