diff options
| -rw-r--r-- | app/Core/Base.php | 1 | ||||
| -rw-r--r-- | app/ServiceProvider/ClassProvider.php | 5 | ||||
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | composer.lock | 78 | ||||
| -rw-r--r-- | tests/units/Core/Action/ActionManagerTest.php | 4 |
5 files changed, 9 insertions, 80 deletions
diff --git a/app/Core/Base.php b/app/Core/Base.php index 1eef3cf7..905c7375 100644 --- a/app/Core/Base.php +++ b/app/Core/Base.php @@ -113,7 +113,6 @@ use Pimple\Container; * @property \Kanboard\Model\UserMetadata $userMetadata * @property \Kanboard\Model\Webhook $webhook * @property \Psr\Log\LoggerInterface $logger - * @property \League\HTMLToMarkdown\HtmlConverter $htmlConverter * @property \PicoDb\Database $db * @property \Symfony\Component\EventDispatcher\EventDispatcher $dispatcher */ diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php index 3f6aecc5..2e207aa5 100644 --- a/app/ServiceProvider/ClassProvider.php +++ b/app/ServiceProvider/ClassProvider.php @@ -4,7 +4,6 @@ namespace Kanboard\ServiceProvider; use Pimple\Container; use Pimple\ServiceProviderInterface; -use League\HTMLToMarkdown\HtmlConverter; use Kanboard\Core\Mail\Client as EmailClient; use Kanboard\Core\ObjectStorage\FileStorage; use Kanboard\Core\Paginator; @@ -133,10 +132,6 @@ class ClassProvider implements ServiceProviderInterface return new HttpClient($c); }; - $container['htmlConverter'] = function () { - return new HtmlConverter(array('strip_tags' => true)); - }; - $container['objectStorage'] = function () { return new FileStorage(FILES_DIR); }; diff --git a/composer.json b/composer.json index 6907f0ce..87148476 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,6 @@ "fguillot/picodb" : "dev-master", "fguillot/simpleLogger" : "1.0.0", "fguillot/simple-validator" : "1.0.0", - "league/html-to-markdown" : "~4.0", "paragonie/random_compat": "@stable", "pimple/pimple" : "~3.0", "ramsey/array_column": "@stable", diff --git a/composer.lock b/composer.lock index 047d2415..584ef125 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": "6fdfe5fd711d763418007b9f7b2bf5d4", - "content-hash": "c90bee5db71739e8c759b5c8f5032699", + "hash": "a7d258b9944c5787dd1054bfc9f6ad5e", + "content-hash": "1bc9b74a680511d8489c0ae172f1ad8d", "packages": [ { "name": "christian-riesen/base32", @@ -396,81 +396,17 @@ "time": "2015-09-11 15:23:20" }, { - "name": "league/html-to-markdown", - "version": "4.1.1", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "01bbfe039d9b97526e3f3a3ee32543fc1d8dba00" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/01bbfe039d9b97526e3f3a3ee32543fc1d8dba00", - "reference": "01bbfe039d9b97526e3f3a3ee32543fc1d8dba00", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-xml": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "mikehaertl/php-shellcommand": "~1.1.0", - "phpunit/phpunit": "4.*", - "scrutinizer/ocular": "~1.1" - }, - "bin": [ - "bin/html-to-markdown" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "psr-4": { - "League\\HTMLToMarkdown\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "http://www.colinodell.com", - "role": "Lead Developer" - }, - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net", - "role": "Original Author" - } - ], - "description": "An HTML-to-markdown conversion helper for PHP", - "homepage": "https://github.com/thephpleague/html-to-markdown", - "keywords": [ - "html", - "markdown" - ], - "time": "2015-11-20 16:20:25" - }, - { "name": "paragonie/random_compat", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "d762ee5b099a29044603cd4649851e81aa66cb47" + "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/d762ee5b099a29044603cd4649851e81aa66cb47", - "reference": "d762ee5b099a29044603cd4649851e81aa66cb47", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", "shasum": "" }, "require": { @@ -505,7 +441,7 @@ "pseudorandom", "random" ], - "time": "2015-12-10 14:48:13" + "time": "2016-01-06 13:31:20" }, { "name": "pimple/pimple", diff --git a/tests/units/Core/Action/ActionManagerTest.php b/tests/units/Core/Action/ActionManagerTest.php index 3714583b..492b9e03 100644 --- a/tests/units/Core/Action/ActionManagerTest.php +++ b/tests/units/Core/Action/ActionManagerTest.php @@ -34,8 +34,8 @@ class ActionManagerTest extends Base public function testGetAvailableActions() { $actionManager = new ActionManager($this->container); - $actionTaskClose1 = new TaskClose($this->container); - $actionTaskClose2 = new TaskClose($this->container); + $actionTaskClose1 = new TaskCloseColumn($this->container); + $actionTaskClose2 = new TaskCloseColumn($this->container); $actionTaskUpdateStartDate = new TaskUpdateStartDate($this->container); $actionManager |