mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-23 01:21:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3161 from wallabag/scrutinizer-2.3

Browse source 
Fix some Scrutinizer issues
This commit is contained in:
Nicolas Lœuillet 2017-05-31 11:46:41 +02:00 committed by GitHub
commit 3f8578ded3
4 changed files with 35 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Wallabag/CoreBundle/Entity/Entry.php
View file

@ -550,7 +550,7 @@ class Entry
}
/**
* @return ArrayCollection<Tag>
* @return ArrayCollection
*/
public function getTags()
{
@ -685,7 +685,7 @@ class Entry
}
/**
* @return int
* @return string
*/
public function getHttpStatus()
{
@ -693,7 +693,7 @@ class Entry
}
/**
* @param int $httpStatus
* @param string $httpStatus
*
* @return Entry
*/

9
src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
View file

@ -5,7 +5,6 @@ namespace Wallabag\CoreBundle\GuzzleSiteAuthenticator;
use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfig;
use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfigBuilder;
use Graby\SiteConfig\ConfigBuilder;
use OutOfRangeException;
use Psr\Log\LoggerInterface;
class GrabySiteConfigBuilder implements SiteConfigBuilder
@ -38,13 +37,7 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
}
/**
* Builds the SiteConfig for a host.
*
* @param string $host The "www." prefix is ignored
*
* @return SiteConfig
*
* @throws OutOfRangeException If there is no config for $host
* {@inheritdoc}
*/
public function buildForHost($host)
{

1
src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
View file

@ -15,6 +15,7 @@ class RuleBasedTagger
private $rulerz;
private $tagRepository;
private $entryRepository;
private $logger;
public function __construct(RulerZ $rulerz, TagRepository $tagRepository, EntryRepository $entryRepository, LoggerInterface $logger)
{

106
tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
View file

@ -67,18 +67,14 @@ class InstallCommandTest extends WallabagCoreTestCase
$command = $application->find('wallabag:install');
// We mock the QuestionHelper
$question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
->disableOriginalConstructor()
->getMock();
$question->expects($this->any())
->method('ask')
->will($this->returnValue('yes_'.uniqid('', true)));
// We override the standard helper with our mock
$command->getHelperSet()->set($question, 'question');
$tester = new CommandTester($command);
$tester->setInputs([
'y', // dropping database
'y', // create super admin
'username_'.uniqid('', true), // username
'password_'.uniqid('', true), // password
'email_'.uniqid('', true).'@wallabag.it', // email
]);
$tester->execute([
'command' => $command->getName(),
]);
@ -97,18 +93,13 @@ class InstallCommandTest extends WallabagCoreTestCase
$command = $application->find('wallabag:install');
// We mock the QuestionHelper
$question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
->disableOriginalConstructor()
->getMock();
$question->expects($this->any())
->method('ask')
->will($this->returnValue('yes_'.uniqid('', true)));
// We override the standard helper with our mock
$command->getHelperSet()->set($question, 'question');
$tester = new CommandTester($command);
$tester->setInputs([
'y', // create super admin
'username_'.uniqid('', true), // username
'password_'.uniqid('', true), // password
'email_'.uniqid('', true).'@wallabag.it', // email
]);
$tester->execute([
'command' => $command->getName(),
'--reset' => true,
@ -150,18 +141,13 @@ class InstallCommandTest extends WallabagCoreTestCase
$command = $application->find('wallabag:install');
// We mock the QuestionHelper
$question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
->disableOriginalConstructor()
->getMock();
$question->expects($this->any())
->method('ask')
->will($this->returnValue('yes_'.uniqid('', true)));
// We override the standard helper with our mock
$command->getHelperSet()->set($question, 'question');
$tester = new CommandTester($command);
$tester->setInputs([
'y', // create super admin
'username_'.uniqid('', true), // username
'password_'.uniqid('', true), // password
'email_'.uniqid('', true).'@wallabag.it', // email
]);
$tester->execute([
'command' => $command->getName(),
]);
@ -183,23 +169,12 @@ class InstallCommandTest extends WallabagCoreTestCase
$command = $application->find('wallabag:install');
// We mock the QuestionHelper
$question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
->disableOriginalConstructor()
->getMock();
$question->expects($this->exactly(3))
->method('ask')
->will($this->onConsecutiveCalls(
false, // don't want to reset the entire database
true, // do want to reset the schema
false // don't want to create a new user
));
// We override the standard helper with our mock
$command->getHelperSet()->set($question, 'question');
$tester = new CommandTester($command);
$tester->setInputs([
'n', // don't want to reset the entire database
'y', // do want to reset the schema
'n', // don't want to create a new user
]);
$tester->execute([
'command' => $command->getName(),
]);
@ -239,22 +214,11 @@ class InstallCommandTest extends WallabagCoreTestCase
$command = $application->find('wallabag:install');
// We mock the QuestionHelper
$question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
->disableOriginalConstructor()
->getMock();
$question->expects($this->exactly(2))
->method('ask')
->will($this->onConsecutiveCalls(
false, // don't want to reset the entire database
false // don't want to create a new user
));
// We override the standard helper with our mock
$command->getHelperSet()->set($question, 'question');
$tester = new CommandTester($command);
$tester->setInputs([
'n', // don't want to reset the entire database
'n', // don't want to create a new user
]);
$tester->execute([
'command' => $command->getName(),
]);
@ -275,21 +239,11 @@ class InstallCommandTest extends WallabagCoreTestCase
$command = $application->find('wallabag:install');
// We mock the QuestionHelper
$question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
->disableOriginalConstructor()
->getMock();
$question->expects($this->any())
->method('ask')
->will($this->returnValue('yes_'.uniqid('', true)));
// We override the standard helper with our mock
$command->getHelperSet()->set($question, 'question');
$tester = new CommandTester($command);
$tester->execute([
'command' => $command->getName(),
'--no-interaction' => true,
], [
'interactive' => false,
]);
$this->assertContains('Checking system requirements.', $tester->getDisplay());