diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-08-27 12:10:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-27 12:10:16 +0200 |
commit | 109ebf318f2f71d6c5f3690da3c16d0b03d982bb (patch) | |
tree | f0a333e9e009d78d59c1e4823f766625bc2bb255 /tests/container | |
parent | af41d5ab5d2bd3ba64d052c997bc6afa6966a63c (diff) | |
parent | 7e3dc0ba98bf019c2804e5c74fb6061b16fb712f (diff) | |
download | Shaarli-109ebf318f2f71d6c5f3690da3c16d0b03d982bb.tar.gz Shaarli-109ebf318f2f71d6c5f3690da3c16d0b03d982bb.tar.zst Shaarli-109ebf318f2f71d6c5f3690da3c16d0b03d982bb.zip |
Merge pull request #1516 from ArthurHoaro/feature/plugin-incompatibility
Better handling of plugin incompatibility
Diffstat (limited to 'tests/container')
-rw-r--r-- | tests/container/ContainerBuilderTest.php | 23 |
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; | |||
9 | use Shaarli\Config\ConfigManager; | 9 | use Shaarli\Config\ConfigManager; |
10 | use Shaarli\Feed\FeedBuilder; | 10 | use Shaarli\Feed\FeedBuilder; |
11 | use Shaarli\Formatter\FormatterFactory; | 11 | use Shaarli\Formatter\FormatterFactory; |
12 | use Shaarli\Front\Controller\Visitor\ErrorController; | ||
12 | use Shaarli\History; | 13 | use Shaarli\History; |
13 | use Shaarli\Http\HttpAccess; | 14 | use Shaarli\Http\HttpAccess; |
14 | use Shaarli\Netscape\NetscapeBookmarkUtils; | 15 | use Shaarli\Netscape\NetscapeBookmarkUtils; |
@@ -20,6 +21,7 @@ use Shaarli\Security\LoginManager; | |||
20 | use Shaarli\Security\SessionManager; | 21 | use Shaarli\Security\SessionManager; |
21 | use Shaarli\Thumbnailer; | 22 | use Shaarli\Thumbnailer; |
22 | use Shaarli\Updater\Updater; | 23 | use Shaarli\Updater\Updater; |
24 | use Slim\Http\Environment; | ||
23 | 25 | ||
24 | class ContainerBuilderTest extends TestCase | 26 | class 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 |