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