pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.2

Browse Source
This commit is contained in:
Jeremy Benoist
2016-11-03 16:41:29 +01:00
parent da41365579 84795d015b
commit 5a619812ca
60 changed files with 2477 additions and 1936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Wallabag/CoreBundle/Helper/EntriesExport.php
View File

@ -8,7 +8,6 @@ use JMS\Serializer\SerializerBuilder;
use PHPePub\Core\EPub;
use PHPePub\Core\Structure\OPF\DublinCore;
use Symfony\Component\HttpFoundation\Response;
use Craue\ConfigBundle\Util\Config;
/**
* This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
@ -27,12 +26,12 @@ class EntriesExport
</div>';
/**
* @param Config $craueConfig CraueConfig instance to get wallabag instance url from database
* @param string $wallabagUrl Wallabag instance url
* @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE
*/
public function __construct(Config $craueConfig, $logoPath)
public function __construct($wallabagUrl, $logoPath)
{
$this->wallabagUrl = $craueConfig->get('wallabag_url');
$this->wallabagUrl = $wallabagUrl;
$this->logoPath = $logoPath;
}