From bd91bd5c32dcec997e1cc1aff93f585dac093742 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 16 Dec 2017 22:17:42 +0100 Subject: [PATCH 1/8] Use namespaced PHPUnit classes --- tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php | 3 ++- tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php | 3 ++- tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php | 3 ++- tests/Wallabag/CoreBundle/Helper/RedirectTest.php | 3 ++- tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php | 3 ++- tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php | 3 ++- .../ParamConverter/UsernameRssTokenConverterTest.php | 3 ++- tests/Wallabag/CoreBundle/Tools/UtilsTest.php | 3 ++- tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php | 3 ++- tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php | 3 ++- .../Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/ChromeImportTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/FirefoxImportTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/ImportChainTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/PocketImportTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php | 3 ++- tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php | 3 ++- .../EventListener/AuthenticationFailureListenerTest.php | 3 ++- .../UserBundle/EventListener/CreateConfigListenerTest.php | 3 ++- tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php | 3 ++- 23 files changed, 46 insertions(+), 23 deletions(-) diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php index 5c99e4618..9a656dadd 100644 --- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php +++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php @@ -5,6 +5,7 @@ namespace Tests\Wallabag\CoreBundle\Helper; use Graby\Graby; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ConstraintViolationList; @@ -15,7 +16,7 @@ use Wallabag\CoreBundle\Helper\ContentProxy; use Wallabag\CoreBundle\Helper\RuleBasedTagger; use Wallabag\UserBundle\Entity\User; -class ContentProxyTest extends \PHPUnit_Framework_TestCase +class ContentProxyTest extends TestCase { private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please troubleshoot this issue.'; diff --git a/tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php b/tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php index 782c29c3b..7398f235a 100644 --- a/tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php +++ b/tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php @@ -4,10 +4,11 @@ namespace Tests\Wallabag\CoreBundle\Helper; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Wallabag\CoreBundle\Helper\CryptoProxy; -class CryptoProxyTest extends \PHPUnit_Framework_TestCase +class CryptoProxyTest extends TestCase { public function testCrypto() { diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php index c61f65d03..0e1d296b0 100644 --- a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php +++ b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php @@ -8,9 +8,10 @@ use GuzzleHttp\Stream\Stream; use GuzzleHttp\Subscriber\Mock; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Helper\DownloadImages; -class DownloadImagesTest extends \PHPUnit_Framework_TestCase +class DownloadImagesTest extends TestCase { public function dataForSuccessImage() { diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php index 7fd2ea2b6..04e1a59c8 100644 --- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php @@ -2,13 +2,14 @@ namespace Tests\Wallabag\CoreBundle\Helper; +use PHPUnit\Framework\TestCase; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Helper\Redirect; use Wallabag\UserBundle\Entity\User; -class RedirectTest extends \PHPUnit_Framework_TestCase +class RedirectTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject */ private $routerMock; diff --git a/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php b/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php index c31af680a..74b28bbb8 100644 --- a/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php @@ -4,6 +4,7 @@ namespace Tests\Wallabag\CoreBundle\Helper; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Tag; @@ -11,7 +12,7 @@ use Wallabag\CoreBundle\Entity\TaggingRule; use Wallabag\CoreBundle\Helper\RuleBasedTagger; use Wallabag\UserBundle\Entity\User; -class RuleBasedTaggerTest extends \PHPUnit_Framework_TestCase +class RuleBasedTaggerTest extends TestCase { private $rulerz; private $tagRepository; diff --git a/tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php b/tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php index 475cd3497..1285c99c6 100644 --- a/tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php +++ b/tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php @@ -2,13 +2,14 @@ namespace Tests\Wallabag\CoreBundle\Helper; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Tag; use Wallabag\CoreBundle\Helper\TagsAssigner; use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\UserBundle\Entity\User; -class TagsAssignerTest extends \PHPUnit_Framework_TestCase +class TagsAssignerTest extends TestCase { public function testAssignTagsWithArrayAndExtraSpaces() { diff --git a/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php b/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php index 74c645ef9..b044a700e 100644 --- a/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php +++ b/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php @@ -2,12 +2,13 @@ namespace Tests\Wallabag\CoreBundle\Command; +use PHPUnit\Framework\TestCase; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter; use Wallabag\UserBundle\Entity\User; -class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase +class UsernameRssTokenConverterTest extends TestCase { public function testSupportsWithNoRegistry() { diff --git a/tests/Wallabag/CoreBundle/Tools/UtilsTest.php b/tests/Wallabag/CoreBundle/Tools/UtilsTest.php index 4521e485b..347589dc0 100644 --- a/tests/Wallabag/CoreBundle/Tools/UtilsTest.php +++ b/tests/Wallabag/CoreBundle/Tools/UtilsTest.php @@ -2,10 +2,11 @@ namespace Tests\Wallabag\CoreBundle\Tools; +use PHPUnit\Framework\TestCase; use Symfony\Component\Finder\Finder; use Wallabag\CoreBundle\Tools\Utils; -class UtilsTest extends \PHPUnit_Framework_TestCase +class UtilsTest extends TestCase { /** * @dataProvider examples diff --git a/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php b/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php index 82336060f..bb92f7458 100644 --- a/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php +++ b/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php @@ -2,9 +2,10 @@ namespace Tests\Wallabag\CoreBundle\Twig; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Twig\WallabagExtension; -class WallabagExtensionTest extends \PHPUnit_Framework_TestCase +class WallabagExtensionTest extends TestCase { public function testRemoveWww() { diff --git a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php index 52b98a0bc..b2141c040 100644 --- a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php +++ b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php @@ -3,11 +3,12 @@ namespace Tests\Wallabag\ImportBundle\Consumer\AMQP; use PhpAmqpLib\Message\AMQPMessage; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Consumer\AMQPEntryConsumer; use Wallabag\UserBundle\Entity\User; -class AMQPEntryConsumerTest extends \PHPUnit_Framework_TestCase +class AMQPEntryConsumerTest extends TestCase { public function testMessageOk() { diff --git a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php index 9506ff639..61337e47e 100644 --- a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php +++ b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php @@ -2,11 +2,12 @@ namespace Tests\Wallabag\ImportBundle\Consumer\AMQP; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Consumer\RedisEntryConsumer; use Wallabag\UserBundle\Entity\User; -class RedisEntryConsumerTest extends \PHPUnit_Framework_TestCase +class RedisEntryConsumerTest extends TestCase { public function testMessageOk() { diff --git a/tests/Wallabag/ImportBundle/Import/ChromeImportTest.php b/tests/Wallabag/ImportBundle/Import/ChromeImportTest.php index 5559ac7ed..12a789e04 100644 --- a/tests/Wallabag/ImportBundle/Import/ChromeImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/ChromeImportTest.php @@ -5,13 +5,14 @@ namespace Tests\Wallabag\ImportBundle\Import; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Import\ChromeImport; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class ChromeImportTest extends \PHPUnit_Framework_TestCase +class ChromeImportTest extends TestCase { protected $user; protected $em; diff --git a/tests/Wallabag/ImportBundle/Import/FirefoxImportTest.php b/tests/Wallabag/ImportBundle/Import/FirefoxImportTest.php index a1783bfcb..eaf693775 100644 --- a/tests/Wallabag/ImportBundle/Import/FirefoxImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/FirefoxImportTest.php @@ -5,13 +5,14 @@ namespace Tests\Wallabag\ImportBundle\Import; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Import\FirefoxImport; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class FirefoxImportTest extends \PHPUnit_Framework_TestCase +class FirefoxImportTest extends TestCase { protected $user; protected $em; diff --git a/tests/Wallabag/ImportBundle/Import/ImportChainTest.php b/tests/Wallabag/ImportBundle/Import/ImportChainTest.php index a9a9915e9..f27826f40 100644 --- a/tests/Wallabag/ImportBundle/Import/ImportChainTest.php +++ b/tests/Wallabag/ImportBundle/Import/ImportChainTest.php @@ -2,9 +2,10 @@ namespace Tests\Wallabag\ImportBundle\Import; +use PHPUnit\Framework\TestCase; use Wallabag\ImportBundle\Import\ImportChain; -class ImportChainTest extends \PHPUnit_Framework_TestCase +class ImportChainTest extends TestCase { public function testGetAll() { diff --git a/tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php b/tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php index 207054f43..e0e90ae3e 100644 --- a/tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php +++ b/tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php @@ -2,10 +2,11 @@ namespace Tests\Wallabag\ImportBundle\Import; +use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\ContainerBuilder; use Wallabag\ImportBundle\Import\ImportCompilerPass; -class ImportCompilerPassTest extends \PHPUnit_Framework_TestCase +class ImportCompilerPassTest extends TestCase { public function testProcessNoDefinition() { diff --git a/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php b/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php index 274dc3264..b5163fadb 100644 --- a/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php @@ -5,13 +5,14 @@ namespace Tests\Wallabag\ImportBundle\Import; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Import\InstapaperImport; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class InstapaperImportTest extends \PHPUnit_Framework_TestCase +class InstapaperImportTest extends TestCase { protected $user; protected $em; diff --git a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php index fe59f8674..baa5d9057 100644 --- a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php @@ -9,6 +9,7 @@ use GuzzleHttp\Subscriber\Mock; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Entity\Entry; @@ -16,7 +17,7 @@ use Wallabag\ImportBundle\Import\PocketImport; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class PocketImportTest extends \PHPUnit_Framework_TestCase +class PocketImportTest extends TestCase { protected $token; protected $user; diff --git a/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php b/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php index 1822cdaaf..e55a56e02 100644 --- a/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php @@ -5,13 +5,14 @@ namespace Tests\Wallabag\ImportBundle\Import; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Import\ReadabilityImport; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class ReadabilityImportTest extends \PHPUnit_Framework_TestCase +class ReadabilityImportTest extends TestCase { protected $user; protected $em; diff --git a/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php b/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php index 822ad6949..4e9f472d2 100644 --- a/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php @@ -5,13 +5,14 @@ namespace Tests\Wallabag\ImportBundle\Import; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Import\WallabagV1Import; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase +class WallabagV1ImportTest extends TestCase { protected $user; protected $em; diff --git a/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php b/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php index fab50a450..68a5d1adf 100644 --- a/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php @@ -5,13 +5,14 @@ namespace Tests\Wallabag\ImportBundle\Import; use M6Web\Component\RedisMock\RedisMockFactory; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Simpleue\Queue\RedisQueue; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\ImportBundle\Import\WallabagV2Import; use Wallabag\ImportBundle\Redis\Producer; use Wallabag\UserBundle\Entity\User; -class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase +class WallabagV2ImportTest extends TestCase { protected $user; protected $em; diff --git a/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php b/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php index 9e33cdca0..6e37cfc48 100644 --- a/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php +++ b/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php @@ -4,6 +4,7 @@ namespace Tests\Wallabag\UserBundle\EventListener; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; @@ -11,7 +12,7 @@ use Symfony\Component\Security\Core\AuthenticationEvents; use Symfony\Component\Security\Core\Event\AuthenticationFailureEvent; use Wallabag\UserBundle\EventListener\AuthenticationFailureListener; -class AuthenticationFailureListenerTest extends \PHPUnit_Framework_TestCase +class AuthenticationFailureListenerTest extends TestCase { private $requestStack; private $logHandler; diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php index e5a145b83..2b540fdfe 100644 --- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php +++ b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php @@ -4,6 +4,7 @@ namespace Tests\Wallabag\UserBundle\EventListener; use FOS\UserBundle\Event\FilterUserResponseEvent; use FOS\UserBundle\FOSUserEvents; +use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -11,7 +12,7 @@ use Wallabag\CoreBundle\Entity\Config; use Wallabag\UserBundle\Entity\User; use Wallabag\UserBundle\EventListener\CreateConfigListener; -class CreateConfigListenerTest extends \PHPUnit_Framework_TestCase +class CreateConfigListenerTest extends TestCase { private $em; private $listener; diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php index 7381ccf12..f39fa60e6 100644 --- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php +++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php @@ -2,6 +2,7 @@ namespace Tests\Wallabag\UserBundle\Mailer; +use PHPUnit\Framework\TestCase; use Wallabag\UserBundle\Entity\User; use Wallabag\UserBundle\Mailer\AuthCodeMailer; @@ -21,7 +22,7 @@ final class CountableMemorySpool extends \Swift_MemorySpool implements \Countabl } } -class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase +class AuthCodeMailerTest extends TestCase { protected $mailer; protected $spool; From eb3754509d4fefa7ba87a2c1b2e7a3554238a7c0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 16 Dec 2017 22:17:51 +0100 Subject: [PATCH 2/8] Add missing parameter for test --- app/config/parameters_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 257d2acec..64e519765 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -8,3 +8,4 @@ parameters: test_database_path: "%env(TEST_DATABASE_PATH)%" env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite" test_database_charset: utf8 + test_database_driver_class: ~ From 26e2f07419c9a16c2a304baa6d2cd36d6dddcd80 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 16 Dec 2017 22:17:56 +0100 Subject: [PATCH 3/8] Fix typo --- .../Wallabag/CoreBundle/Controller/EntryControllerTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index a02f96991..0e7e15760 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -10,7 +10,7 @@ use Wallabag\CoreBundle\Helper\ContentProxy; class EntryControllerTest extends WallabagCoreTestCase { - const An_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE = 'http://www.lemonde.fr/judo/article/2017/11/11/judo-la-decima-de-teddy-riner_5213605_1556020.html'; + const AN_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE = 'http://www.lemonde.fr/judo/article/2017/11/11/judo-la-decima-de-teddy-riner_5213605_1556020.html'; public $downloadImagesEnabled = false; public $url = 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html'; @@ -1018,7 +1018,7 @@ class EntryControllerTest extends WallabagCoreTestCase $this->logInAs('admin'); $client = $this->getClient(); - $url = self::An_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE; + $url = self::AN_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE; $client->getContainer()->get('craue_config')->set('download_images_enabled', 1); $crawler = $client->request('GET', '/new'); @@ -1060,7 +1060,7 @@ class EntryControllerTest extends WallabagCoreTestCase $this->logInAs('admin'); $client = $this->getClient(); - $url = self::An_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE; + $url = self::AN_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE; $client->getContainer()->get('craue_config')->set('download_images_enabled', 1); $crawler = $client->request('GET', '/new'); From 4b6942d2d8555b0dca7f0b8d521a87415ff81e7c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 16 Dec 2017 22:38:07 +0100 Subject: [PATCH 4/8] Add missing TestCase namespace --- .../Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php | 3 ++- .../CoreBundle/Event/Listener/UserLocaleListenerTest.php | 3 ++- .../CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php | 3 ++- .../Form/DataTransformer/StringToListTransformerTest.php | 3 ++- .../GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php index 0dbd9f70d..bc35d1000 100644 --- a/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php +++ b/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php @@ -2,6 +2,7 @@ namespace Tests\Wallabag\CoreBundle\Event\Listener; +use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; @@ -11,7 +12,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\KernelEvents; use Wallabag\CoreBundle\Event\Listener\LocaleListener; -class LocaleListenerTest extends \PHPUnit_Framework_TestCase +class LocaleListenerTest extends TestCase { public function testWithoutSession() { diff --git a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php index 5ffe1ca6d..93edfde8c 100644 --- a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php +++ b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php @@ -2,6 +2,7 @@ namespace Tests\Wallabag\CoreBundle\Event\Listener; +use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; @@ -11,7 +12,7 @@ use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Event\Listener\UserLocaleListener; use Wallabag\UserBundle\Entity\User; -class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase +class UserLocaleListenerTest extends TestCase { public function testWithLanguage() { diff --git a/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php b/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php index 64e3c6d99..06f852373 100644 --- a/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php +++ b/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php @@ -5,9 +5,10 @@ namespace Tests\Wallabag\CoreBundle\Event\Subscriber; use Doctrine\Common\EventManager; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Mapping\ClassMetadata; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber; -class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase +class TablePrefixSubscriberTest extends TestCase { public function dataForPrefix() { diff --git a/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php b/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php index 0ec98c1fb..ef058a8c0 100644 --- a/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php +++ b/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php @@ -2,9 +2,10 @@ namespace Tests\Wallabag\CoreBundle\Form\DataTransformer; +use PHPUnit\Framework\TestCase; use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer; -class StringToListTransformerTest extends \PHPUnit_Framework_TestCase +class StringToListTransformerTest extends TestCase { /** * @dataProvider transformProvider diff --git a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php index 5aee9f5c0..1173fc3de 100644 --- a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php +++ b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php @@ -5,11 +5,12 @@ namespace Tests\Wallabag\CoreBundle\GuzzleSiteAuthenticator; use Graby\SiteConfig\SiteConfig as GrabySiteConfig; use Monolog\Handler\TestHandler; use Monolog\Logger; +use PHPUnit\Framework\TestCase; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder; -class GrabySiteConfigBuilderTest extends \PHPUnit_Framework_TestCase +class GrabySiteConfigBuilderTest extends TestCase { /** @var \Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder */ protected $builder; From 7185fbff6294a810727e12ffd6684efe9ddaf75a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 17 Dec 2017 10:36:48 +0100 Subject: [PATCH 5/8] Update dama/doctrine-test-bundle Because: PHP Fatal error: Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7 --- composer.json | 2 +- phpunit.xml.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 23c7cdc2b..dca274ed5 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,7 @@ "symfony/phpunit-bridge": "^3.3", "friendsofphp/php-cs-fixer": "~2.0", "m6web/redis-mock": "^2.0", - "dama/doctrine-test-bundle": "^3.0" + "dama/doctrine-test-bundle": "^4.0" }, "scripts": { "post-cmd": [ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 591b0909d..951b5a145 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -32,6 +32,6 @@ - + From 5661e8d42af5d0557bf8017b515c51335757d6f2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 18 Dec 2017 10:14:00 +0100 Subject: [PATCH 6/8] Fix countable in tests --- .../CoreBundle/Helper/ContentProxyTest.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php index 9a656dadd..398592e1f 100644 --- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php +++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php @@ -221,7 +221,7 @@ class ContentProxyTest extends TestCase $tagger->expects($this->once()) ->method('tag'); - $validator = $this->getValidator(); + $validator = $this->getValidator(false); $validator->expects($this->once()) ->method('validate') ->willReturn(new ConstraintViolationList([new ConstraintViolation('oops', 'oops', [], 'oops', 'language', 'dontexist')])); @@ -262,7 +262,7 @@ class ContentProxyTest extends TestCase $tagger->expects($this->once()) ->method('tag'); - $validator = $this->getValidator(); + $validator = $this->getValidator(false); $validator->expects($this->exactly(2)) ->method('validate') ->will($this->onConsecutiveCalls( @@ -545,11 +545,19 @@ class ContentProxyTest extends TestCase return new NullLogger(); } - private function getValidator() + private function getValidator($withDefaultMock = true) { - return $this->getMockBuilder(RecursiveValidator::class) + $mock = $this->getMockBuilder(RecursiveValidator::class) ->setMethods(['validate']) ->disableOriginalConstructor() ->getMock(); + + if ($withDefaultMock) { + $mock->expects($this->any()) + ->method('validate') + ->willReturn(new ConstraintViolationList()); + } + + return $mock; } } From acc0a801798d624cfab44ea04769a46dfa54b49b Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 18 Dec 2017 10:29:42 +0100 Subject: [PATCH 7/8] Add missing assertion in tests --- tests/Wallabag/ImportBundle/Command/ImportCommandTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php b/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php index 30aee4d8a..f95320a4a 100644 --- a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php +++ b/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php @@ -97,5 +97,8 @@ class ImportCommandTest extends WallabagCoreTestCase '--useUserId' => true, '--importer' => 'v2', ]); + + $this->assertContains('imported', $tester->getDisplay()); + $this->assertContains('already saved', $tester->getDisplay()); } } From ad880894a8dc0af97ee145f76ed10ca99e1ebf5a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 18 Dec 2017 10:53:40 +0100 Subject: [PATCH 8/8] Update CHANGELOG --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef9d2131c..9dc0ec04f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,9 @@ ### Changes - material: replace exit_to_app, redo and autorenew icons [#3513](https://github.com/wallabag/wallabag/pull/3513) +- Add PHP 7.2 compatibility [#3515](https://github.com/wallabag/wallabag/pull/3515) -## [2.3.0](https://github.com/wallabag/wallabag/tree/2.3.0) (2017-12-11) +## [2.3.0](https://github.com/wallabag/wallabag/tree/2.3.0) (2017-12-11) [Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.3...2.3.0) ### API @@ -44,7 +45,7 @@ ### Features - Share articles to Scuttle (https://github.com/scronide/scuttle) instance [#2999](https://github.com/wallabag/wallabag/pull/2999) -- Allow to remove all archived entries [#3020](https://github.com/wallabag/wallabag/pull/3020) +- Allow to remove all archived entries [#3020](https://github.com/wallabag/wallabag/pull/3020) - Added publication date and author [#3024](https://github.com/wallabag/wallabag/pull/3024) - Added `notmatches` operator for automatic tagging rule [#3047](https://github.com/wallabag/wallabag/pull/3047) - Search & paginate users [#3060](https://github.com/wallabag/wallabag/pull/3060) @@ -67,7 +68,7 @@ - Changed default value for list mode (grid instead of list) [#3014](https://github.com/wallabag/wallabag/pull/3014) - Remove `isPublic` from Entry entity [#3030](https://github.com/wallabag/wallabag/pull/3030) - Use username to import [#3080](https://github.com/wallabag/wallabag/pull/3080) -- Adds Webpack support and remove Grunt [#3022](https://github.com/wallabag/wallabag/pull/3022) +- Adds Webpack support and remove Grunt [#3022](https://github.com/wallabag/wallabag/pull/3022) - Improved Guzzle subscribers extensibility [#2751](https://github.com/wallabag/wallabag/pull/2751) - Added logger when we match Tagging rules [#3110](https://github.com/wallabag/wallabag/pull/3110) - unify Download/Export wording. [#3130](https://github.com/wallabag/wallabag/pull/3130)