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

Merge pull request #1820 from wallabag/import-refacto

Browse Source 
Refacto wallabag import
This commit is contained in:
Nicolas Lœuillet
2016-03-28 18:52:22 +02:00
parent 0b05dae377 b787a7757e
commit e2dda63152
8 changed files with 361 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Wallabag/CoreBundle/Command/InstallCommand.php
View File

@ -74,10 +74,9 @@ class InstallCommand extends ContainerAwareCommand
$fulfilled = true;
$label = '<comment>PDO Drivers</comment>';
if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) {
$status = '<info>OK!</info>';
$help = '';
} else {
$status = '<info>OK!</info>';
$help = '';
if (!(extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql'))) {
$fulfilled = false;
$status = '<error>ERROR!</error>';
$help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
@ -88,11 +87,10 @@ class InstallCommand extends ContainerAwareCommand
foreach ($this->functionExists as $functionRequired) {
$label = '<comment>'.$functionRequired.'</comment>';
$status = '<info>OK!</info>';
$help = '';
if (function_exists($functionRequired)) {
$status = '<info>OK!</info>';
$help = '';
} else {
if (!function_exists($functionRequired)) {
$fulfilled = false;
$status = '<error>ERROR!</error>';
$help = 'You need the '.$functionRequired.' function activated';

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

@ -367,6 +367,8 @@ class EntriesExport
/**
* Return a Serializer object for producing processes that need it (JSON & XML).
*
* @param string $format
*
* @return Serializer
*/
private function prepareSerializingContent($format)