aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/container
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-08-27 12:04:36 +0200
committerArthurHoaro <arthur@hoa.ro>2020-08-27 12:04:36 +0200
commit7e3dc0ba98bf019c2804e5c74fb6061b16fb712f (patch)
treef0a333e9e009d78d59c1e4823f766625bc2bb255 /tests/container
parentaf41d5ab5d2bd3ba64d052c997bc6afa6966a63c (diff)
downloadShaarli-7e3dc0ba98bf019c2804e5c74fb6061b16fb712f.tar.gz
Shaarli-7e3dc0ba98bf019c2804e5c74fb6061b16fb712f.tar.zst
Shaarli-7e3dc0ba98bf019c2804e5c74fb6061b16fb712f.zip
Better handling of plugin incompatibility
If a PHP is raised while executing plugin hook, Shaarli will display an error instead of rendering the error page (or just ending in fatal error for default hooks). Also added phpErrorHandler which is handled differently that regular errorHandler by Slim.:
Diffstat (limited to 'tests/container')
-rw-r--r--tests/container/ContainerBuilderTest.php23
1 files changed, 14 insertions, 9 deletions
diff --git a/tests/container/ContainerBuilderTest.php b/tests/container/ContainerBuilderTest.php
index fa77bf31..c08010ae 100644
--- a/tests/container/ContainerBuilderTest.php
+++ b/tests/container/ContainerBuilderTest.php
@@ -9,6 +9,7 @@ use Shaarli\Bookmark\BookmarkServiceInterface;
9use Shaarli\Config\ConfigManager; 9use Shaarli\Config\ConfigManager;
10use Shaarli\Feed\FeedBuilder; 10use Shaarli\Feed\FeedBuilder;
11use Shaarli\Formatter\FormatterFactory; 11use Shaarli\Formatter\FormatterFactory;
12use Shaarli\Front\Controller\Visitor\ErrorController;
12use Shaarli\History; 13use Shaarli\History;
13use Shaarli\Http\HttpAccess; 14use Shaarli\Http\HttpAccess;
14use Shaarli\Netscape\NetscapeBookmarkUtils; 15use Shaarli\Netscape\NetscapeBookmarkUtils;
@@ -20,6 +21,7 @@ use Shaarli\Security\LoginManager;
20use Shaarli\Security\SessionManager; 21use Shaarli\Security\SessionManager;
21use Shaarli\Thumbnailer; 22use Shaarli\Thumbnailer;
22use Shaarli\Updater\Updater; 23use Shaarli\Updater\Updater;
24use Slim\Http\Environment;
23 25
24class ContainerBuilderTest extends TestCase 26class ContainerBuilderTest extends TestCase
25{ 27{
@@ -59,20 +61,23 @@ class ContainerBuilderTest extends TestCase
59 { 61 {
60 $container = $this->containerBuilder->build(); 62 $container = $this->containerBuilder->build();
61 63
62 static::assertInstanceOf(ConfigManager::class, $container->conf); 64 static::assertInstanceOf(BookmarkServiceInterface::class, $container->bookmarkService);
63 static::assertInstanceOf(SessionManager::class, $container->sessionManager);
64 static::assertInstanceOf(CookieManager::class, $container->cookieManager); 65 static::assertInstanceOf(CookieManager::class, $container->cookieManager);
65 static::assertInstanceOf(LoginManager::class, $container->loginManager); 66 static::assertInstanceOf(ConfigManager::class, $container->conf);
67 static::assertInstanceOf(ErrorController::class, $container->errorHandler);
68 static::assertInstanceOf(Environment::class, $container->environment);
69 static::assertInstanceOf(FeedBuilder::class, $container->feedBuilder);
70 static::assertInstanceOf(FormatterFactory::class, $container->formatterFactory);
66 static::assertInstanceOf(History::class, $container->history); 71 static::assertInstanceOf(History::class, $container->history);
67 static::assertInstanceOf(BookmarkServiceInterface::class, $container->bookmarkService); 72 static::assertInstanceOf(HttpAccess::class, $container->httpAccess);
73 static::assertInstanceOf(LoginManager::class, $container->loginManager);
74 static::assertInstanceOf(NetscapeBookmarkUtils::class, $container->netscapeBookmarkUtils);
68 static::assertInstanceOf(PageBuilder::class, $container->pageBuilder); 75 static::assertInstanceOf(PageBuilder::class, $container->pageBuilder);
69 static::assertInstanceOf(PluginManager::class, $container->pluginManager);
70 static::assertInstanceOf(FormatterFactory::class, $container->formatterFactory);
71 static::assertInstanceOf(PageCacheManager::class, $container->pageCacheManager); 76 static::assertInstanceOf(PageCacheManager::class, $container->pageCacheManager);
72 static::assertInstanceOf(FeedBuilder::class, $container->feedBuilder); 77 static::assertInstanceOf(ErrorController::class, $container->phpErrorHandler);
78 static::assertInstanceOf(PluginManager::class, $container->pluginManager);
79 static::assertInstanceOf(SessionManager::class, $container->sessionManager);
73 static::assertInstanceOf(Thumbnailer::class, $container->thumbnailer); 80 static::assertInstanceOf(Thumbnailer::class, $container->thumbnailer);
74 static::assertInstanceOf(HttpAccess::class, $container->httpAccess);
75 static::assertInstanceOf(NetscapeBookmarkUtils::class, $container->netscapeBookmarkUtils);
76 static::assertInstanceOf(Updater::class, $container->updater); 81 static::assertInstanceOf(Updater::class, $container->updater);
77 82
78 // Set by the middleware 83 // Set by the middleware