diff --git a/app/AppKernel.php b/app/AppKernel.php index c03246b..2845644 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -20,6 +20,7 @@ class AppKernel extends Kernel new JMS\SerializerBundle\JMSSerializerBundle(), new Misd\GuzzleBundle\MisdGuzzleBundle(), new Ob\HighchartsBundle\ObHighchartsBundle(), + new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(), new Skobkin\Bundle\PointToolsBundle\SkobkinPointToolsBundle(), ); diff --git a/composer.json b/composer.json index facf900..2023d1e 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "misd/guzzle-bundle": "~1.0", "ob/highcharts-bundle": "^1.2", "doctrine/doctrine-migrations-bundle": "^1.0", - "jms/serializer-bundle": "^1.1" + "jms/serializer-bundle": "^1.1", + "knplabs/knp-markdown-bundle": "^1.4" }, "require-dev": { "sensio/generator-bundle": "~2.3" diff --git a/composer.lock b/composer.lock index faf9599..3185c92 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "273455cf11ab628e83a1a3abfde8f2aa", - "content-hash": "436b7e755a9bca46fcbddf3966c253d2", + "hash": "15a78de1a27727b3d54154a56392c839", + "content-hash": "1ecab327416f24b13209f70bc36cd9bc", "packages": [ { "name": "doctrine/annotations", @@ -1319,6 +1319,67 @@ ], "time": "2015-11-10 12:26:42" }, + { + "name": "knplabs/knp-markdown-bundle", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/KnpMarkdownBundle.git", + "reference": "27d6c8c866a5fef70df3f219e6c2afab25e145ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/KnpMarkdownBundle/zipball/27d6c8c866a5fef70df3f219e6c2afab25e145ce", + "reference": "27d6c8c866a5fef70df3f219e6c2afab25e145ce", + "shasum": "" + }, + "require": { + "michelf/php-markdown": "~1.4", + "php": ">=5.3.9", + "symfony/framework-bundle": "~2.3|~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.5" + }, + "suggest": { + "ext-sundown": "to use optional support for php-sundown extension instead of php implementation", + "symfony/twig-bundle": "to use the Twig markdown filter" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-4": { + "Knp\\Bundle\\MarkdownBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "http://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle/contributors" + } + ], + "description": "Knplabs markdown bundle transforms markdown into html", + "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle", + "keywords": [ + "bundle", + "knp", + "knplabs", + "markdown" + ], + "time": "2015-12-15 20:41:45" + }, { "name": "kriswallsmith/assetic", "version": "v1.3.0", @@ -1397,6 +1458,57 @@ ], "time": "2015-08-31 19:07:16" }, + { + "name": "michelf/php-markdown", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/michelf/php-markdown.git", + "reference": "156e56ee036505ec637d761ee62dc425d807183c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c", + "reference": "156e56ee036505ec637d761ee62dc425d807183c", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-lib": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Michelf": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", + "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "https://daringfireball.net/" + } + ], + "description": "PHP Markdown", + "homepage": "https://michelf.ca/projects/php-markdown/", + "keywords": [ + "markdown" + ], + "time": "2015-12-24 01:37:31" + }, { "name": "misd/guzzle-bundle", "version": "v1.1.5",