summaryrefslogtreecommitdiff
path: root/vendor/league/commonmark/src/CommonMarkConverter.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-07-15 11:08:16 +0100
committerGreg Roach <fisharebest@webtrees.net>2019-07-16 10:52:40 +0100
commit4a1f1d433794f86f893b59883147e57af4e94374 (patch)
tree5cb9572b1be24c130a5b8a86b0e1672f822cdfc4 /vendor/league/commonmark/src/CommonMarkConverter.php
parent22cfa91cf34e9677c2d99c712c2fc9e1c2c8f741 (diff)
downloadwebtrees-4a1f1d433794f86f893b59883147e57af4e94374.tar.gz
webtrees-4a1f1d433794f86f893b59883147e57af4e94374.tar.bz2
webtrees-4a1f1d433794f86f893b59883147e57af4e94374.zip
Package webuni/commonmark-table-extension is abandoned, you should avoid using it. Use league/commonmark-ext-table instead.
Diffstat (limited to 'vendor/league/commonmark/src/CommonMarkConverter.php')
-rw-r--r--vendor/league/commonmark/src/CommonMarkConverter.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/vendor/league/commonmark/src/CommonMarkConverter.php b/vendor/league/commonmark/src/CommonMarkConverter.php
index 1de5987cba..a47b825c2a 100644
--- a/vendor/league/commonmark/src/CommonMarkConverter.php
+++ b/vendor/league/commonmark/src/CommonMarkConverter.php
@@ -26,21 +26,24 @@ class CommonMarkConverter extends Converter
*
* @deprecated This will be removed in 1.0.0
*/
- const VERSION = '0.18.5';
+ const VERSION = '0.19.3';
/**
* Create a new commonmark converter instance.
*
- * @param array $config
- * @param Environment|null $environment
+ * @param array $config
+ * @param EnvironmentInterface|null $environment
*/
- public function __construct(array $config = [], Environment $environment = null)
+ public function __construct(array $config = [], EnvironmentInterface $environment = null)
{
if ($environment === null) {
$environment = Environment::createCommonMarkEnvironment();
}
- $environment->mergeConfig($config);
+ if ($environment instanceof ConfigurableEnvironmentInterface) {
+ $environment->mergeConfig($config);
+ }
+
parent::__construct(new DocParser($environment), new HtmlRenderer($environment));
}
}