mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-22 17:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Enable PHPStan

Browse source 
- Fix error for level 0 & 1 (level 7 has 699 errors...)
- Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)
This commit is contained in:
Jeremy Benoist 2019-01-17 14:28:05 +01:00
parent 8445ad4790
commit 1e0d8ad7b7
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
27 changed files with 118 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -67,6 +67,8 @@ script:
- make fixtures
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then SYMFONY_PHPUNIT_VERSION=6.5 ./bin/simple-phpunit -v ; fi;
# PHPStan needs PHPUnit to be installed and cache app to be generated
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi;
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;

32
app/DoctrineMigrations/Version20190117131816.php Normal file
View file

@ -0,0 +1,32 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add updated_at fields to site_credential table.
*/
final class Version20190117131816 extends WallabagMigration
{
public function up(Schema $schema): void
{
$siteCredentialTable = $schema->getTable($this->getTable('site_credential'));
$this->skipIf($siteCredentialTable->hasColumn('updated_at'), 'It seems that you already played this migration.');
$siteCredentialTable->addColumn('updated_at', 'datetime', [
'notnull' => false,
]);
}
public function down(Schema $schema): void
{
$siteCredentialTable = $schema->getTable($this->getTable('site_credential'));
$this->skipIf(!$siteCredentialTable->hasColumn('updated_at'), 'It seems that you already played this migration.');
$siteCredentialTable->dropColumn('updated_at');
}
}

6
composer.json
View file

@ -92,7 +92,11 @@
"symfony/phpunit-bridge": "^4.2",
"friendsofphp/php-cs-fixer": "~2.13",
"m6web/redis-mock": "^4.1",
"dama/doctrine-test-bundle": "^5.0"
"dama/doctrine-test-bundle": "^5.0",
"phpstan/phpstan": "^0.11.0",
"phpstan/phpstan-phpunit": "^0.11.0",
"phpstan/phpstan-symfony": "^0.11.0",
"phpstan/phpstan-doctrine": "^0.11.0"
},
"scripts": {
"post-cmd": [

13
phpstan.neon Normal file
View file

@ -0,0 +1,13 @@
includes:
- vendor/phpstan/phpstan-phpunit/extension.neon
- vendor/phpstan/phpstan-symfony/extension.neon
- vendor/phpstan/phpstan-doctrine/extension.neon
- vendor/phpstan/phpstan-phpunit/rules.neon
parameters:
symfony:
container_xml_path: %rootDir%/../../../var/cache/test/appTestDebugProjectContainer.xml
# https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288
autoload_files:
- vendor/bin/.phpunit/phpunit-6.5/vendor/autoload.php

3
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -94,8 +94,9 @@ class InstallCommand extends ContainerAwareCommand
$status = '<info>OK!</info>';
$help = '';
$conn = $this->getContainer()->get('doctrine')->getManager()->getConnection();
try {
$conn = $this->getContainer()->get('doctrine')->getManager()->getConnection();
$conn->connect();
} catch (\Exception $e) {
if (false === strpos($e->getMessage(), 'Unknown database')

17
src/Wallabag/CoreBundle/Entity/SiteCredential.php
View file

@ -59,6 +59,13 @@ class SiteCredential
*/
private $createdAt;
/**
* @var \DateTime
*
* @ORM\Column(name="updated_at", type="datetime")
*/
private $updatedAt;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="siteCredentials")
*/
@ -178,6 +185,16 @@ class SiteCredential
return $this->createdAt;
}
/**
* Get updatedAt.
*
* @return \DateTime
*/
public function getUpdatedAt()
{
return $this->updatedAt;
}
/**
* @return User
*/

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

@ -6,6 +6,7 @@ use Psr\Log\LoggerInterface;
use RulerZ\RulerZ;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\TaggingRule;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
use Wallabag\UserBundle\Entity\User;

2
tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Tests\AnnotationBundle\Controller;
namespace Tests\Wallabag\AnnotationBundle\Controller;
use Tests\Wallabag\AnnotationBundle\WallabagAnnotationTestCase;
use Wallabag\AnnotationBundle\Entity\Annotation;

4
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -794,7 +794,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertArrayHasKey('tags', $content);
$this->assertSame($nbTags + 3, \count($content['tags']));
$this->assertCount($nbTags + 3, $content['tags']);
$entryDB = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
@ -834,7 +834,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertArrayHasKey('tags', $content);
$this->assertSame($nbTags - 1, \count($content['tags']));
$this->assertCount($nbTags - 1, $content['tags']);
}
public function testSaveIsArchivedAfterPost()

2
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace tests\Wallabag\CoreBundle\Controller;
namespace Tests\Wallabag\CoreBundle\Controller;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
use Wallabag\AnnotationBundle\Entity\Annotation;

11
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -522,9 +522,12 @@ class EntryControllerTest extends WallabagCoreTestCase
$crawler = $client->followRedirect();
$this->assertGreaterThan(1, $title = $crawler->filter('div[id=article] h1')->extract(['_text']));
$title = $crawler->filter('div[id=article] h1')->extract(['_text']);
$this->assertGreaterThan(1, $title);
$this->assertContains('My updated title hehe :)', $title[0]);
$this->assertSame(1, \count($stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text'])));
$stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text']);
$this->assertCount(1, $stats);
$this->assertNotContains('example.io', trim($stats[0]));
}
@ -1327,10 +1330,6 @@ class EntryControllerTest extends WallabagCoreTestCase
'http://www.hao123.com/shequ?__noscript__-=1',
'zh_CN',
],
'ru' => [
'https://www.kp.ru/daily/26879.7/3921982/',
'ru',
],
'pt_BR' => [
'https://politica.estadao.com.br/noticias/eleicoes,campanha-catatonica,70002491983',
'pt_BR',

2
tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
View file

@ -180,7 +180,7 @@ class ExportControllerTest extends WallabagCoreTestCase
$this->assertGreaterThan(1, $csv);
// +1 for title line
$this->assertSame(\count($contentInDB) + 1, \count($csv));
$this->assertCount(\count($contentInDB) + 1, $csv);
$this->assertSame('Title;URL;Content;Tags;"MIME Type";Language;"Creation date"', $csv[0]);
$this->assertContains($contentInDB[0]['title'], $csv[1]);
$this->assertContains($contentInDB[0]['url'], $csv[1]);

2
tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
View file

@ -11,7 +11,7 @@ class RssControllerTest extends WallabagCoreTestCase
$doc = new \DOMDocument();
$doc->loadXML($xml);
$xpath = new \DOMXpath($doc);
$xpath = new \DOMXPath($doc);
if (null === $nb) {
$this->assertGreaterThan(0, $xpath->query('//item')->length);

3
tests/Wallabag/CoreBundle/Helper/RedirectTest.php
View file

@ -17,6 +17,9 @@ class RedirectTest extends TestCase
/** @var Redirect */
private $redirect;
/** @var UsernamePasswordToken */
private $token;
public function setUp()
{
$this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router')

2
tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Tests\Wallabag\CoreBundle\Command;
namespace Tests\Wallabag\CoreBundle\ParamConverter;
use PHPUnit\Framework\TestCase;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;

2
tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Tests\Wallabag\ImportBundle\Consumer\AMQP;
namespace Tests\Wallabag\ImportBundle\Consumer;
use PhpAmqpLib\Message\AMQPMessage;
use PHPUnit\Framework\TestCase;

2
tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Tests\Wallabag\ImportBundle\Consumer\AMQP;
namespace Tests\Wallabag\ImportBundle\Consumer;
use PHPUnit\Framework\TestCase;
use Wallabag\CoreBundle\Entity\Entry;

2
tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php
View file

@ -121,7 +121,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
$this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://www.usinenouvelle.com is ok');
$this->assertNotEmpty($content->getLanguage(), 'Language for http://www.usinenouvelle.com is ok');
$this->assertSame(1, \count($content->getTags()));
$this->assertCount(1, $content->getTags());
$createdAt = $content->getCreatedAt();
$this->assertSame('2011', $createdAt->format('Y'));

2
tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
View file

@ -122,7 +122,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
$this->assertNotEmpty($content->getMimetype(), 'Mimetype for http://lexpansion.lexpress.fr is ok');
$this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://lexpansion.lexpress.fr is ok');
$this->assertNotEmpty($content->getLanguage(), 'Language for http://lexpansion.lexpress.fr is ok');
$this->assertSame(3, \count($content->getTags()));
$this->assertCount(3, $content->getTags());
$content = $client->getContainer()
->get('doctrine.orm.entity_manager')

4
tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
View file

@ -124,7 +124,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
$this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for https://www.liberation.fr is ok');
$this->assertNotEmpty($content->getLanguage(), 'Language for https://www.liberation.fr is ok');
$this->assertContains('foot', $content->getTags(), 'It includes the "foot" tag');
$this->assertSame(1, \count($content->getTags()));
$this->assertCount(1, $content->getTags());
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
$content = $client->getContainer()
@ -138,7 +138,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
$this->assertContains('foot', $content->getTags());
$this->assertContains('test_tag', $content->getTags());
$this->assertSame(2, \count($content->getTags()));
$this->assertCount(2, $content->getTags());
}
public function testImportInstapaperWithFileAndMarkAllAsRead()

2
tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
View file

@ -127,7 +127,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertContains('varnish', $tags, 'It includes the "varnish" tag');
$this->assertContains('php', $tags, 'It includes the "php" tag');
$this->assertSame(3, \count($tags));
$this->assertCount(3, $tags);
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
$this->assertSame('2016-10-26', $content->getCreatedAt()->format('Y-m-d'));

2
tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
View file

@ -125,7 +125,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$tags = $content->getTags();
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertSame(1, \count($tags));
$this->assertCount(1, $tags);
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
$this->assertSame('2016-09-08', $content->getCreatedAt()->format('Y-m-d'));

2
tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
View file

@ -127,7 +127,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$tags = $content->getTags();
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertContains('framabag', $tags, 'It includes the "framabag" tag');
$this->assertSame(2, \count($tags));
$this->assertCount(2, $tags);
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
}

4
tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
View file

@ -128,7 +128,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$tags = $content->getTags();
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertSame(1, \count($tags));
$this->assertCount(1, $tags);
$content = $client->getContainer()
->get('doctrine.orm.entity_manager')
@ -147,7 +147,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertContains('mediapart', $tags, 'It includes the "mediapart" tag');
$this->assertContains('blog', $tags, 'It includes the "blog" tag');
$this->assertSame(3, \count($tags));
$this->assertCount(3, $tags);
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
$this->assertSame('2016-09-08', $content->getCreatedAt()->format('Y-m-d'));

2
tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Tests\Controller;
namespace Tests\Wallabag\UserBundle\Controller;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;

16
tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
View file

@ -6,22 +6,6 @@ use PHPUnit\Framework\TestCase;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Mailer\AuthCodeMailer;
/**
* @see https://www.pmg.com/blog/integration-testing-swift-mailer/
*/
final class CountableMemorySpool extends \Swift_MemorySpool implements \Countable
{
public function count()
{
return \count($this->messages);
}
public function getMessages()
{
return $this->messages;
}
}
class AuthCodeMailerTest extends TestCase
{
protected $mailer;

19
tests/Wallabag/UserBundle/Mailer/CountableMemorySpool.php Normal file
View file

@ -0,0 +1,19 @@
<?php
namespace Tests\Wallabag\UserBundle\Mailer;
/**
* @see https://www.pmg.com/blog/integration-testing-swift-mailer/
*/
final class CountableMemorySpool extends \Swift_MemorySpool implements \Countable
{
public function count()
{
return \count($this->messages);
}
public function getMessages()
{
return $this->messages;
}
}