Remove support for PHP < 7.2

Updating deps

  - Removing electrolinux/php-html5lib (0.1.0)
  - Updating doctrine/inflector (1.3.1 => 1.4.3)
  - Updating doctrine/lexer (1.0.2 => 1.2.1)
  - Installing symfony/polyfill-php80 (v1.17.0)
  - Updating symfony/service-contracts (v1.1.8 => v2.1.2)
  - Installing symfony/deprecation-contracts (v2.1.2)
  - Updating symfony/mime (v4.4.8 => v5.1.1)
  - Updating friendsofsymfony/rest-bundle (2.7.4 => 2.8.0)
  - Updating doctrine/instantiator (1.3.0 => 1.3.1)
  - Updating ocramius/proxy-manager (2.1.1 => 2.2.3)
  - Updating php-http/discovery (1.7.4 => 1.8.0)
  - Updating symfony/http-client-contracts (v1.1.8 => v2.1.2)
  - Updating symfony/http-client (v4.4.8 => v5.1.1)
  - Updating php-http/httplug-bundle (1.16.0 => 1.18.0)
  - Updating symfony/phpunit-bridge (v4.3.11 => v5.1.1)
  - Updating doctrine/data-fixtures (1.3.3 => 1.4.3)
  - Updating composer/xdebug-handler (1.4.1 => 1.4.2)
  - Updating masterminds/html5 (2.7.0 => 2.7.1)
  - Updating j0k3r/php-readability (1.2.4 => 1.2.5)
  - Updating phpoption/phpoption (1.7.3 => 1.7.4)
  - Updating nikic/php-parser (v4.4.0 => v4.5.0)
  - Installing thecodingmachine/safe (v1.1.1)
  - Updating spomky-labs/otphp (v9.1.4 => v10.0.1)
  - Updating pagerfanta/pagerfanta (v2.1.3 => v2.3.0)

Package white-october/pagerfanta-bundle is abandoned, you should avoid using it. Use babdev/pagerfanta-bundle instead.

  - Removing white-october/pagerfanta-bundle (v1.3.2)
  - Installing babdev/pagerfanta-bundle (v2.4.2)

Upgrading PHPStan to 0.12 and use extension installer

  - Removing phpstan/phpdoc-parser (0.3.5)
  - Removing nette/utils (v3.1.2)
  - Removing nette/schema (v1.0.2)
  - Removing nette/robot-loader (v3.2.3)
  - Removing nette/php-generator (v3.4.0)
  - Removing nette/neon (v3.1.2)
  - Removing nette/finder (v2.5.2)
  - Removing nette/di (v3.0.4)
  - Removing nette/bootstrap (v3.0.2)
  - Updating phpstan/phpstan (0.11.19 => 0.12.29)
  - Updating phpstan/phpstan-doctrine (0.11.6 => 0.12.16)
  - Updating phpstan/phpstan-phpunit (0.11.2 => 0.12.11)
  - Updating phpstan/phpstan-symfony (0.11.6 => 0.12.6)
  - Installing phpstan/extension-installer (1.0.4)

Upgrading jms/serializer-bundle to version 3 (and willdurand/hateoas-bundle to version 2)

  - Removing phpoption/phpoption (1.7.4)
  - Removing phpcollection/phpcollection (0.5.0)
  - Removing jms/parser-lib (1.0.0)
  - Updating jms/metadata (1.7.0 => 2.3.0)
  - Updating jms/serializer (1.14.1 => 3.7.0)
  - Updating jms/serializer-bundle (2.4.4 => 3.6.0)
  - Updating willdurand/hateoas (2.12.0 => 3.6.0)
  - Updating willdurand/hateoas-bundle (1.4.0 => 2.1.0)

Upgrading dama/doctrine-test-bundle to version 6

  - Updating dama/doctrine-test-bundle (v5.0.3 => v6.2.0)

.gitignore

@@ -14,6 +14,7 @@
 !/bin/console
 !/bin/symfony_requirements
 .php_cs.cache
+.phpunit.result.cache
 
 # Parameters
 /app/config/parameters.yml

.travis.yml

@@ -22,7 +22,6 @@ if: |
     branch = master
 
 php:
-    - 7.1
     - 7.2
     - 7.3
     - 7.4
@@ -51,7 +50,6 @@ before_install:
     - PHP=$TRAVIS_PHP_VERSION
     - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - phpenv config-rm xdebug.ini || echo "xdebug not available"
-    - composer self-update --no-progress
     # install imagick
     - pear config-set preferred_state beta
     - pecl channel-update pecl.php.net
@@ -71,7 +69,7 @@ before_script:
 script:
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./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/phpstan analyse ; 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;

app/AppKernel.php

@@ -30,7 +30,7 @@ class AppKernel extends Kernel
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Craue\ConfigBundle\CraueConfigBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),

composer.json

@@ -3,6 +3,8 @@
     "type": "project",
     "description": "open source self hostable read-it-later web application",
     "keywords": [
+        "poche",
+        "wallabag",
         "read-it-later",
         "read it later"
     ],
@@ -22,7 +24,7 @@
         },
         {
             "name": "Jérémy Benoist",
-            "homepage": "http://www.j0k3r.net",
+            "homepage": "https://www.j0k3r.net",
             "role": "Developer"
         }
     ],
@@ -31,7 +33,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.2.5",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -47,6 +49,7 @@
         "ext-tidy": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",
+        "babdev/pagerfanta-bundle": "^2.4",
         "bdunogier/guzzle-site-authenticator": "^1.0.0",
         "craue/config-bundle": "^2.3.0",
         "defuse/php-encryption": "^2.1",
@@ -64,7 +67,7 @@
         "incenteev/composer-parameter-handler": "^2.1",
         "j0k3r/graby": "^2.0",
         "javibravo/simpleue": "^2.0",
-        "jms/serializer-bundle": "~2.2",
+        "jms/serializer-bundle": "~3.6",
         "kphoen/rulerz-bundle": "~0.13",
         "laminas/laminas-code": "^3.4",
         "laminas/laminas-diactoros": "^2.3",
@@ -93,22 +96,22 @@
         "twig/extensions": "^1.5",
         "wallabag/php-mobi": "~1.0",
         "wallabag/phpepub": "^4.0.7.2",
-        "white-october/pagerfanta-bundle": "^1.1",
+        "willdurand/hateoas-bundle": "~2.1"
-        "willdurand/hateoas-bundle": "~1.3"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^5.0",
+        "dama/doctrine-test-bundle": "^6.0",
         "doctrine/doctrine-fixtures-bundle": "~3.0",
         "friendsofphp/php-cs-fixer": "~2.13",
         "guzzlehttp/psr7": "^1.0",
         "m6web/redis-mock": "^5.0",
         "php-http/mock-client": "^1.0",
-        "phpstan/phpstan": "^0.11.0",
+        "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan-doctrine": "^0.11.0",
+        "phpstan/phpstan": "^0.12.0",
-        "phpstan/phpstan-phpunit": "^0.11.0",
+        "phpstan/phpstan-doctrine": "^0.12.0",
-        "phpstan/phpstan-symfony": "^0.11.0",
+        "phpstan/phpstan-phpunit": "^0.12.0",
+        "phpstan/phpstan-symfony": "^0.12.0",
         "symfony/maker-bundle": "^1.18",
-        "symfony/phpunit-bridge": "~4.3.8"
+        "symfony/phpunit-bridge": "~5.1.1"
     },
     "suggest": {
         "ext-imagick": "To keep GIF animation when downloading image is enabled"
@@ -159,7 +162,7 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "7.1.3"
+            "php": "7.2.5"
         },
         "sort-packages": true
     },

phpstan.neon

@@ -1,15 +1,14 @@
-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:
+    level: 1
+    paths:
+        - src
+        - tests
+
     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-7.4/vendor/autoload.php
+        - vendor/bin/.phpunit/phpunit-8.3-0/vendor/autoload.php
 
     inferPrivatePropertyTypeFromConstructor: true

src/Wallabag/AnnotationBundle/DataFixtures/AnnotationFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\AnnotationBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\AnnotationBundle\Entity\Annotation;
 use Wallabag\CoreBundle\DataFixtures\EntryFixtures;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;

src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $adminConfig = new Config($this->getReference('admin-user'));
 

src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $entries = [
             'entry1' => [

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
@@ -23,7 +23,7 @@ class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAware
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) {
             $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule();

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureIn
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $rule = new IgnoreOriginUserRule();
         $rule->setRule('host = "example.fr"');

src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\InternalSetting;
@@ -23,7 +23,7 @@ class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
             $newSetting = new InternalSetting();

src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\SiteCredential;
@@ -25,7 +25,7 @@ class SiteCredentialFixtures extends Fixture implements DependentFixtureInterfac
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $credential = new SiteCredential($this->getReference('admin-user'));
         $credential->setHost('.super.com');

src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Tag;
 
 class TagFixtures extends Fixture
@@ -11,7 +11,7 @@ class TagFixtures extends Fixture
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $tags = [
             'foo-bar-tag' => 'foo bar', //tag used for EntryControllerTest

src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\TaggingRule;
 
 class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
@@ -12,7 +12,7 @@ class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $tr1 = new TaggingRule();
         $tr1->setRule('content matches "spurs"');

src/Wallabag/UserBundle/DataFixtures/UserFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\UserBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\UserBundle\Entity\User;
 
 class UserFixtures extends Fixture

tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php

@@ -17,7 +17,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
      */
     protected $user;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = $this->createAuthorizedClient();
     }

tests/Wallabag/ApiBundle/WallabagApiTestCase.php

@@ -17,7 +17,7 @@ abstract class WallabagApiTestCase extends WebTestCase
      */
     protected $user;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = $this->createAuthorizedClient();
     }

tests/Wallabag/CoreBundle/Command/InstallCommandTest.php

@@ -18,19 +18,19 @@ use Wallabag\CoreBundle\Command\InstallCommand;
 
 class InstallCommandTest extends WallabagCoreTestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         // disable doctrine-test-bundle
         StaticDriver::setKeepStaticConnections(false);
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         // enable doctrine-test-bundle
         StaticDriver::setKeepStaticConnections(true);
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -66,7 +66,7 @@ class InstallCommandTest extends WallabagCoreTestCase
         $this->resetDatabase($this->getClient());
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $databasePath = getenv('TEST_DATABASE_PATH');
         // Remove variable environnement

tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php

@@ -22,7 +22,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
      */
     public $bobEntry;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php

@@ -300,7 +300,7 @@ class ExportControllerTest extends WallabagCoreTestCase
 
         $content = new \SimpleXMLElement($client->getResponse()->getContent());
         $this->assertGreaterThan(0, $content->count());
-        $this->assertSame(\count($contentInDB), $content->count());
+        $this->assertCount($contentInDB, $content);
         $this->assertNotEmpty('id', (string) $content->entry[0]->id);
         $this->assertNotEmpty('title', (string) $content->entry[0]->title);
         $this->assertNotEmpty('url', (string) $content->entry[0]->url);

tests/Wallabag/CoreBundle/Helper/RedirectTest.php

@@ -20,7 +20,7 @@ class RedirectTest extends TestCase
     /** @var UsernamePasswordToken */
     private $token;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router')
             ->disableOriginalConstructor()

tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php

@@ -20,7 +20,7 @@ class RuleBasedIgnoreOriginProcessorTest extends TestCase
     private $logger;
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rulerz = $this->getRulerZMock();
         $this->logger = $this->getLogger();

tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php

@@ -21,7 +21,7 @@ class RuleBasedTaggerTest extends TestCase
     private $logger;
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rulerz = $this->getRulerZMock();
         $this->tagRepository = $this->getTagRepositoryMock();

tests/Wallabag/CoreBundle/WallabagCoreTestCase.php

@@ -18,7 +18,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
      */
     private $client = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php

@@ -19,7 +19,7 @@ class AuthenticationFailureListenerTest extends TestCase
     private $listener;
     private $dispatcher;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $request = Request::create('/');
         $request->request->set('_username', 'admin');

tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php

@@ -22,7 +22,7 @@ class CreateConfigListenerTest extends TestCase
     private $request;
     private $response;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $session = new Session(new MockArraySessionStorage());
         $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')

tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php

@@ -14,7 +14,7 @@ class AuthCodeMailerTest extends TestCase
     protected $spool;
     protected $twig;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->spool = new CountableMemorySpool();
         $transport = new \Swift_Transport_SpoolTransport(