Skip to content

Commit c7e61f2

Browse files
Merge branch '3.3' into 3.4
* 3.3: Fix race condition in tests between cache and lock Improved how links are displayed in exception messages
2 parents cbd6b8e + c4ecb9c commit c7e61f2

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

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
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

0 commit comments

Comments
 (0)