From: Jérémy Benoist Date: Tue, 12 Nov 2019 12:58:13 +0000 (+0100) Subject: Merge pull request #4163 from aaa2000/docker-increase-php-memory-limit X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8d8d6818fb6b6bc2f4140285a2a53c74e38bc010;hp=64885da458d6c3a57883393f3d924c1a7c245284;p=github%2Fwallabag%2Fwallabag.git Merge pull request #4163 from aaa2000/docker-increase-php-memory-limit Increase php memory limit PHP Docker --- diff --git a/composer.lock b/composer.lock index ad41e6d5..d72a3f62 100644 --- a/composer.lock +++ b/composer.lock @@ -58,21 +58,20 @@ }, { "name": "beberlei/assert", - "version": "v3.2.3", + "version": "v3.2.6", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "65b8152224aef7d3c197d5db05211d4319711b66" + "reference": "99508be011753690fe108ded450f5caaae180cfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/65b8152224aef7d3c197d5db05211d4319711b66", - "reference": "65b8152224aef7d3c197d5db05211d4319711b66", + "url": "https://api.github.com/repos/beberlei/assert/zipball/99508be011753690fe108ded450f5caaae180cfa", + "reference": "99508be011753690fe108ded450f5caaae180cfa", "shasum": "" }, "require": { "ext-ctype": "*", - "ext-intl": "*", "ext-json": "*", "ext-mbstring": "*", "ext-simplexml": "*", @@ -83,6 +82,9 @@ "phpstan/phpstan-shim": "*", "phpunit/phpunit": ">=6.0.0 <8" }, + "suggest": { + "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles" + }, "type": "library", "autoload": { "psr-4": { @@ -114,7 +116,7 @@ "assertion", "validation" ], - "time": "2019-08-23T17:56:26+00:00" + "time": "2019-10-10T10:33:57+00:00" }, { "name": "behat/transliterator", @@ -410,16 +412,16 @@ }, { "name": "doctrine/cache", - "version": "v1.8.0", + "version": "v1.8.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" + "reference": "d4374ae95b36062d02ef310100ed33d78738d76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", + "url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c", + "reference": "d4374ae95b36062d02ef310100ed33d78738d76c", "shasum": "" }, "require": { @@ -454,6 +456,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -462,10 +468,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -481,7 +483,7 @@ "cache", "caching" ], - "time": "2018-08-21T18:01:43+00:00" + "time": "2019-10-28T09:31:32+00:00" }, { "name": "doctrine/collections", @@ -1943,33 +1945,32 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "a5fc73b84bdb2f0fdf58a717b322ceb6997f7bf3" + "reference": "54758949bff9fc520997415341323eebf3f54892" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/a5fc73b84bdb2f0fdf58a717b322ceb6997f7bf3", - "reference": "a5fc73b84bdb2f0fdf58a717b322ceb6997f7bf3", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/54758949bff9fc520997415341323eebf3f54892", + "reference": "54758949bff9fc520997415341323eebf3f54892", "shasum": "" }, "require": { "doctrine/inflector": "^1.0", - "php": "^5.5.9|~7.0", + "php": "^7.1", "psr/log": "^1.0", - "symfony/config": "^3.4|^4.0", - "symfony/debug": "^3.4|^4.0", - "symfony/dependency-injection": "^3.4|^4.0", - "symfony/event-dispatcher": "^3.4|^4.0", - "symfony/finder": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/http-foundation": "^3.4|^4.0", - "symfony/http-kernel": "^3.4|^4.0", - "symfony/routing": "^3.4|^4.0", - "symfony/security-core": "^3.4|^4.0", - "symfony/templating": "^3.4|^4.0", + "symfony/config": "^3.4|^4.3", + "symfony/debug": "^3.4|^4.3", + "symfony/dependency-injection": "^3.4|^4.3", + "symfony/event-dispatcher": "^3.4|^4.3", + "symfony/finder": "^3.4|^4.3", + "symfony/framework-bundle": "^3.4|^4.3", + "symfony/http-foundation": "^3.4|^4.3", + "symfony/http-kernel": "^3.4|^4.3", + "symfony/routing": "^3.4|^4.3", + "symfony/security-core": "^3.4|^4.3", "willdurand/jsonp-callback-validator": "^1.0", "willdurand/negotiation": "^2.0" }, @@ -1984,19 +1985,19 @@ "phpoption/phpoption": "^1.1", "psr/http-message": "^1.0", "sensio/framework-extra-bundle": "^3.0.13|^4.0|^5.0", - "symfony/asset": "^3.4|^4.0", - "symfony/browser-kit": "^3.4|^4.0", - "symfony/css-selector": "^3.4|^4.0", - "symfony/dependency-injection": "^2.7.20|^3.0|^4.0", - "symfony/expression-language": "~2.7|^3.0|^4.0", - "symfony/form": "^3.4|^4.0", + "symfony/asset": "^3.4|^4.3", + "symfony/browser-kit": "^3.4|^4.3", + "symfony/css-selector": "^3.4|^4.3", + "symfony/expression-language": "^3.4|^4.3", + "symfony/form": "^3.4|^4.3", "symfony/phpunit-bridge": "^4.1.8", - "symfony/security-bundle": "^3.4|^4.0", - "symfony/serializer": "^2.7.11|^3.0.4|^4.0", - "symfony/twig-bundle": "^3.4|^4.0", - "symfony/validator": "^3.4|^4.0", - "symfony/web-profiler-bundle": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0" + "symfony/security-bundle": "^3.4|^4.3", + "symfony/serializer": "^3.4|^4.3", + "symfony/templating": "^3.4|^4.3", + "symfony/twig-bundle": "^3.4|^4.3", + "symfony/validator": "^3.4|^4.3", + "symfony/web-profiler-bundle": "^3.4|^4.3", + "symfony/yaml": "^3.4|^4.3" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^2.0|^3.0", @@ -2008,7 +2009,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -2028,13 +2029,13 @@ "name": "Lukas Kahwe Smith", "email": "smith@pooteeweet.org" }, - { - "name": "FriendsOfSymfony Community", - "homepage": "https://github.com/friendsofsymfony/FOSRestBundle/contributors" - }, { "name": "Konstantin Kudryashov", "email": "ever.zet@gmail.com" + }, + { + "name": "FriendsOfSymfony Community", + "homepage": "https://github.com/friendsofsymfony/FOSRestBundle/contributors" } ], "description": "This Bundle provides various tools to rapidly develop RESTful API's with Symfony", @@ -2042,7 +2043,7 @@ "keywords": [ "rest" ], - "time": "2019-01-03T13:05:12+00:00" + "time": "2019-10-21T08:22:30+00:00" }, { "name": "friendsofsymfony/user-bundle", @@ -2456,16 +2457,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "5.3.3", + "version": "5.3.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "93bbdb30d59be6cd9839495306c65f2907370eb9" + "reference": "b87eda7a7162f95574032da17e9323c9899cb6b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/93bbdb30d59be6cd9839495306c65f2907370eb9", - "reference": "93bbdb30d59be6cd9839495306c65f2907370eb9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b87eda7a7162f95574032da17e9323c9899cb6b2", + "reference": "b87eda7a7162f95574032da17e9323c9899cb6b2", "shasum": "" }, "require": { @@ -2505,7 +2506,7 @@ "rest", "web service" ], - "time": "2018-07-31T13:33:10+00:00" + "time": "2019-10-30T09:32:00+00:00" }, { "name": "guzzlehttp/promises", @@ -3785,16 +3786,16 @@ }, { "name": "j0k3r/graby-site-config", - "version": "1.0.91", + "version": "1.0.93", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "2f21c86f0b25911c413d94957a326b812ddbd54d" + "reference": "018ebc5ccd8e631243fcc515fb05b39bac423b31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/2f21c86f0b25911c413d94957a326b812ddbd54d", - "reference": "2f21c86f0b25911c413d94957a326b812ddbd54d", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/018ebc5ccd8e631243fcc515fb05b39bac423b31", + "reference": "018ebc5ccd8e631243fcc515fb05b39bac423b31", "shasum": "" }, "require": { @@ -3821,7 +3822,7 @@ } ], "description": "Graby site config files", - "time": "2019-09-04T07:11:32+00:00" + "time": "2019-10-15T15:51:35+00:00" }, { "name": "j0k3r/httplug-ssrf-plugin", @@ -4934,16 +4935,16 @@ }, { "name": "monolog/monolog", - "version": "1.24.0", + "version": "1.25.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf", + "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf", "shasum": "" }, "require": { @@ -5008,7 +5009,7 @@ "logging", "psr-3" ], - "time": "2018-11-05T09:00:11+00:00" + "time": "2019-09-06T13:49:17+00:00" }, { "name": "nelmio/api-doc-bundle", @@ -5454,16 +5455,16 @@ }, { "name": "php-amqplib/php-amqplib", - "version": "v2.10.0", + "version": "v2.10.1", "source": { "type": "git", "url": "https://github.com/php-amqplib/php-amqplib.git", - "reference": "04e5366f032906d5f716890427e425e71307d3a8" + "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/04e5366f032906d5f716890427e425e71307d3a8", - "reference": "04e5366f032906d5f716890427e425e71307d3a8", + "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/6e2b2501e021e994fb64429e5a78118f83b5c200", + "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200", "shasum": "" }, "require": { @@ -5477,7 +5478,6 @@ "require-dev": { "ext-curl": "*", "nategood/httpful": "^0.2.20", - "phpdocumentor/phpdocumentor": "dev-master", "phpunit/phpunit": "^5.7|^6.5|^7.0", "squizlabs/php_codesniffer": "^2.5" }, @@ -5524,7 +5524,7 @@ "queue", "rabbitmq" ], - "time": "2019-08-08T18:28:18+00:00" + "time": "2019-10-10T13:23:40+00:00" }, { "name": "php-amqplib/rabbitmq-bundle", @@ -6927,16 +6927,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -6945,7 +6945,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -6970,7 +6970,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "psr/simple-cache", @@ -7459,16 +7459,16 @@ }, { "name": "sentry/sentry", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "5896f9f0a00a7525797764ba42091dfbde22a746" + "reference": "217c9e550eb3e06bbe48a4da4031223e1aab76f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/5896f9f0a00a7525797764ba42091dfbde22a746", - "reference": "5896f9f0a00a7525797764ba42091dfbde22a746", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/217c9e550eb3e06bbe48a4da4031223e1aab76f0", + "reference": "217c9e550eb3e06bbe48a4da4031223e1aab76f0", "shasum": "" }, "require": { @@ -7537,7 +7537,7 @@ "logging", "sentry" ], - "time": "2019-09-23T11:52:12+00:00" + "time": "2019-10-10T08:16:00+00:00" }, { "name": "sentry/sentry-symfony", @@ -7617,16 +7617,16 @@ }, { "name": "simplepie/simplepie", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "0e8fe72132dad765d25db4cabc69a91139af1263" + "reference": "173663382a9346acd53df60c7ffb20689c9cf1f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/0e8fe72132dad765d25db4cabc69a91139af1263", - "reference": "0e8fe72132dad765d25db4cabc69a91139af1263", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/173663382a9346acd53df60c7ffb20689c9cf1f6", + "reference": "173663382a9346acd53df60c7ffb20689c9cf1f6", "shasum": "" }, "require": { @@ -7680,7 +7680,7 @@ "feeds", "rss" ], - "time": "2018-08-02T05:43:58+00:00" + "time": "2019-09-22T23:21:30+00:00" }, { "name": "smalot/pdfparser", @@ -7922,22 +7922,22 @@ }, { "name": "symfony/http-client", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "9a4fa769269ed730196a5c52c742b30600cf1e87" + "reference": "69d438274718121e1166e7f65c290f891a4c8ddb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/9a4fa769269ed730196a5c52c742b30600cf1e87", - "reference": "9a4fa769269ed730196a5c52c742b30600cf1e87", + "url": "https://api.github.com/repos/symfony/http-client/zipball/69d438274718121e1166e7f65c290f891a4c8ddb", + "reference": "69d438274718121e1166e7f65c290f891a4c8ddb", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "^1.0", - "symfony/http-client-contracts": "^1.1.6", + "symfony/http-client-contracts": "^1.1.7", "symfony/polyfill-php73": "^1.11" }, "provide": { @@ -7980,20 +7980,20 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-10-07T10:52:41+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "6005fe61a33724405d56eb5b055d5d370192a1bd" + "reference": "353b2a3e907e5c34cf8f74827a4b21eb745aab1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/6005fe61a33724405d56eb5b055d5d370192a1bd", - "reference": "6005fe61a33724405d56eb5b055d5d370192a1bd", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/353b2a3e907e5c34cf8f74827a4b21eb745aab1d", + "reference": "353b2a3e907e5c34cf8f74827a4b21eb745aab1d", "shasum": "" }, "require": { @@ -8037,20 +8037,20 @@ "interoperability", "standards" ], - "time": "2019-08-08T10:05:21+00:00" + "time": "2019-09-26T22:09:58+00:00" }, { "name": "symfony/mime", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "987a05df1c6ac259b34008b932551353f4f408df" + "reference": "32f71570547b91879fdbd9cf50317d556ae86916" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df", - "reference": "987a05df1c6ac259b34008b932551353f4f408df", + "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", + "reference": "32f71570547b91879fdbd9cf50317d556ae86916", "shasum": "" }, "require": { @@ -8096,7 +8096,7 @@ "mime", "mime-type" ], - "time": "2019-08-22T08:16:11+00:00" + "time": "2019-09-19T17:00:15+00:00" }, { "name": "symfony/monolog-bundle", @@ -8795,33 +8795,33 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v3.2.8", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "cb125b3648f132fb8070b55393f20cb310907d3b" + "reference": "6b895bc0a5e815d1bf2d444869415a7c752516aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/cb125b3648f132fb8070b55393f20cb310907d3b", - "reference": "cb125b3648f132fb8070b55393f20cb310907d3b", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/6b895bc0a5e815d1bf2d444869415a7c752516aa", + "reference": "6b895bc0a5e815d1bf2d444869415a7c752516aa", "shasum": "" }, "require": { "php": ">=7.0.0", "swiftmailer/swiftmailer": "^6.1.3", - "symfony/config": "~2.8|~3.3|~4.0", - "symfony/dependency-injection": "~2.7|~3.3|~4.0", - "symfony/http-kernel": "~2.7|~3.3|~4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "conflict": { "twig/twig": "<1.41|<2.10" }, "require-dev": { - "symfony/console": "~2.7|~3.3|~4.0", - "symfony/framework-bundle": "~2.7|~3.3|~4.0", - "symfony/phpunit-bridge": "~3.3|~4.0", - "symfony/yaml": "~2.7|~3.3|~4.0" + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/framework-bundle": "^3.4|^4.0|^5.0", + "symfony/phpunit-bridge": "^3.4.32|^4.3.5|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "psr/log": "Allows logging" @@ -8829,7 +8829,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -8845,31 +8845,31 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2019-06-18T15:27:04+00:00" + "time": "2019-10-20T12:05:18+00:00" }, { "name": "symfony/symfony", - "version": "v3.4.32", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "2815d1fa34d417b8b87450667f166edbefff3177" + "reference": "47813652695f1345987fd5dfc0df67607e738b31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/2815d1fa34d417b8b87450667f166edbefff3177", - "reference": "2815d1fa34d417b8b87450667f166edbefff3177", + "url": "https://api.github.com/repos/symfony/symfony/zipball/47813652695f1345987fd5dfc0df67607e738b31", + "reference": "47813652695f1345987fd5dfc0df67607e738b31", "shasum": "" }, "require": { @@ -9011,7 +9011,7 @@ "keywords": [ "framework" ], - "time": "2019-10-07T14:42:16+00:00" + "time": "2019-11-01T09:46:51+00:00" }, { "name": "true/punycode", @@ -9116,16 +9116,16 @@ }, { "name": "twig/twig", - "version": "v2.12.0", + "version": "v2.12.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "c7a85fd08348ca04b4d8f234f49583d9910906aa" + "reference": "ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/c7a85fd08348ca04b4d8f234f49583d9910906aa", - "reference": "c7a85fd08348ca04b4d8f234f49583d9910906aa", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5", + "reference": "ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5", "shasum": "" }, "require": { @@ -9179,7 +9179,7 @@ "keywords": [ "templating" ], - "time": "2019-10-05T16:42:38+00:00" + "time": "2019-10-17T07:34:53+00:00" }, { "name": "wallabag/php-mobi", @@ -9567,16 +9567,16 @@ }, { "name": "zendframework/zend-code", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "936fa7ad4d53897ea3e3eb41b5b760828246a20b" + "reference": "46feaeecea14161734b56c1ace74f28cb329f194" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/936fa7ad4d53897ea3e3eb41b5b760828246a20b", - "reference": "936fa7ad4d53897ea3e3eb41b5b760828246a20b", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/46feaeecea14161734b56c1ace74f28cb329f194", + "reference": "46feaeecea14161734b56c1ace74f28cb329f194", "shasum": "" }, "require": { @@ -9586,7 +9586,7 @@ "require-dev": { "doctrine/annotations": "^1.0", "ext-phar": "*", - "phpunit/phpunit": "^7.5.15", + "phpunit/phpunit": "^7.5.16 || ^8.4", "zendframework/zend-coding-standard": "^1.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, @@ -9597,8 +9597,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3.x-dev", - "dev-develop": "3.4.x-dev" + "dev-master": "3.4.x-dev", + "dev-develop": "3.5.x-dev" } }, "autoload": { @@ -9616,20 +9616,20 @@ "code", "zf" ], - "time": "2019-08-31T14:14:34+00:00" + "time": "2019-10-05T23:18:22+00:00" }, { "name": "zendframework/zend-diactoros", - "version": "2.1.3", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1" + "reference": "6dcf9e760a6b476f3e9d80abbc9ce9c4aa921f9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/279723778c40164bcf984a2df12ff2c6ec5e61c1", - "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/6dcf9e760a6b476f3e9d80abbc9ce9c4aa921f9c", + "reference": "6dcf9e760a6b476f3e9d80abbc9ce9c4aa921f9c", "shasum": "" }, "require": { @@ -9642,6 +9642,7 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { + "ext-curl": "*", "ext-dom": "*", "ext-libxml": "*", "http-interop/http-factory-tests": "^0.5.0", @@ -9682,7 +9683,7 @@ "psr", "psr-7" ], - "time": "2019-07-10T16:13:25+00:00" + "time": "2019-10-10T17:38:20+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -10120,16 +10121,16 @@ }, { "name": "m6web/redis-mock", - "version": "v4.6.1", + "version": "v4.7.0", "source": { "type": "git", "url": "https://github.com/M6Web/RedisMock.git", - "reference": "5f8821e8a39055ca4ef0d4b51dbc063aa000a2dc" + "reference": "057ad8e1bea903aee54642e310d900bdb794372c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/M6Web/RedisMock/zipball/5f8821e8a39055ca4ef0d4b51dbc063aa000a2dc", - "reference": "5f8821e8a39055ca4ef0d4b51dbc063aa000a2dc", + "url": "https://api.github.com/repos/M6Web/RedisMock/zipball/057ad8e1bea903aee54642e310d900bdb794372c", + "reference": "057ad8e1bea903aee54642e310d900bdb794372c", "shasum": "" }, "require": { @@ -10161,20 +10162,20 @@ "mock", "redis" ], - "time": "2019-08-20T13:03:26+00:00" + "time": "2019-11-04T09:03:23+00:00" }, { "name": "nette/bootstrap", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/nette/bootstrap.git", - "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3" + "reference": "b45a1e33b6a44beb307756522396551e5a9ff249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/bootstrap/zipball/e1075af05c211915e03e0c86542f3ba5433df4a3", - "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3", + "url": "https://api.github.com/repos/nette/bootstrap/zipball/b45a1e33b6a44beb307756522396551e5a9ff249", + "reference": "b45a1e33b6a44beb307756522396551e5a9ff249", "shasum": "" }, "require": { @@ -10182,6 +10183,9 @@ "nette/utils": "^3.0", "php": ">=7.1" }, + "conflict": { + "tracy/tracy": "<2.6" + }, "require-dev": { "latte/latte": "^2.2", "nette/application": "^3.0", @@ -10234,7 +10238,7 @@ "configurator", "nette" ], - "time": "2019-03-26T12:59:07+00:00" + "time": "2019-09-30T08:19:38+00:00" }, { "name": "nette/di", @@ -10612,16 +10616,16 @@ }, { "name": "nette/utils", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "bd961f49b211997202bda1d0fbc410905be370d4" + "reference": "c133e18c922dcf3ad07673077d92d92cef25a148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/bd961f49b211997202bda1d0fbc410905be370d4", - "reference": "bd961f49b211997202bda1d0fbc410905be370d4", + "url": "https://api.github.com/repos/nette/utils/zipball/c133e18c922dcf3ad07673077d92d92cef25a148", + "reference": "c133e18c922dcf3ad07673077d92d92cef25a148", "shasum": "" }, "require": { @@ -10637,6 +10641,7 @@ "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", "ext-json": "to use Nette\\Utils\\Json", "ext-mbstring": "to use Strings::lower() etc...", + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", "ext-xml": "to use Strings::length() etc. when mbstring is not available" }, "type": "library", @@ -10684,7 +10689,7 @@ "utility", "validation" ], - "time": "2019-03-22T01:00:30+00:00" + "time": "2019-10-21T20:40:16+00:00" }, { "name": "nikic/php-parser", @@ -10897,16 +10902,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.11.16", + "version": "0.11.19", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b" + "reference": "63cc502f6957b7f74efbac444b4cf219dcadffd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b", - "reference": "635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/63cc502f6957b7f74efbac444b4cf219dcadffd7", + "reference": "63cc502f6957b7f74efbac444b4cf219dcadffd7", "shasum": "" }, "require": { @@ -10914,6 +10919,7 @@ "jean85/pretty-package-versions": "^1.0.3", "nette/bootstrap": "^2.4 || ^3.0", "nette/di": "^2.4.7 || ^3.0", + "nette/neon": "^2.4.3 || ^3.0", "nette/robot-loader": "^3.0.1", "nette/schema": "^1.0", "nette/utils": "^2.4.5 || ^3.0", @@ -10967,7 +10973,7 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2019-09-17T11:19:51+00:00" + "time": "2019-10-22T20:20:22+00:00" }, { "name": "phpstan/phpstan-doctrine", @@ -11215,16 +11221,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v4.3.5", + "version": "v4.3.6", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "a7fd9e742c31ac2b607b166c9016bab51a36c574" + "reference": "c216b32261358a820bb4217eb3a20e3f437a484e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/a7fd9e742c31ac2b607b166c9016bab51a36c574", - "reference": "a7fd9e742c31ac2b607b166c9016bab51a36c574", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c216b32261358a820bb4217eb3a20e3f437a484e", + "reference": "c216b32261358a820bb4217eb3a20e3f437a484e", "shasum": "" }, "require": { @@ -11276,7 +11282,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2019-10-02T08:36:26+00:00" + "time": "2019-10-30T12:58:49+00:00" } ], "aliases": [], diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 43e3cc5f..171e12fc 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -14,16 +14,21 @@ RUN apt-get update && apt-get install -y \ libsqlite3-dev \ imagemagick \ libmagickwand-dev \ - libtidy-dev + libtidy-dev \ + git RUN docker-php-ext-install \ iconv \ mbstring \ + gd \ intl \ pdo \ pdo_mysql \ pdo_pgsql \ pdo_sqlite \ - tidy + sockets \ + tidy \ + bcmath \ + zip RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 8fd49778..a8ab53da 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -1377,7 +1377,7 @@ class EntryControllerTest extends WallabagCoreTestCase ], 'es-ES' => [ 'https://www.20minutos.es/noticia/3360685/0/gobierno-sanchez-primero-historia-mas-mujeres-que-hombres/', - 'es', + 'es_ES', ], ]; }