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

Upgrade to Symfony 4.4

Browse Source 
- disable autowiring for Event (because the Entry entity was injected)
- rename `getClient()` for test to `getTestClient()` to avoid error while overriding (from `BrowserKitAssertionsTrait`)
This commit is contained in:
Jeremy Benoist
2022-11-23 17:09:32 +01:00
parent 655ec5e07a
commit aa5c7f05b8
43 changed files with 966 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php
View File

@ -14,7 +14,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
public function testImportChrome()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/chrome');
@ -26,7 +26,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
public function testImportChromeWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
public function testImportChromeBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/chrome');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
$crawler = $client->request('GET', '/import/chrome');
@ -94,7 +94,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithChromeFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/chrome');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -135,7 +135,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/chrome');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

14
tests/Wallabag/ImportBundle/Controller/DeliciousControllerTest.php
View File

@ -14,7 +14,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
public function testImportDelicious()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/delicious');
@ -26,7 +26,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
public function testImportDeliciousWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
public function testImportDeliciousBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
$crawler = $client->request('GET', '/import/delicious');
@ -94,7 +94,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
public function testImportDeliciousWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -135,7 +135,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
public function testImportDeliciousWithFileAndMarkAllAsRead()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -180,7 +180,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
public function testImportDeliciousWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

10
tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php
View File

@ -14,7 +14,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase
public function testImportElcurator()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/elcurator');
@ -26,7 +26,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase
public function testImportElcuratorWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase
public function testImportElcuratorBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/elcurator');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
@ -95,7 +95,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase
public function testImportElcuratorWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/elcurator');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

12
tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
View File

@ -14,7 +14,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
public function testImportFirefox()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/firefox');
@ -26,7 +26,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
public function testImportFirefoxWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
public function testImportFirefoxBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/firefox');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
$crawler = $client->request('GET', '/import/firefox');
@ -94,7 +94,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithFirefoxFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/firefox');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -149,7 +149,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/firefox');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

4
tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php
View File

@ -8,7 +8,7 @@ class ImportControllerTest extends WallabagCoreTestCase
{
public function testLogin()
{
$client = $this->getClient();
$client = $this->getTestClient();
$client->request('GET', '/import/');
@ -19,7 +19,7 @@ class ImportControllerTest extends WallabagCoreTestCase
public function testImportList()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/');

14
tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
View File

@ -14,7 +14,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
public function testImportInstapaper()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/instapaper');
@ -26,7 +26,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
public function testImportInstapaperWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
public function testImportInstapaperBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
$crawler = $client->request('GET', '/import/instapaper');
@ -94,7 +94,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
public function testImportInstapaperWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -148,7 +148,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
public function testImportInstapaperWithFileAndMarkAllAsRead()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -193,7 +193,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
public function testImportInstapaperWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

14
tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
View File

@ -14,7 +14,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
public function testImportPinboard()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/pinboard');
@ -26,7 +26,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
public function testImportPinboardWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
public function testImportPinboardBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
$crawler = $client->request('GET', '/import/pinboard');
@ -94,7 +94,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
public function testImportPinboardWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -140,7 +140,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
public function testImportPinboardWithFileAndMarkAllAsRead()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -187,7 +187,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
public function testImportPinboardWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

14
tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
View File

@ -12,7 +12,7 @@ class PocketControllerTest extends WallabagCoreTestCase
public function testImportPocket()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/pocket');
@ -23,7 +23,7 @@ class PocketControllerTest extends WallabagCoreTestCase
public function testImportPocketWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -39,7 +39,7 @@ class PocketControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
@ -54,7 +54,7 @@ class PocketControllerTest extends WallabagCoreTestCase
public function testImportPocketAuthBadToken()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->request('GET', '/import/pocket/auth');
@ -64,7 +64,7 @@ class PocketControllerTest extends WallabagCoreTestCase
public function testImportPocketAuth()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$pocketImport = $this->getMockBuilder(PocketImport::class)
->disableOriginalConstructor()
@ -86,7 +86,7 @@ class PocketControllerTest extends WallabagCoreTestCase
public function testImportPocketCallbackWithBadToken()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$pocketImport = $this->getMockBuilder(PocketImport::class)
->disableOriginalConstructor()
@ -109,7 +109,7 @@ class PocketControllerTest extends WallabagCoreTestCase
public function testImportPocketCallback()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$pocketImport = $this->getMockBuilder(PocketImport::class)
->disableOriginalConstructor()

14
tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
View File

@ -14,7 +14,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
public function testImportReadability()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/readability');
@ -26,7 +26,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
public function testImportReadabilityWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
public function testImportReadabilityBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
$crawler = $client->request('GET', '/import/readability');
@ -94,7 +94,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
public function testImportReadabilityWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -138,7 +138,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
public function testImportReadabilityWithFileAndMarkAllAsRead()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -185,7 +185,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
public function testImportReadabilityWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

14
tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
View File

@ -14,7 +14,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
public function testImportWallabag()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v1');
@ -26,7 +26,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
public function testImportWallabagBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
@ -95,7 +95,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -139,7 +139,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithFileAndMarkAllAsRead()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -186,7 +186,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();

12
tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
View File

@ -14,7 +14,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
public function testImportWallabag()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v2');
@ -26,7 +26,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithRabbitEnabled()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_rabbitmq', 1);
@ -42,7 +42,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
public function testImportWallabagBadFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v2');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -60,7 +60,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
{
$this->checkRedis();
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$client->getContainer()->get(Config::class)->set('import_with_redis', 1);
@ -95,7 +95,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v2');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
@ -161,7 +161,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
public function testImportWallabagWithEmptyFile()
{
$this->logInAs('admin');
$client = $this->getClient();
$client = $this->getTestClient();
$crawler = $client->request('GET', '/import/wallabag-v2');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();