diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source 
* 3.3:
  Fix race condition in tests between cache and lock
  Improved how links are displayed in exception messages
This commit is contained in:
Nicolas Grekas 2017-09-03 16:49:34 +02:00
commit c7e61f2333
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig
View File

@ -84,8 +84,8 @@ header .container { display: flex; justify-content: space-between; }
.exception-message { flex-grow: 1; }
.exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; }
.exception-message.long { font-size: 18px; }
.exception-message a { text-decoration: none; }
.exception-message a:hover { text-decoration: underline; }
.exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; }
.exception-message a:hover { border-bottom-color: #ffffff; }
.exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }

1
src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
View File

@ -41,7 +41,6 @@ abstract class AbstractRedisAdapterTest extends AdapterTestCase
public static function tearDownAfterClass()
{
self::$redis->flushDB();
self::$redis = null;
}
}

1
src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
View File

@ -21,7 +21,6 @@ class PredisClusterAdapterTest extends AbstractRedisAdapterTest
public static function tearDownAfterClass()
{
self::$redis->getConnection()->getConnectionByKey('foo')->executeCommand(self::$redis->createCommand('FLUSHDB'));
self::$redis = null;
}
}

1
src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
View File

@ -41,7 +41,6 @@ abstract class AbstractRedisCacheTest extends CacheTestCase
public static function tearDownAfterClass()
{
self::$redis->flushDB();
self::$redis = null;
}
}

4
src/Symfony/Component/Debug/ExceptionHandler.php
View File

@ -310,8 +310,8 @@ EOF;
.exception-message { flex-grow: 1; padding: 30px 0; }
.exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; }
.exception-message.long { font-size: 18px; }
.exception-message a { text-decoration: none; }
.exception-message a:hover { text-decoration: underline; }
.exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; }
.exception-message a:hover { border-bottom-color: #ffffff; }
.exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }