From 115de64e5bb9d7f9151ecf15e15a0d988563528e Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 4 Oct 2018 14:07:20 +0200 Subject: Jump to Symfony 3.4 Thanks to the BC compatibility, almost nothing have to be changed. All changes are related to new bundle version of: - SensioFrameworkExtraBundle - DoctrineFixturesBundle --- composer.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 9ed91f20..f209a5c2 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "ext-iconv": "*", "ext-tokenizer": "*", "ext-pdo": "*", - "symfony/symfony": "~3.3.13", + "symfony/symfony": "3.4.*", "doctrine/orm": "^2.5.12", "doctrine/doctrine-bundle": "^1.8.0", "doctrine/doctrine-cache-bundle": "^1.3.2", @@ -51,7 +51,7 @@ "symfony/swiftmailer-bundle": "^2.6.7", "symfony/monolog-bundle": "^3.1.2", "sensio/distribution-bundle": "^5.0.21", - "sensio/framework-extra-bundle": "^3.0.28", + "sensio/framework-extra-bundle": "^5.2.1", "incenteev/composer-parameter-handler": "^2.1.2", "nelmio/cors-bundle": "~1.5", "friendsofsymfony/rest-bundle": "~2.1", @@ -82,14 +82,13 @@ "predis/predis": "^1.1.1", "javibravo/simpleue": "^2.0", "symfony/dom-crawler": "^3.3.13", - "friendsofsymfony/jsrouting-bundle": "^1.6.3", + "friendsofsymfony/jsrouting-bundle": "^2.2.1", "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", "defuse/php-encryption": "^2.1", "html2text/html2text": "^4.1" }, "require-dev": { - "doctrine/doctrine-fixtures-bundle": "~2.2", - "doctrine/data-fixtures": "~1.1", + "doctrine/doctrine-fixtures-bundle": "~3.0", "sensio/generator-bundle": "^3.0", "symfony/phpunit-bridge": "^3.3", "friendsofphp/php-cs-fixer": "~2.0", -- cgit v1.2.3 From 3c7900d0cdc8e1893a14bbdde5a6dec4e4186a10 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 24 Oct 2018 20:26:18 +0200 Subject: Jump to PHP 7.1+ --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 6d5415ab..4f234861 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=5.6.0", + "php": ">=7.1.0", "ext-pcre": "*", "ext-dom": "*", "ext-curl": "*", @@ -48,7 +48,7 @@ "doctrine/doctrine-bundle": "^1.8.0", "doctrine/doctrine-cache-bundle": "^1.3.2", "twig/extensions": "^1.5.1", - "symfony/swiftmailer-bundle": "^2.6.7", + "symfony/swiftmailer-bundle": "^3.2.3", "symfony/monolog-bundle": "^3.1.2", "sensio/distribution-bundle": "^5.0.21", "sensio/framework-extra-bundle": "^5.2.1", @@ -131,7 +131,7 @@ "config": { "bin-dir": "bin", "platform": { - "php": "5.6.0" + "php": "7.1.0" } }, "minimum-stability": "dev", -- cgit v1.2.3 From 6fc95673df5349d682eb6ca6185f894eb711d13a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 24 Oct 2018 21:02:35 +0200 Subject: Cleanup --- composer.json | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4f234861..da2bd3b9 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "jms/serializer-bundle": "~2.2", "nelmio/api-doc-bundle": "^2.13.2", "mgargano/simplehtmldom": "~1.5", - "wallabag/tcpdf": "^6.2.15", + "wallabag/tcpdf": "^6.2.26", "simplepie/simplepie": "~1.5", "willdurand/hateoas-bundle": "~1.3", "liip/theme-bundle": "^1.4.6", @@ -68,7 +68,7 @@ "friendsofsymfony/oauth-server-bundle": "^1.5.2", "stof/doctrine-extensions-bundle": "^1.2", "scheb/two-factor-bundle": "^2.14.0", - "grandt/phpepub": "^4.0.7", + "grandt/phpepub": "dev-master", "wallabag/php-mobi": "~1.0.0", "kphoen/rulerz-bundle": "~0.13", "guzzlehttp/guzzle": "^5.3.1", @@ -122,18 +122,33 @@ } }, "autoload": { - "psr-4": { "Wallabag\\": "src/Wallabag/" }, - "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] + "psr-4": { + "Wallabag\\": "src/Wallabag/" + }, + "classmap": [ + "app/AppKernel.php", + "app/AppCache.php" + ] }, "autoload-dev": { - "psr-4": { "Tests\\": "tests/" } + "psr-4": { + "Tests\\": "tests/" + }, + "files": [ "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php" ] }, "config": { "bin-dir": "bin", "platform": { - "php": "7.1.0" + "php": "7.1" } }, "minimum-stability": "dev", - "prefer-stable": true + "prefer-stable": true, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/Daniel-KM/PHPePub", + "comment": "The most up-to-date PHPePub as of now" + } + ] } -- cgit v1.2.3 From 9394e8098a92c849d15c43dcd0c338887bff68ce Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 24 Oct 2018 22:16:45 +0200 Subject: Jump to unrelease predis To fix deprecated message regarding `each()` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index da2bd3b9..8b31085b 100644 --- a/composer.json +++ b/composer.json @@ -79,7 +79,7 @@ "ocramius/proxy-manager": "^1.0.2", "white-october/pagerfanta-bundle": "^1.1.0", "php-amqplib/rabbitmq-bundle": "^1.14", - "predis/predis": "^1.1.1", + "predis/predis": "v1.1.x-dev", "javibravo/simpleue": "^2.0", "symfony/dom-crawler": "^3.3.13", "friendsofsymfony/jsrouting-bundle": "^2.2.1", -- cgit v1.2.3 From 8f2038e5b15c2d7342ed18381531e5eb95e86d46 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 26 Nov 2018 22:22:49 +0100 Subject: Fix tests --- composer.json | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 8b31085b..4f609567 100644 --- a/composer.json +++ b/composer.json @@ -44,15 +44,15 @@ "ext-tokenizer": "*", "ext-pdo": "*", "symfony/symfony": "3.4.*", - "doctrine/orm": "^2.5.12", - "doctrine/doctrine-bundle": "^1.8.0", - "doctrine/doctrine-cache-bundle": "^1.3.2", - "twig/extensions": "^1.5.1", - "symfony/swiftmailer-bundle": "^3.2.3", - "symfony/monolog-bundle": "^3.1.2", - "sensio/distribution-bundle": "^5.0.21", - "sensio/framework-extra-bundle": "^5.2.1", - "incenteev/composer-parameter-handler": "^2.1.2", + "doctrine/orm": "^2.6", + "doctrine/doctrine-bundle": "^1.9", + "doctrine/doctrine-cache-bundle": "^1.3", + "twig/extensions": "^1.5", + "symfony/swiftmailer-bundle": "^3.2", + "symfony/monolog-bundle": "^3.1", + "sensio/distribution-bundle": "^5.0", + "sensio/framework-extra-bundle": "^5.2", + "incenteev/composer-parameter-handler": "^2.1", "nelmio/cors-bundle": "~1.5", "friendsofsymfony/rest-bundle": "~2.1", "jms/serializer-bundle": "~2.2", @@ -62,27 +62,26 @@ "simplepie/simplepie": "~1.5", "willdurand/hateoas-bundle": "~1.3", "liip/theme-bundle": "^1.4.6", - "lexik/form-filter-bundle": "^5.0.4", + "lexik/form-filter-bundle": "^5.0", "j0k3r/graby": "^1.0", "friendsofsymfony/user-bundle": "2.0.*", - "friendsofsymfony/oauth-server-bundle": "^1.5.2", + "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2", - "scheb/two-factor-bundle": "^2.14.0", + "scheb/two-factor-bundle": "^2.14", "grandt/phpepub": "dev-master", - "wallabag/php-mobi": "~1.0.0", + "wallabag/php-mobi": "~1.0", "kphoen/rulerz-bundle": "~0.13", "guzzlehttp/guzzle": "^5.3.1", "doctrine/doctrine-migrations-bundle": "^1.3", - "paragonie/random_compat": "^2.0.11", "craue/config-bundle": "~2.0", "mnapoli/piwik-twig-extension": "^1.0", "ocramius/proxy-manager": "^1.0.2", - "white-october/pagerfanta-bundle": "^1.1.0", + "white-october/pagerfanta-bundle": "^1.1", "php-amqplib/rabbitmq-bundle": "^1.14", "predis/predis": "v1.1.x-dev", "javibravo/simpleue": "^2.0", - "symfony/dom-crawler": "^3.3.13", - "friendsofsymfony/jsrouting-bundle": "^2.2.1", + "symfony/dom-crawler": "^3.4", + "friendsofsymfony/jsrouting-bundle": "^2.2", "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", "defuse/php-encryption": "^2.1", "html2text/html2text": "^4.1" @@ -90,10 +89,10 @@ "require-dev": { "doctrine/doctrine-fixtures-bundle": "~3.0", "sensio/generator-bundle": "^3.0", - "symfony/phpunit-bridge": "3.4.x-dev", - "friendsofphp/php-cs-fixer": "~2.0", - "m6web/redis-mock": "^2.0", - "dama/doctrine-test-bundle": "^4.0" + "symfony/phpunit-bridge": "^3.4", + "friendsofphp/php-cs-fixer": "~2.13", + "m6web/redis-mock": "^4.1", + "dama/doctrine-test-bundle": "^5.0" }, "scripts": { "post-cmd": [ -- cgit v1.2.3 From 9a8a1bdfdbc87047bffb457370e04ef58a24495c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 27 Nov 2018 11:38:28 +0100 Subject: Use our own fork for CraueConfigBundle Mostly to fix utf8mb4 issue --- composer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4f609567..405b1188 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "kphoen/rulerz-bundle": "~0.13", "guzzlehttp/guzzle": "^5.3.1", "doctrine/doctrine-migrations-bundle": "^1.3", - "craue/config-bundle": "~2.0", + "craue/config-bundle": "dev-utf8mb4", "mnapoli/piwik-twig-extension": "^1.0", "ocramius/proxy-manager": "^1.0.2", "white-october/pagerfanta-bundle": "^1.1", @@ -148,6 +148,11 @@ "type": "vcs", "url": "https://github.com/Daniel-KM/PHPePub", "comment": "The most up-to-date PHPePub as of now" + }, + { + "type": "vcs", + "url": "https://github.com/wallabag/CraueConfigBundle", + "comment": "To handle utf8mb4 field size" } ] } -- cgit v1.2.3 From 9666fb70fc23f273d137d8d3300c60e24789c73b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 12 Jan 2019 13:10:51 +0100 Subject: Bump ocramius/proxy-manager Signed-off-by: Thomas Citharel --- composer.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 405b1188..5394442d 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,10 @@ "name": "wallabag/wallabag", "type": "project", "description": "open source self hostable read-it-later web application", - "keywords": ["read-it-later","read it later"], + "keywords": [ + "read-it-later", + "read it later" + ], "homepage": "https://github.com/wallabag/wallabag", "license": "MIT", "authors": [ @@ -75,7 +78,7 @@ "doctrine/doctrine-migrations-bundle": "^1.3", "craue/config-bundle": "dev-utf8mb4", "mnapoli/piwik-twig-extension": "^1.0", - "ocramius/proxy-manager": "^1.0.2", + "ocramius/proxy-manager": "^2.1.1", "white-october/pagerfanta-bundle": "^1.1", "php-amqplib/rabbitmq-bundle": "^1.14", "predis/predis": "v1.1.x-dev", @@ -133,7 +136,9 @@ "psr-4": { "Tests\\": "tests/" }, - "files": [ "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php" ] + "files": [ + "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php" + ] }, "config": { "bin-dir": "bin", -- cgit v1.2.3 From 1e0d8ad7b728f6fb2cd886526b0fb84ef803e84f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 17 Jan 2019 14:28:05 +0100 Subject: Enable PHPStan - Fix error for level 0 & 1 (level 7 has 699 errors...) - Add `updated_at` to site_credential (so the `timestamps()` method applies correctly) --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 8b28f065..89286c7f 100644 --- a/composer.json +++ b/composer.json @@ -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": [ -- cgit v1.2.3 From a6b242a1fd6f8900d80354361449f1bf62506ef9 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 2 Dec 2018 12:43:05 +0100 Subject: Enable OTP 2FA - Update SchebTwoFactorBundle to version 3 - Enable Google 2fa on the bundle - Disallow ability to use both email and google as 2fa - Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7) - use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add` - update admin to be able to create/reset the 2fa --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 21d71b74..771580c6 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=7.1.0", + "php": ">=7.1.3", "ext-pcre": "*", "ext-dom": "*", "ext-curl": "*", @@ -70,7 +70,7 @@ "friendsofsymfony/user-bundle": "2.0.*", "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2", - "scheb/two-factor-bundle": "^2.14", + "scheb/two-factor-bundle": "^3.0", "grandt/phpepub": "dev-master", "wallabag/php-mobi": "~1.0", "kphoen/rulerz-bundle": "~0.13", @@ -147,7 +147,7 @@ "config": { "bin-dir": "bin", "platform": { - "php": "7.1" + "php": "7.1.3" } }, "minimum-stability": "dev", -- cgit v1.2.3 From dfd0a7bc5feb4fd7b77d7e2f3a25c5c3febc1eba Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Dec 2018 06:51:06 +0100 Subject: Add backup codes --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 771580c6..7678d7b8 100644 --- a/composer.json +++ b/composer.json @@ -87,7 +87,8 @@ "friendsofsymfony/jsrouting-bundle": "^2.2", "bdunogier/guzzle-site-authenticator": "^1.0.0", "defuse/php-encryption": "^2.1", - "html2text/html2text": "^4.1" + "html2text/html2text": "^4.1", + "pragmarx/recovery": "^0.1.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~3.0", -- cgit v1.2.3 From 9306c2a368cc7c7da577b6199440f4abc907af7d Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 10 May 2019 15:32:29 +0200 Subject: Use Imagick to keep GIF animation If Imagick is available, GIF will be saved using it to keep animation. Otherwise the previous method will be used and the animation won't be kept. --- composer.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'composer.json') diff --git a/composer.json b/composer.json index b28404e3..b1c144c7 100644 --- a/composer.json +++ b/composer.json @@ -103,6 +103,9 @@ "phpstan/phpstan-symfony": "^0.11.0", "phpstan/phpstan-doctrine": "^0.11.0" }, + "suggest": { + "ext-imagick": "To keep GIF animation when downloading image is enabled" + }, "scripts": { "post-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", -- cgit v1.2.3 From bf9ace0643f654e7ccd9c020b8b501ad56cd19de Mon Sep 17 00:00:00 2001 From: adev Date: Tue, 24 Oct 2017 22:55:40 +0200 Subject: Use httplug --- composer.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index b1c144c7..55e7f765 100644 --- a/composer.json +++ b/composer.json @@ -66,8 +66,9 @@ "simplepie/simplepie": "~1.5", "willdurand/hateoas-bundle": "~1.3", "liip/theme-bundle": "^1.4.6", - "lexik/form-filter-bundle": "^5.0", - "j0k3r/graby": "^1.0", + "lexik/form-filter-bundle": "^5.0.4", + "j0k3r/graby": "^2.0", + "php-http/guzzle5-adapter": "^2.0", "friendsofsymfony/user-bundle": "2.0.*", "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2", @@ -89,7 +90,8 @@ "bdunogier/guzzle-site-authenticator": "^1.0.0", "defuse/php-encryption": "^2.1", "html2text/html2text": "^4.1", - "pragmarx/recovery": "^0.1.0" + "pragmarx/recovery": "^0.1.0", + "php-http/httplug-bundle": "^1.14" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~3.0", @@ -101,7 +103,9 @@ "phpstan/phpstan": "^0.11.0", "phpstan/phpstan-phpunit": "^0.11.0", "phpstan/phpstan-symfony": "^0.11.0", - "phpstan/phpstan-doctrine": "^0.11.0" + "phpstan/phpstan-doctrine": "^0.11.0", + "php-http/mock-client": "^1.0", + "guzzlehttp/psr7": "^1.0" }, "suggest": { "ext-imagick": "To keep GIF animation when downloading image is enabled" -- cgit v1.2.3