devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some complexicity in InstallCommand

Browse Source
This commit is contained in:
Jeremy Benoist 2016-03-28 14:18:50 +02:00
parent ba2157b270
commit 0e49487bb0
2 changed files with 8 additions and 8 deletions
Show Stats 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; $fulfilled = true;
$label = '<comment>PDO Drivers</comment>'; $label = '<comment>PDO Drivers</comment>';
if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) { $status = '<info>OK!</info>';
$status = '<info>OK!</info>'; $help = '';
$help = ''; if (!(extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql'))) {
} else {
$fulfilled = false; $fulfilled = false;
$status = '<error>ERROR!</error>'; $status = '<error>ERROR!</error>';
$help = 'Needs one of sqlite, mysql or pgsql PDO drivers'; $help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
@ -88,11 +87,10 @@ class InstallCommand extends ContainerAwareCommand
foreach ($this->functionExists as $functionRequired) { foreach ($this->functionExists as $functionRequired) {
$label = '<comment>'.$functionRequired.'</comment>'; $label = '<comment>'.$functionRequired.'</comment>';
$status = '<info>OK!</info>';
$help = '';
if (function_exists($functionRequired)) { if (!function_exists($functionRequired)) {
$status = '<info>OK!</info>';
$help = '';
} else {
$fulfilled = false; $fulfilled = false;
$status = '<error>ERROR!</error>'; $status = '<error>ERROR!</error>';
$help = 'You need the '.$functionRequired.' function activated'; $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). * Return a Serializer object for producing processes that need it (JSON & XML).
* *
* @param string $format
*
* @return Serializer * @return Serializer
*/ */
private function prepareSerializingContent($format) private function prepareSerializingContent($format)