diff options
-rw-r--r-- | composer.lock | 236 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/ImportController.php | 2 |
2 files changed, 123 insertions, 115 deletions
diff --git a/composer.lock b/composer.lock index 576822e2..5b0b83f2 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -216,36 +216,43 @@ | |||
216 | }, | 216 | }, |
217 | { | 217 | { |
218 | "name": "craue/config-bundle", | 218 | "name": "craue/config-bundle", |
219 | "version": "2.3.0", | 219 | "version": "2.4.0", |
220 | "source": { | 220 | "source": { |
221 | "type": "git", | 221 | "type": "git", |
222 | "url": "https://github.com/craue/CraueConfigBundle.git", | 222 | "url": "https://github.com/craue/CraueConfigBundle.git", |
223 | "reference": "7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72" | 223 | "reference": "ad474f63d6b51da0d346a7873b3a54f98fa96e32" |
224 | }, | 224 | }, |
225 | "dist": { | 225 | "dist": { |
226 | "type": "zip", | 226 | "type": "zip", |
227 | "url": "https://api.github.com/repos/craue/CraueConfigBundle/zipball/7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72", | 227 | "url": "https://api.github.com/repos/craue/CraueConfigBundle/zipball/ad474f63d6b51da0d346a7873b3a54f98fa96e32", |
228 | "reference": "7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72", | 228 | "reference": "ad474f63d6b51da0d346a7873b3a54f98fa96e32", |
229 | "shasum": "" | 229 | "shasum": "" |
230 | }, | 230 | }, |
231 | "require": { | 231 | "require": { |
232 | "doctrine/doctrine-bundle": "^1.5.1", | 232 | "doctrine/doctrine-bundle": "^1.5.1|~2.0", |
233 | "php": "~7.0", | 233 | "php": "~7.0", |
234 | "psr/simple-cache": "^1.0", | 234 | "psr/simple-cache": "^1.0", |
235 | "symfony/framework-bundle": "~3.4|~4.1" | 235 | "symfony/cache": "~3.4|~4.2|~5.0", |
236 | "symfony/config": "~3.4|~4.2|~5.0", | ||
237 | "symfony/dependency-injection": "~3.4|~4.2|~5.0", | ||
238 | "symfony/form": "~3.4|~4.2|~5.0", | ||
239 | "symfony/framework-bundle": "~3.4|~4.2|~5.0", | ||
240 | "symfony/http-foundation": "~3.4|~4.2|~5.0", | ||
241 | "symfony/http-kernel": "~3.4|~4.2|~5.0", | ||
242 | "symfony/options-resolver": "~3.4|~4.2|~5.0", | ||
243 | "symfony/validator": "~3.4|~4.2|~5.0" | ||
236 | }, | 244 | }, |
237 | "require-dev": { | 245 | "require-dev": { |
238 | "doctrine/doctrine-cache-bundle": "^1.3.5", | ||
239 | "doctrine/instantiator": "^1.0.5", | 246 | "doctrine/instantiator": "^1.0.5", |
240 | "doctrine/orm": "^2.5.14", | 247 | "doctrine/orm": "^2.5.14", |
241 | "phpunit/phpunit": "^6.5.13|^7.5.1", | 248 | "phpunit/phpunit": "^6.5.13|^7.5.1", |
242 | "symfony/phpunit-bridge": "~3.4|~4.1", | 249 | "symfony/phpunit-bridge": "~5.0", |
243 | "symfony/symfony": "~3.4|~4.1" | 250 | "symfony/symfony": "~3.4|~4.2|~5.0" |
244 | }, | 251 | }, |
245 | "type": "symfony-bundle", | 252 | "type": "symfony-bundle", |
246 | "extra": { | 253 | "extra": { |
247 | "branch-alias": { | 254 | "branch-alias": { |
248 | "dev-master": "2.3.x-dev" | 255 | "dev-master": "2.4.x-dev" |
249 | } | 256 | } |
250 | }, | 257 | }, |
251 | "autoload": { | 258 | "autoload": { |
@@ -274,10 +281,9 @@ | |||
274 | "homepage": "https://github.com/craue/CraueConfigBundle", | 281 | "homepage": "https://github.com/craue/CraueConfigBundle", |
275 | "keywords": [ | 282 | "keywords": [ |
276 | "config", | 283 | "config", |
277 | "symfony3", | 284 | "symfony" |
278 | "symfony4" | ||
279 | ], | 285 | ], |
280 | "time": "2019-08-01T15:52:03+00:00" | 286 | "time": "2019-12-03T08:32:04+00:00" |
281 | }, | 287 | }, |
282 | { | 288 | { |
283 | "name": "defuse/php-encryption", | 289 | "name": "defuse/php-encryption", |
@@ -412,16 +418,16 @@ | |||
412 | }, | 418 | }, |
413 | { | 419 | { |
414 | "name": "doctrine/cache", | 420 | "name": "doctrine/cache", |
415 | "version": "1.9.1", | 421 | "version": "1.10.0", |
416 | "source": { | 422 | "source": { |
417 | "type": "git", | 423 | "type": "git", |
418 | "url": "https://github.com/doctrine/cache.git", | 424 | "url": "https://github.com/doctrine/cache.git", |
419 | "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55" | 425 | "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62" |
420 | }, | 426 | }, |
421 | "dist": { | 427 | "dist": { |
422 | "type": "zip", | 428 | "type": "zip", |
423 | "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55", | 429 | "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62", |
424 | "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55", | 430 | "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62", |
425 | "shasum": "" | 431 | "shasum": "" |
426 | }, | 432 | }, |
427 | "require": { | 433 | "require": { |
@@ -488,10 +494,9 @@ | |||
488 | "memcached", | 494 | "memcached", |
489 | "php", | 495 | "php", |
490 | "redis", | 496 | "redis", |
491 | "riak", | ||
492 | "xcache" | 497 | "xcache" |
493 | ], | 498 | ], |
494 | "time": "2019-11-15T14:31:57+00:00" | 499 | "time": "2019-11-29T15:36:20+00:00" |
495 | }, | 500 | }, |
496 | { | 501 | { |
497 | "name": "doctrine/collections", | 502 | "name": "doctrine/collections", |
@@ -730,16 +735,16 @@ | |||
730 | }, | 735 | }, |
731 | { | 736 | { |
732 | "name": "doctrine/doctrine-bundle", | 737 | "name": "doctrine/doctrine-bundle", |
733 | "version": "1.12.0", | 738 | "version": "1.12.2", |
734 | "source": { | 739 | "source": { |
735 | "type": "git", | 740 | "type": "git", |
736 | "url": "https://github.com/doctrine/DoctrineBundle.git", | 741 | "url": "https://github.com/doctrine/DoctrineBundle.git", |
737 | "reference": "a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115" | 742 | "reference": "9ac04186b47abda4759d0c304ab8f0780c470ac9" |
738 | }, | 743 | }, |
739 | "dist": { | 744 | "dist": { |
740 | "type": "zip", | 745 | "type": "zip", |
741 | "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115", | 746 | "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/9ac04186b47abda4759d0c304ab8f0780c470ac9", |
742 | "reference": "a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115", | 747 | "reference": "9ac04186b47abda4759d0c304ab8f0780c470ac9", |
743 | "shasum": "" | 748 | "shasum": "" |
744 | }, | 749 | }, |
745 | "require": { | 750 | "require": { |
@@ -747,6 +752,7 @@ | |||
747 | "doctrine/doctrine-cache-bundle": "~1.2", | 752 | "doctrine/doctrine-cache-bundle": "~1.2", |
748 | "jdorn/sql-formatter": "^1.2.16", | 753 | "jdorn/sql-formatter": "^1.2.16", |
749 | "php": "^7.1", | 754 | "php": "^7.1", |
755 | "symfony/cache": "^3.4.30|^4.3.3", | ||
750 | "symfony/config": "^3.4.30|^4.3.3", | 756 | "symfony/config": "^3.4.30|^4.3.3", |
751 | "symfony/console": "^3.4.30|^4.3.3", | 757 | "symfony/console": "^3.4.30|^4.3.3", |
752 | "symfony/dependency-injection": "^3.4.30|^4.3.3", | 758 | "symfony/dependency-injection": "^3.4.30|^4.3.3", |
@@ -762,7 +768,6 @@ | |||
762 | "doctrine/orm": "^2.6", | 768 | "doctrine/orm": "^2.6", |
763 | "php-coveralls/php-coveralls": "^2.1", | 769 | "php-coveralls/php-coveralls": "^2.1", |
764 | "phpunit/phpunit": "^7.5", | 770 | "phpunit/phpunit": "^7.5", |
765 | "symfony/cache": "^3.4.30|^4.3.3", | ||
766 | "symfony/phpunit-bridge": "^4.2", | 771 | "symfony/phpunit-bridge": "^4.2", |
767 | "symfony/property-info": "^3.4.30|^4.3.3", | 772 | "symfony/property-info": "^3.4.30|^4.3.3", |
768 | "symfony/twig-bridge": "^3.4|^4.1", | 773 | "symfony/twig-bridge": "^3.4|^4.1", |
@@ -816,43 +821,43 @@ | |||
816 | "orm", | 821 | "orm", |
817 | "persistence" | 822 | "persistence" |
818 | ], | 823 | ], |
819 | "time": "2019-11-19T11:42:20+00:00" | 824 | "time": "2019-11-28T13:00:49+00:00" |
820 | }, | 825 | }, |
821 | { | 826 | { |
822 | "name": "doctrine/doctrine-cache-bundle", | 827 | "name": "doctrine/doctrine-cache-bundle", |
823 | "version": "1.3.5", | 828 | "version": "1.4.0", |
824 | "source": { | 829 | "source": { |
825 | "type": "git", | 830 | "type": "git", |
826 | "url": "https://github.com/doctrine/DoctrineCacheBundle.git", | 831 | "url": "https://github.com/doctrine/DoctrineCacheBundle.git", |
827 | "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927" | 832 | "reference": "6bee2f9b339847e8a984427353670bad4e7bdccb" |
828 | }, | 833 | }, |
829 | "dist": { | 834 | "dist": { |
830 | "type": "zip", | 835 | "type": "zip", |
831 | "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/5514c90d9fb595e1095e6d66ebb98ce9ef049927", | 836 | "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/6bee2f9b339847e8a984427353670bad4e7bdccb", |
832 | "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927", | 837 | "reference": "6bee2f9b339847e8a984427353670bad4e7bdccb", |
833 | "shasum": "" | 838 | "shasum": "" |
834 | }, | 839 | }, |
835 | "require": { | 840 | "require": { |
836 | "doctrine/cache": "^1.4.2", | 841 | "doctrine/cache": "^1.4.2", |
837 | "doctrine/inflector": "~1.0", | 842 | "doctrine/inflector": "^1.0", |
838 | "php": ">=5.3.2", | 843 | "php": "^7.1", |
839 | "symfony/doctrine-bridge": "~2.7|~3.3|~4.0" | 844 | "symfony/doctrine-bridge": "^3.4|^4.0" |
840 | }, | 845 | }, |
841 | "require-dev": { | 846 | "require-dev": { |
842 | "instaclick/coding-standard": "~1.1", | 847 | "instaclick/coding-standard": "~1.1", |
843 | "instaclick/object-calisthenics-sniffs": "dev-master", | 848 | "instaclick/object-calisthenics-sniffs": "dev-master", |
844 | "instaclick/symfony2-coding-standard": "dev-remaster", | 849 | "instaclick/symfony2-coding-standard": "dev-remaster", |
845 | "phpunit/phpunit": "~4.8.36|~5.6|~6.5|~7.0", | 850 | "phpunit/phpunit": "^7.0", |
846 | "predis/predis": "~0.8", | 851 | "predis/predis": "~0.8", |
847 | "satooshi/php-coveralls": "^1.0", | 852 | "satooshi/php-coveralls": "^1.0", |
848 | "squizlabs/php_codesniffer": "~1.5", | 853 | "squizlabs/php_codesniffer": "~1.5", |
849 | "symfony/console": "~2.7|~3.3|~4.0", | 854 | "symfony/console": "^3.4|^4.0", |
850 | "symfony/finder": "~2.7|~3.3|~4.0", | 855 | "symfony/finder": "^3.4|^4.0", |
851 | "symfony/framework-bundle": "~2.7|~3.3|~4.0", | 856 | "symfony/framework-bundle": "^3.4|^4.0", |
852 | "symfony/phpunit-bridge": "~2.7|~3.3|~4.0", | 857 | "symfony/phpunit-bridge": "^3.4|^4.0", |
853 | "symfony/security-acl": "~2.7|~3.3", | 858 | "symfony/security-acl": "^2.8", |
854 | "symfony/validator": "~2.7|~3.3|~4.0", | 859 | "symfony/validator": "^3.4|^4.0", |
855 | "symfony/yaml": "~2.7|~3.3|~4.0" | 860 | "symfony/yaml": "^3.4|^4.0" |
856 | }, | 861 | }, |
857 | "suggest": { | 862 | "suggest": { |
858 | "symfony/security-acl": "For using this bundle to cache ACLs" | 863 | "symfony/security-acl": "For using this bundle to cache ACLs" |
@@ -860,7 +865,7 @@ | |||
860 | "type": "symfony-bundle", | 865 | "type": "symfony-bundle", |
861 | "extra": { | 866 | "extra": { |
862 | "branch-alias": { | 867 | "branch-alias": { |
863 | "dev-master": "1.3.x-dev" | 868 | "dev-master": "1.4.x-dev" |
864 | } | 869 | } |
865 | }, | 870 | }, |
866 | "autoload": { | 871 | "autoload": { |
@@ -877,8 +882,8 @@ | |||
877 | ], | 882 | ], |
878 | "authors": [ | 883 | "authors": [ |
879 | { | 884 | { |
880 | "name": "Symfony Community", | 885 | "name": "Fabien Potencier", |
881 | "homepage": "http://symfony.com/contributors" | 886 | "email": "fabien@symfony.com" |
882 | }, | 887 | }, |
883 | { | 888 | { |
884 | "name": "Benjamin Eberlei", | 889 | "name": "Benjamin Eberlei", |
@@ -893,12 +898,12 @@ | |||
893 | "email": "guilhermeblanco@hotmail.com" | 898 | "email": "guilhermeblanco@hotmail.com" |
894 | }, | 899 | }, |
895 | { | 900 | { |
896 | "name": "Doctrine Project", | 901 | "name": "Symfony Community", |
897 | "homepage": "http://www.doctrine-project.org/" | 902 | "homepage": "http://symfony.com/contributors" |
898 | }, | 903 | }, |
899 | { | 904 | { |
900 | "name": "Fabien Potencier", | 905 | "name": "Doctrine Project", |
901 | "email": "fabien@symfony.com" | 906 | "homepage": "http://www.doctrine-project.org/" |
902 | } | 907 | } |
903 | ], | 908 | ], |
904 | "description": "Symfony Bundle for Doctrine Cache", | 909 | "description": "Symfony Bundle for Doctrine Cache", |
@@ -907,7 +912,7 @@ | |||
907 | "cache", | 912 | "cache", |
908 | "caching" | 913 | "caching" |
909 | ], | 914 | ], |
910 | "time": "2018-11-09T06:25:35+00:00" | 915 | "time": "2019-11-29T11:22:01+00:00" |
911 | }, | 916 | }, |
912 | { | 917 | { |
913 | "name": "doctrine/doctrine-migrations-bundle", | 918 | "name": "doctrine/doctrine-migrations-bundle", |
@@ -1756,27 +1761,27 @@ | |||
1756 | }, | 1761 | }, |
1757 | { | 1762 | { |
1758 | "name": "friendsofsymfony/jsrouting-bundle", | 1763 | "name": "friendsofsymfony/jsrouting-bundle", |
1759 | "version": "2.4.0", | 1764 | "version": "2.5.1", |
1760 | "source": { | 1765 | "source": { |
1761 | "type": "git", | 1766 | "type": "git", |
1762 | "url": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle.git", | 1767 | "url": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle.git", |
1763 | "reference": "e42ed450eac2b61d5fcba9cd834c294a429e9a40" | 1768 | "reference": "81cf14bf3db5e6fe3ef0442fc762891422005d3b" |
1764 | }, | 1769 | }, |
1765 | "dist": { | 1770 | "dist": { |
1766 | "type": "zip", | 1771 | "type": "zip", |
1767 | "url": "https://api.github.com/repos/FriendsOfSymfony/FOSJsRoutingBundle/zipball/e42ed450eac2b61d5fcba9cd834c294a429e9a40", | 1772 | "url": "https://api.github.com/repos/FriendsOfSymfony/FOSJsRoutingBundle/zipball/81cf14bf3db5e6fe3ef0442fc762891422005d3b", |
1768 | "reference": "e42ed450eac2b61d5fcba9cd834c294a429e9a40", | 1773 | "reference": "81cf14bf3db5e6fe3ef0442fc762891422005d3b", |
1769 | "shasum": "" | 1774 | "shasum": "" |
1770 | }, | 1775 | }, |
1771 | "require": { | 1776 | "require": { |
1772 | "php": "^5.3.9|^7.0", | 1777 | "php": "^7.1", |
1773 | "symfony/console": "~2.7||~3.0|^4.0", | 1778 | "symfony/console": "~3.3|^4.0|^5.0", |
1774 | "symfony/framework-bundle": "~2.7||~3.0|^4.0", | 1779 | "symfony/framework-bundle": "~3.3|^4.0|^5.0", |
1775 | "symfony/serializer": "~2.7||~3.0|^4.0", | 1780 | "symfony/serializer": "~3.3|^4.0|^5.0", |
1776 | "willdurand/jsonp-callback-validator": "~1.0" | 1781 | "willdurand/jsonp-callback-validator": "~1.0" |
1777 | }, | 1782 | }, |
1778 | "require-dev": { | 1783 | "require-dev": { |
1779 | "symfony/expression-language": "~2.7||~3.0|^4.0", | 1784 | "symfony/expression-language": "~3.3|^4.0|^5.0", |
1780 | "symfony/phpunit-bridge": "^3.3|^4.0" | 1785 | "symfony/phpunit-bridge": "^3.3|^4.0" |
1781 | }, | 1786 | }, |
1782 | "type": "symfony-bundle", | 1787 | "type": "symfony-bundle", |
@@ -1814,7 +1819,7 @@ | |||
1814 | "javascript", | 1819 | "javascript", |
1815 | "routing" | 1820 | "routing" |
1816 | ], | 1821 | ], |
1817 | "time": "2019-08-10T15:40:05+00:00" | 1822 | "time": "2019-12-02T08:01:22+00:00" |
1818 | }, | 1823 | }, |
1819 | { | 1824 | { |
1820 | "name": "friendsofsymfony/oauth-server-bundle", | 1825 | "name": "friendsofsymfony/oauth-server-bundle", |
@@ -8278,16 +8283,16 @@ | |||
8278 | }, | 8283 | }, |
8279 | { | 8284 | { |
8280 | "name": "symfony/polyfill-apcu", | 8285 | "name": "symfony/polyfill-apcu", |
8281 | "version": "v1.12.0", | 8286 | "version": "v1.13.1", |
8282 | "source": { | 8287 | "source": { |
8283 | "type": "git", | 8288 | "type": "git", |
8284 | "url": "https://github.com/symfony/polyfill-apcu.git", | 8289 | "url": "https://github.com/symfony/polyfill-apcu.git", |
8285 | "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5" | 8290 | "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116" |
8286 | }, | 8291 | }, |
8287 | "dist": { | 8292 | "dist": { |
8288 | "type": "zip", | 8293 | "type": "zip", |
8289 | "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/71ce80635d5dcd67772b4dda00b86068595f64d5", | 8294 | "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a8e961c841b9ec52927a87914f8820a1ad8f8116", |
8290 | "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5", | 8295 | "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116", |
8291 | "shasum": "" | 8296 | "shasum": "" |
8292 | }, | 8297 | }, |
8293 | "require": { | 8298 | "require": { |
@@ -8296,7 +8301,7 @@ | |||
8296 | "type": "library", | 8301 | "type": "library", |
8297 | "extra": { | 8302 | "extra": { |
8298 | "branch-alias": { | 8303 | "branch-alias": { |
8299 | "dev-master": "1.12-dev" | 8304 | "dev-master": "1.13-dev" |
8300 | } | 8305 | } |
8301 | }, | 8306 | }, |
8302 | "autoload": { | 8307 | "autoload": { |
@@ -8330,20 +8335,20 @@ | |||
8330 | "portable", | 8335 | "portable", |
8331 | "shim" | 8336 | "shim" |
8332 | ], | 8337 | ], |
8333 | "time": "2019-08-06T08:03:45+00:00" | 8338 | "time": "2019-11-27T13:56:44+00:00" |
8334 | }, | 8339 | }, |
8335 | { | 8340 | { |
8336 | "name": "symfony/polyfill-ctype", | 8341 | "name": "symfony/polyfill-ctype", |
8337 | "version": "v1.12.0", | 8342 | "version": "v1.13.1", |
8338 | "source": { | 8343 | "source": { |
8339 | "type": "git", | 8344 | "type": "git", |
8340 | "url": "https://github.com/symfony/polyfill-ctype.git", | 8345 | "url": "https://github.com/symfony/polyfill-ctype.git", |
8341 | "reference": "550ebaac289296ce228a706d0867afc34687e3f4" | 8346 | "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" |
8342 | }, | 8347 | }, |
8343 | "dist": { | 8348 | "dist": { |
8344 | "type": "zip", | 8349 | "type": "zip", |
8345 | "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", | 8350 | "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", |
8346 | "reference": "550ebaac289296ce228a706d0867afc34687e3f4", | 8351 | "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", |
8347 | "shasum": "" | 8352 | "shasum": "" |
8348 | }, | 8353 | }, |
8349 | "require": { | 8354 | "require": { |
@@ -8355,7 +8360,7 @@ | |||
8355 | "type": "library", | 8360 | "type": "library", |
8356 | "extra": { | 8361 | "extra": { |
8357 | "branch-alias": { | 8362 | "branch-alias": { |
8358 | "dev-master": "1.12-dev" | 8363 | "dev-master": "1.13-dev" |
8359 | } | 8364 | } |
8360 | }, | 8365 | }, |
8361 | "autoload": { | 8366 | "autoload": { |
@@ -8388,7 +8393,7 @@ | |||
8388 | "polyfill", | 8393 | "polyfill", |
8389 | "portable" | 8394 | "portable" |
8390 | ], | 8395 | ], |
8391 | "time": "2019-08-06T08:03:45+00:00" | 8396 | "time": "2019-11-27T13:56:44+00:00" |
8392 | }, | 8397 | }, |
8393 | { | 8398 | { |
8394 | "name": "symfony/polyfill-iconv", | 8399 | "name": "symfony/polyfill-iconv", |
@@ -8451,16 +8456,16 @@ | |||
8451 | }, | 8456 | }, |
8452 | { | 8457 | { |
8453 | "name": "symfony/polyfill-intl-icu", | 8458 | "name": "symfony/polyfill-intl-icu", |
8454 | "version": "v1.12.0", | 8459 | "version": "v1.13.1", |
8455 | "source": { | 8460 | "source": { |
8456 | "type": "git", | 8461 | "type": "git", |
8457 | "url": "https://github.com/symfony/polyfill-intl-icu.git", | 8462 | "url": "https://github.com/symfony/polyfill-intl-icu.git", |
8458 | "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e" | 8463 | "reference": "b3dffd68afa61ca70f2327f2dd9bbeb6aa53d70b" |
8459 | }, | 8464 | }, |
8460 | "dist": { | 8465 | "dist": { |
8461 | "type": "zip", | 8466 | "type": "zip", |
8462 | "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66810b9d6eb4af54d543867909d65ab9af654d7e", | 8467 | "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/b3dffd68afa61ca70f2327f2dd9bbeb6aa53d70b", |
8463 | "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e", | 8468 | "reference": "b3dffd68afa61ca70f2327f2dd9bbeb6aa53d70b", |
8464 | "shasum": "" | 8469 | "shasum": "" |
8465 | }, | 8470 | }, |
8466 | "require": { | 8471 | "require": { |
@@ -8473,7 +8478,7 @@ | |||
8473 | "type": "library", | 8478 | "type": "library", |
8474 | "extra": { | 8479 | "extra": { |
8475 | "branch-alias": { | 8480 | "branch-alias": { |
8476 | "dev-master": "1.12-dev" | 8481 | "dev-master": "1.13-dev" |
8477 | } | 8482 | } |
8478 | }, | 8483 | }, |
8479 | "autoload": { | 8484 | "autoload": { |
@@ -8505,7 +8510,7 @@ | |||
8505 | "portable", | 8510 | "portable", |
8506 | "shim" | 8511 | "shim" |
8507 | ], | 8512 | ], |
8508 | "time": "2019-08-06T08:03:45+00:00" | 8513 | "time": "2019-11-27T13:56:44+00:00" |
8509 | }, | 8514 | }, |
8510 | { | 8515 | { |
8511 | "name": "symfony/polyfill-intl-idn", | 8516 | "name": "symfony/polyfill-intl-idn", |
@@ -8571,16 +8576,16 @@ | |||
8571 | }, | 8576 | }, |
8572 | { | 8577 | { |
8573 | "name": "symfony/polyfill-mbstring", | 8578 | "name": "symfony/polyfill-mbstring", |
8574 | "version": "v1.12.0", | 8579 | "version": "v1.13.1", |
8575 | "source": { | 8580 | "source": { |
8576 | "type": "git", | 8581 | "type": "git", |
8577 | "url": "https://github.com/symfony/polyfill-mbstring.git", | 8582 | "url": "https://github.com/symfony/polyfill-mbstring.git", |
8578 | "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" | 8583 | "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" |
8579 | }, | 8584 | }, |
8580 | "dist": { | 8585 | "dist": { |
8581 | "type": "zip", | 8586 | "type": "zip", |
8582 | "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", | 8587 | "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", |
8583 | "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", | 8588 | "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", |
8584 | "shasum": "" | 8589 | "shasum": "" |
8585 | }, | 8590 | }, |
8586 | "require": { | 8591 | "require": { |
@@ -8592,7 +8597,7 @@ | |||
8592 | "type": "library", | 8597 | "type": "library", |
8593 | "extra": { | 8598 | "extra": { |
8594 | "branch-alias": { | 8599 | "branch-alias": { |
8595 | "dev-master": "1.12-dev" | 8600 | "dev-master": "1.13-dev" |
8596 | } | 8601 | } |
8597 | }, | 8602 | }, |
8598 | "autoload": { | 8603 | "autoload": { |
@@ -8626,20 +8631,20 @@ | |||
8626 | "portable", | 8631 | "portable", |
8627 | "shim" | 8632 | "shim" |
8628 | ], | 8633 | ], |
8629 | "time": "2019-08-06T08:03:45+00:00" | 8634 | "time": "2019-11-27T14:18:11+00:00" |
8630 | }, | 8635 | }, |
8631 | { | 8636 | { |
8632 | "name": "symfony/polyfill-php56", | 8637 | "name": "symfony/polyfill-php56", |
8633 | "version": "v1.12.0", | 8638 | "version": "v1.13.1", |
8634 | "source": { | 8639 | "source": { |
8635 | "type": "git", | 8640 | "type": "git", |
8636 | "url": "https://github.com/symfony/polyfill-php56.git", | 8641 | "url": "https://github.com/symfony/polyfill-php56.git", |
8637 | "reference": "0e3b212e96a51338639d8ce175c046d7729c3403" | 8642 | "reference": "53dd1cdf3cb986893ccf2b96665b25b3abb384f4" |
8638 | }, | 8643 | }, |
8639 | "dist": { | 8644 | "dist": { |
8640 | "type": "zip", | 8645 | "type": "zip", |
8641 | "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403", | 8646 | "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/53dd1cdf3cb986893ccf2b96665b25b3abb384f4", |
8642 | "reference": "0e3b212e96a51338639d8ce175c046d7729c3403", | 8647 | "reference": "53dd1cdf3cb986893ccf2b96665b25b3abb384f4", |
8643 | "shasum": "" | 8648 | "shasum": "" |
8644 | }, | 8649 | }, |
8645 | "require": { | 8650 | "require": { |
@@ -8649,7 +8654,7 @@ | |||
8649 | "type": "library", | 8654 | "type": "library", |
8650 | "extra": { | 8655 | "extra": { |
8651 | "branch-alias": { | 8656 | "branch-alias": { |
8652 | "dev-master": "1.12-dev" | 8657 | "dev-master": "1.13-dev" |
8653 | } | 8658 | } |
8654 | }, | 8659 | }, |
8655 | "autoload": { | 8660 | "autoload": { |
@@ -8682,20 +8687,20 @@ | |||
8682 | "portable", | 8687 | "portable", |
8683 | "shim" | 8688 | "shim" |
8684 | ], | 8689 | ], |
8685 | "time": "2019-08-06T08:03:45+00:00" | 8690 | "time": "2019-11-27T13:56:44+00:00" |
8686 | }, | 8691 | }, |
8687 | { | 8692 | { |
8688 | "name": "symfony/polyfill-php70", | 8693 | "name": "symfony/polyfill-php70", |
8689 | "version": "v1.12.0", | 8694 | "version": "v1.13.1", |
8690 | "source": { | 8695 | "source": { |
8691 | "type": "git", | 8696 | "type": "git", |
8692 | "url": "https://github.com/symfony/polyfill-php70.git", | 8697 | "url": "https://github.com/symfony/polyfill-php70.git", |
8693 | "reference": "54b4c428a0054e254223797d2713c31e08610831" | 8698 | "reference": "af23c7bb26a73b850840823662dda371484926c4" |
8694 | }, | 8699 | }, |
8695 | "dist": { | 8700 | "dist": { |
8696 | "type": "zip", | 8701 | "type": "zip", |
8697 | "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831", | 8702 | "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/af23c7bb26a73b850840823662dda371484926c4", |
8698 | "reference": "54b4c428a0054e254223797d2713c31e08610831", | 8703 | "reference": "af23c7bb26a73b850840823662dda371484926c4", |
8699 | "shasum": "" | 8704 | "shasum": "" |
8700 | }, | 8705 | }, |
8701 | "require": { | 8706 | "require": { |
@@ -8705,7 +8710,7 @@ | |||
8705 | "type": "library", | 8710 | "type": "library", |
8706 | "extra": { | 8711 | "extra": { |
8707 | "branch-alias": { | 8712 | "branch-alias": { |
8708 | "dev-master": "1.12-dev" | 8713 | "dev-master": "1.13-dev" |
8709 | } | 8714 | } |
8710 | }, | 8715 | }, |
8711 | "autoload": { | 8716 | "autoload": { |
@@ -8741,7 +8746,7 @@ | |||
8741 | "portable", | 8746 | "portable", |
8742 | "shim" | 8747 | "shim" |
8743 | ], | 8748 | ], |
8744 | "time": "2019-08-06T08:03:45+00:00" | 8749 | "time": "2019-11-27T13:56:44+00:00" |
8745 | }, | 8750 | }, |
8746 | { | 8751 | { |
8747 | "name": "symfony/polyfill-php72", | 8752 | "name": "symfony/polyfill-php72", |
@@ -8858,16 +8863,16 @@ | |||
8858 | }, | 8863 | }, |
8859 | { | 8864 | { |
8860 | "name": "symfony/polyfill-util", | 8865 | "name": "symfony/polyfill-util", |
8861 | "version": "v1.12.0", | 8866 | "version": "v1.13.1", |
8862 | "source": { | 8867 | "source": { |
8863 | "type": "git", | 8868 | "type": "git", |
8864 | "url": "https://github.com/symfony/polyfill-util.git", | 8869 | "url": "https://github.com/symfony/polyfill-util.git", |
8865 | "reference": "4317de1386717b4c22caed7725350a8887ab205c" | 8870 | "reference": "964a67f293b66b95883a5ed918a65354fcd2258f" |
8866 | }, | 8871 | }, |
8867 | "dist": { | 8872 | "dist": { |
8868 | "type": "zip", | 8873 | "type": "zip", |
8869 | "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c", | 8874 | "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/964a67f293b66b95883a5ed918a65354fcd2258f", |
8870 | "reference": "4317de1386717b4c22caed7725350a8887ab205c", | 8875 | "reference": "964a67f293b66b95883a5ed918a65354fcd2258f", |
8871 | "shasum": "" | 8876 | "shasum": "" |
8872 | }, | 8877 | }, |
8873 | "require": { | 8878 | "require": { |
@@ -8876,7 +8881,7 @@ | |||
8876 | "type": "library", | 8881 | "type": "library", |
8877 | "extra": { | 8882 | "extra": { |
8878 | "branch-alias": { | 8883 | "branch-alias": { |
8879 | "dev-master": "1.12-dev" | 8884 | "dev-master": "1.13-dev" |
8880 | } | 8885 | } |
8881 | }, | 8886 | }, |
8882 | "autoload": { | 8887 | "autoload": { |
@@ -8906,7 +8911,7 @@ | |||
8906 | "polyfill", | 8911 | "polyfill", |
8907 | "shim" | 8912 | "shim" |
8908 | ], | 8913 | ], |
8909 | "time": "2019-08-06T08:03:45+00:00" | 8914 | "time": "2019-11-27T13:56:44+00:00" |
8910 | }, | 8915 | }, |
8911 | { | 8916 | { |
8912 | "name": "symfony/swiftmailer-bundle", | 8917 | "name": "symfony/swiftmailer-bundle", |
@@ -8975,16 +8980,16 @@ | |||
8975 | }, | 8980 | }, |
8976 | { | 8981 | { |
8977 | "name": "symfony/symfony", | 8982 | "name": "symfony/symfony", |
8978 | "version": "v3.4.35", | 8983 | "version": "v3.4.36", |
8979 | "source": { | 8984 | "source": { |
8980 | "type": "git", | 8985 | "type": "git", |
8981 | "url": "https://github.com/symfony/symfony.git", | 8986 | "url": "https://github.com/symfony/symfony.git", |
8982 | "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6" | 8987 | "reference": "0a6fccb5772ad2467253e6849d589bd09d9eb195" |
8983 | }, | 8988 | }, |
8984 | "dist": { | 8989 | "dist": { |
8985 | "type": "zip", | 8990 | "type": "zip", |
8986 | "url": "https://api.github.com/repos/symfony/symfony/zipball/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6", | 8991 | "url": "https://api.github.com/repos/symfony/symfony/zipball/0a6fccb5772ad2467253e6849d589bd09d9eb195", |
8987 | "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6", | 8992 | "reference": "0a6fccb5772ad2467253e6849d589bd09d9eb195", |
8988 | "shasum": "" | 8993 | "shasum": "" |
8989 | }, | 8994 | }, |
8990 | "require": { | 8995 | "require": { |
@@ -9006,6 +9011,7 @@ | |||
9006 | "twig/twig": "^1.41|^2.10" | 9011 | "twig/twig": "^1.41|^2.10" |
9007 | }, | 9012 | }, |
9008 | "conflict": { | 9013 | "conflict": { |
9014 | "monolog/monolog": ">=2", | ||
9009 | "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", | 9015 | "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", |
9010 | "phpdocumentor/type-resolver": "<0.3.0", | 9016 | "phpdocumentor/type-resolver": "<0.3.0", |
9011 | "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" | 9017 | "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" |
@@ -9126,7 +9132,7 @@ | |||
9126 | "keywords": [ | 9132 | "keywords": [ |
9127 | "framework" | 9133 | "framework" |
9128 | ], | 9134 | ], |
9129 | "time": "2019-11-13T08:45:05+00:00" | 9135 | "time": "2019-12-01T13:50:53+00:00" |
9130 | }, | 9136 | }, |
9131 | { | 9137 | { |
9132 | "name": "true/punycode", | 9138 | "name": "true/punycode", |
@@ -9414,16 +9420,16 @@ | |||
9414 | }, | 9420 | }, |
9415 | { | 9421 | { |
9416 | "name": "white-october/pagerfanta-bundle", | 9422 | "name": "white-october/pagerfanta-bundle", |
9417 | "version": "v1.3.1", | 9423 | "version": "v1.3.2", |
9418 | "source": { | 9424 | "source": { |
9419 | "type": "git", | 9425 | "type": "git", |
9420 | "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git", | 9426 | "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git", |
9421 | "reference": "5421d5e79b72495b34b745d37e4d341e6fa2190d" | 9427 | "reference": "6df560869b5e09a3acf920890ab40598998b30ae" |
9422 | }, | 9428 | }, |
9423 | "dist": { | 9429 | "dist": { |
9424 | "type": "zip", | 9430 | "type": "zip", |
9425 | "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/5421d5e79b72495b34b745d37e4d341e6fa2190d", | 9431 | "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/6df560869b5e09a3acf920890ab40598998b30ae", |
9426 | "reference": "5421d5e79b72495b34b745d37e4d341e6fa2190d", | 9432 | "reference": "6df560869b5e09a3acf920890ab40598998b30ae", |
9427 | "shasum": "" | 9433 | "shasum": "" |
9428 | }, | 9434 | }, |
9429 | "require": { | 9435 | "require": { |
@@ -9471,7 +9477,7 @@ | |||
9471 | "page", | 9477 | "page", |
9472 | "paging" | 9478 | "paging" |
9473 | ], | 9479 | ], |
9474 | "time": "2019-11-21T17:13:04+00:00" | 9480 | "time": "2019-12-02T14:19:37+00:00" |
9475 | }, | 9481 | }, |
9476 | { | 9482 | { |
9477 | "name": "willdurand/hateoas", | 9483 | "name": "willdurand/hateoas", |
@@ -11345,16 +11351,16 @@ | |||
11345 | }, | 11351 | }, |
11346 | { | 11352 | { |
11347 | "name": "symfony/phpunit-bridge", | 11353 | "name": "symfony/phpunit-bridge", |
11348 | "version": "v4.3.8", | 11354 | "version": "v4.3.9", |
11349 | "source": { | 11355 | "source": { |
11350 | "type": "git", | 11356 | "type": "git", |
11351 | "url": "https://github.com/symfony/phpunit-bridge.git", | 11357 | "url": "https://github.com/symfony/phpunit-bridge.git", |
11352 | "reference": "c216b32261358a820bb4217eb3a20e3f437a484e" | 11358 | "reference": "e1ce1695430a3c8ee876ff1d91ce64871786581f" |
11353 | }, | 11359 | }, |
11354 | "dist": { | 11360 | "dist": { |
11355 | "type": "zip", | 11361 | "type": "zip", |
11356 | "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c216b32261358a820bb4217eb3a20e3f437a484e", | 11362 | "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e1ce1695430a3c8ee876ff1d91ce64871786581f", |
11357 | "reference": "c216b32261358a820bb4217eb3a20e3f437a484e", | 11363 | "reference": "e1ce1695430a3c8ee876ff1d91ce64871786581f", |
11358 | "shasum": "" | 11364 | "shasum": "" |
11359 | }, | 11365 | }, |
11360 | "require": { | 11366 | "require": { |
@@ -11406,7 +11412,7 @@ | |||
11406 | ], | 11412 | ], |
11407 | "description": "Symfony PHPUnit Bridge", | 11413 | "description": "Symfony PHPUnit Bridge", |
11408 | "homepage": "https://symfony.com", | 11414 | "homepage": "https://symfony.com", |
11409 | "time": "2019-10-30T12:58:49+00:00" | 11415 | "time": "2019-11-28T10:34:19+00:00" |
11410 | } | 11416 | } |
11411 | ], | 11417 | ], |
11412 | "aliases": [], | 11418 | "aliases": [], |
diff --git a/src/Wallabag/ImportBundle/Controller/ImportController.php b/src/Wallabag/ImportBundle/Controller/ImportController.php index fbd7434e..5a7e53d6 100644 --- a/src/Wallabag/ImportBundle/Controller/ImportController.php +++ b/src/Wallabag/ImportBundle/Controller/ImportController.php | |||
@@ -43,6 +43,7 @@ class ImportController extends Controller | |||
43 | + $this->getTotalMessageInRabbitQueue('chrome') | 43 | + $this->getTotalMessageInRabbitQueue('chrome') |
44 | + $this->getTotalMessageInRabbitQueue('instapaper') | 44 | + $this->getTotalMessageInRabbitQueue('instapaper') |
45 | + $this->getTotalMessageInRabbitQueue('pinboard') | 45 | + $this->getTotalMessageInRabbitQueue('pinboard') |
46 | + $this->getTotalMessageInRabbitQueue('elcurator') | ||
46 | ; | 47 | ; |
47 | } catch (\Exception $e) { | 48 | } catch (\Exception $e) { |
48 | $rabbitNotInstalled = true; | 49 | $rabbitNotInstalled = true; |
@@ -59,6 +60,7 @@ class ImportController extends Controller | |||
59 | + $redis->llen('wallabag.import.chrome') | 60 | + $redis->llen('wallabag.import.chrome') |
60 | + $redis->llen('wallabag.import.instapaper') | 61 | + $redis->llen('wallabag.import.instapaper') |
61 | + $redis->llen('wallabag.import.pinboard') | 62 | + $redis->llen('wallabag.import.pinboard') |
63 | + $redis->llen('wallabag.import.elcurator') | ||
62 | ; | 64 | ; |
63 | } catch (\Exception $e) { | 65 | } catch (\Exception $e) { |
64 | $redisNotInstalled = true; | 66 | $redisNotInstalled = true; |