aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-11-02 07:52:28 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-11-02 07:52:28 +0100
commit3d9ccf9390f35e73428ebf42258253c6808f1590 (patch)
treecf47285f0c7f8398d62f63b8bfa461bb0b9f3f50
parente686b5e6fe37b476d70eeadce34616d65572245b (diff)
parent386cd24663f9b6384372ef4f78a7f3100f06057d (diff)
downloadwallabag-3d9ccf9390f35e73428ebf42258253c6808f1590.tar.gz
wallabag-3d9ccf9390f35e73428ebf42258253c6808f1590.tar.zst
wallabag-3d9ccf9390f35e73428ebf42258253c6808f1590.zip
Merge pull request #1505 from wallabag/v2-graby-log
Add graby log
-rw-r--r--app/SymfonyRequirements.php10
-rw-r--r--composer.lock172
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml4
3 files changed, 101 insertions, 85 deletions
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
index abaf0c17..28b0dcdb 100644
--- a/app/SymfonyRequirements.php
+++ b/app/SymfonyRequirements.php
@@ -447,6 +447,12 @@ class SymfonyRequirements extends RequirementCollection
447 } 447 }
448 448
449 $this->addRequirement( 449 $this->addRequirement(
450 function_exists('iconv'),
451 'iconv() must be available',
452 'Install and enable the <strong>iconv</strong> extension.'
453 );
454
455 $this->addRequirement(
450 function_exists('json_encode'), 456 function_exists('json_encode'),
451 'json_encode() must be available', 457 'json_encode() must be available',
452 'Install and enable the <strong>JSON</strong> extension.' 458 'Install and enable the <strong>JSON</strong> extension.'
@@ -546,10 +552,10 @@ class SymfonyRequirements extends RequirementCollection
546 require_once __DIR__.'/../vendor/autoload.php'; 552 require_once __DIR__.'/../vendor/autoload.php';
547 553
548 try { 554 try {
549 $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); 555 $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle');
550 556
551 $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); 557 $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php');
552 } catch (\ReflectionException $e) { 558 } catch (ReflectionException $e) {
553 $contents = ''; 559 $contents = '';
554 } 560 }
555 $this->addRecommendation( 561 $this->addRecommendation(
diff --git a/composer.lock b/composer.lock
index 13e94821..368f9f95 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5,6 +5,7 @@
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "7fb67fafde0e24c1802714a2a47da5e1", 7 "hash": "7fb67fafde0e24c1802714a2a47da5e1",
8 "content-hash": "372936ba75537d8422a8e63bd419c213",
8 "packages": [ 9 "packages": [
9 { 10 {
10 "name": "doctrine/annotations", 11 "name": "doctrine/annotations",
@@ -76,16 +77,16 @@
76 }, 77 },
77 { 78 {
78 "name": "doctrine/cache", 79 "name": "doctrine/cache",
79 "version": "v1.4.2", 80 "version": "v1.5.0",
80 "source": { 81 "source": {
81 "type": "git", 82 "type": "git",
82 "url": "https://github.com/doctrine/cache.git", 83 "url": "https://github.com/doctrine/cache.git",
83 "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" 84 "reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f"
84 }, 85 },
85 "dist": { 86 "dist": {
86 "type": "zip", 87 "type": "zip",
87 "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", 88 "url": "https://api.github.com/repos/doctrine/cache/zipball/eb8a73619af4f1c8711e2ce482f5de3643258a1f",
88 "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", 89 "reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f",
89 "shasum": "" 90 "shasum": ""
90 }, 91 },
91 "require": { 92 "require": {
@@ -106,8 +107,8 @@
106 } 107 }
107 }, 108 },
108 "autoload": { 109 "autoload": {
109 "psr-0": { 110 "psr-4": {
110 "Doctrine\\Common\\Cache\\": "lib/" 111 "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
111 } 112 }
112 }, 113 },
113 "notification-url": "https://packagist.org/downloads/", 114 "notification-url": "https://packagist.org/downloads/",
@@ -142,7 +143,7 @@
142 "cache", 143 "cache",
143 "caching" 144 "caching"
144 ], 145 ],
145 "time": "2015-08-31 12:36:41" 146 "time": "2015-10-28 11:27:45"
146 }, 147 },
147 { 148 {
148 "name": "doctrine/collections", 149 "name": "doctrine/collections",
@@ -937,17 +938,17 @@
937 }, 938 },
938 { 939 {
939 "name": "friendsofsymfony/rest-bundle", 940 "name": "friendsofsymfony/rest-bundle",
940 "version": "1.7.1", 941 "version": "1.7.2",
941 "target-dir": "FOS/RestBundle", 942 "target-dir": "FOS/RestBundle",
942 "source": { 943 "source": {
943 "type": "git", 944 "type": "git",
944 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", 945 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
945 "reference": "3fb2d30c58cde59213dbddd031bc36171b8b68b6" 946 "reference": "70db6f7af4bb198881bfc9106aea633fa3e818c0"
946 }, 947 },
947 "dist": { 948 "dist": {
948 "type": "zip", 949 "type": "zip",
949 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/3fb2d30c58cde59213dbddd031bc36171b8b68b6", 950 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/70db6f7af4bb198881bfc9106aea633fa3e818c0",
950 "reference": "3fb2d30c58cde59213dbddd031bc36171b8b68b6", 951 "reference": "70db6f7af4bb198881bfc9106aea633fa3e818c0",
951 "shasum": "" 952 "shasum": ""
952 }, 953 },
953 "require": { 954 "require": {
@@ -965,10 +966,11 @@
965 "symfony/validator": ">=2.5.0,<2.5.5" 966 "symfony/validator": ">=2.5.0,<2.5.5"
966 }, 967 },
967 "require-dev": { 968 "require-dev": {
968 "jms/serializer": "~0.13", 969 "jms/serializer": "~0.13|~1.0",
969 "jms/serializer-bundle": "~0.12", 970 "jms/serializer-bundle": "~0.12|~1.0",
970 "phpoption/phpoption": "~1.1.0", 971 "phpoption/phpoption": "~1.1.0",
971 "sensio/framework-extra-bundle": "~3.0", 972 "sensio/framework-extra-bundle": "~3.0",
973 "sllh/php-cs-fixer-styleci-bridge": "^1.3",
972 "symfony/browser-kit": "~2.3", 974 "symfony/browser-kit": "~2.3",
973 "symfony/dependency-injection": "~2.3", 975 "symfony/dependency-injection": "~2.3",
974 "symfony/form": "~2.3", 976 "symfony/form": "~2.3",
@@ -978,7 +980,7 @@
978 "symfony/yaml": "~2.3" 980 "symfony/yaml": "~2.3"
979 }, 981 },
980 "suggest": { 982 "suggest": {
981 "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12", 983 "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0",
982 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ~3.0", 984 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ~3.0",
983 "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.3", 985 "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.3",
984 "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.3" 986 "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.3"
@@ -1017,7 +1019,7 @@
1017 "keywords": [ 1019 "keywords": [
1018 "rest" 1020 "rest"
1019 ], 1021 ],
1020 "time": "2015-06-16 08:39:26" 1022 "time": "2015-10-16 07:05:52"
1021 }, 1023 },
1022 { 1024 {
1023 "name": "friendsofsymfony/user-bundle", 1025 "name": "friendsofsymfony/user-bundle",
@@ -1344,16 +1346,16 @@
1344 }, 1346 },
1345 { 1347 {
1346 "name": "j0k3r/graby", 1348 "name": "j0k3r/graby",
1347 "version": "1.0.1", 1349 "version": "1.0.4",
1348 "source": { 1350 "source": {
1349 "type": "git", 1351 "type": "git",
1350 "url": "https://github.com/j0k3r/graby.git", 1352 "url": "https://github.com/j0k3r/graby.git",
1351 "reference": "f1d655bb680eded0dde8cf26fae1e931f69b6b12" 1353 "reference": "488cee65ac6ea5dd6bb9734b982159e591de6f0e"
1352 }, 1354 },
1353 "dist": { 1355 "dist": {
1354 "type": "zip", 1356 "type": "zip",
1355 "url": "https://api.github.com/repos/j0k3r/graby/zipball/f1d655bb680eded0dde8cf26fae1e931f69b6b12", 1357 "url": "https://api.github.com/repos/j0k3r/graby/zipball/488cee65ac6ea5dd6bb9734b982159e591de6f0e",
1356 "reference": "f1d655bb680eded0dde8cf26fae1e931f69b6b12", 1358 "reference": "488cee65ac6ea5dd6bb9734b982159e591de6f0e",
1357 "shasum": "" 1359 "shasum": ""
1358 }, 1360 },
1359 "require": { 1361 "require": {
@@ -1392,20 +1394,20 @@
1392 } 1394 }
1393 ], 1395 ],
1394 "description": "Graby helps you extract article content from web pages", 1396 "description": "Graby helps you extract article content from web pages",
1395 "time": "2015-10-01 18:39:53" 1397 "time": "2015-10-28 06:38:06"
1396 }, 1398 },
1397 { 1399 {
1398 "name": "j0k3r/graby-site-config", 1400 "name": "j0k3r/graby-site-config",
1399 "version": "1.0.4", 1401 "version": "1.0.6",
1400 "source": { 1402 "source": {
1401 "type": "git", 1403 "type": "git",
1402 "url": "https://github.com/j0k3r/graby-site-config.git", 1404 "url": "https://github.com/j0k3r/graby-site-config.git",
1403 "reference": "cf088ca2100eeec3f230cc187a5b489e61fe97f1" 1405 "reference": "6631451c1be563ff3bc8fa16c60ef7df38f8e65b"
1404 }, 1406 },
1405 "dist": { 1407 "dist": {
1406 "type": "zip", 1408 "type": "zip",
1407 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/cf088ca2100eeec3f230cc187a5b489e61fe97f1", 1409 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/6631451c1be563ff3bc8fa16c60ef7df38f8e65b",
1408 "reference": "cf088ca2100eeec3f230cc187a5b489e61fe97f1", 1410 "reference": "6631451c1be563ff3bc8fa16c60ef7df38f8e65b",
1409 "shasum": "" 1411 "shasum": ""
1410 }, 1412 },
1411 "require": { 1413 "require": {
@@ -1428,7 +1430,7 @@
1428 } 1430 }
1429 ], 1431 ],
1430 "description": "Graby site config files", 1432 "description": "Graby site config files",
1431 "time": "2015-10-06 07:07:37" 1433 "time": "2015-10-24 14:44:25"
1432 }, 1434 },
1433 { 1435 {
1434 "name": "j0k3r/php-readability", 1436 "name": "j0k3r/php-readability",
@@ -1820,16 +1822,16 @@
1820 }, 1822 },
1821 { 1823 {
1822 "name": "kriswallsmith/assetic", 1824 "name": "kriswallsmith/assetic",
1823 "version": "v1.3.0", 1825 "version": "v1.3.1",
1824 "source": { 1826 "source": {
1825 "type": "git", 1827 "type": "git",
1826 "url": "https://github.com/kriswallsmith/assetic.git", 1828 "url": "https://github.com/kriswallsmith/assetic.git",
1827 "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" 1829 "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5"
1828 }, 1830 },
1829 "dist": { 1831 "dist": {
1830 "type": "zip", 1832 "type": "zip",
1831 "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", 1833 "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5",
1832 "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", 1834 "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5",
1833 "shasum": "" 1835 "shasum": ""
1834 }, 1836 },
1835 "require": { 1837 "require": {
@@ -1865,7 +1867,7 @@
1865 "type": "library", 1867 "type": "library",
1866 "extra": { 1868 "extra": {
1867 "branch-alias": { 1869 "branch-alias": {
1868 "dev-master": "1.3-dev" 1870 "dev-master": "1.4-dev"
1869 } 1871 }
1870 }, 1872 },
1871 "autoload": { 1873 "autoload": {
@@ -1894,20 +1896,20 @@
1894 "compression", 1896 "compression",
1895 "minification" 1897 "minification"
1896 ], 1898 ],
1897 "time": "2015-08-31 19:07:16" 1899 "time": "2015-10-15 01:33:42"
1898 }, 1900 },
1899 { 1901 {
1900 "name": "lexik/form-filter-bundle", 1902 "name": "lexik/form-filter-bundle",
1901 "version": "v4.0.0", 1903 "version": "v4.0.2",
1902 "source": { 1904 "source": {
1903 "type": "git", 1905 "type": "git",
1904 "url": "https://github.com/lexik/LexikFormFilterBundle.git", 1906 "url": "https://github.com/lexik/LexikFormFilterBundle.git",
1905 "reference": "325432453705062ff43b02952b5ca815c5697ba6" 1907 "reference": "d6081d308b71e14509602722c78d28801e4ed78a"
1906 }, 1908 },
1907 "dist": { 1909 "dist": {
1908 "type": "zip", 1910 "type": "zip",
1909 "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/325432453705062ff43b02952b5ca815c5697ba6", 1911 "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/d6081d308b71e14509602722c78d28801e4ed78a",
1910 "reference": "325432453705062ff43b02952b5ca815c5697ba6", 1912 "reference": "d6081d308b71e14509602722c78d28801e4ed78a",
1911 "shasum": "" 1913 "shasum": ""
1912 }, 1914 },
1913 "require": { 1915 "require": {
@@ -1953,7 +1955,7 @@
1953 "filter", 1955 "filter",
1954 "form" 1956 "form"
1955 ], 1957 ],
1956 "time": "2015-07-31 13:58:10" 1958 "time": "2015-10-20 12:45:52"
1957 }, 1959 },
1958 { 1960 {
1959 "name": "liip/theme-bundle", 1961 "name": "liip/theme-bundle",
@@ -2108,16 +2110,16 @@
2108 }, 2110 },
2109 { 2111 {
2110 "name": "monolog/monolog", 2112 "name": "monolog/monolog",
2111 "version": "1.17.1", 2113 "version": "1.17.2",
2112 "source": { 2114 "source": {
2113 "type": "git", 2115 "type": "git",
2114 "url": "https://github.com/Seldaek/monolog.git", 2116 "url": "https://github.com/Seldaek/monolog.git",
2115 "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" 2117 "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24"
2116 }, 2118 },
2117 "dist": { 2119 "dist": {
2118 "type": "zip", 2120 "type": "zip",
2119 "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", 2121 "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
2120 "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", 2122 "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
2121 "shasum": "" 2123 "shasum": ""
2122 }, 2124 },
2123 "require": { 2125 "require": {
@@ -2131,10 +2133,11 @@
2131 "aws/aws-sdk-php": "^2.4.9", 2133 "aws/aws-sdk-php": "^2.4.9",
2132 "doctrine/couchdb": "~1.0@dev", 2134 "doctrine/couchdb": "~1.0@dev",
2133 "graylog2/gelf-php": "~1.0", 2135 "graylog2/gelf-php": "~1.0",
2136 "jakub-onderka/php-parallel-lint": "0.9",
2134 "php-console/php-console": "^3.1.3", 2137 "php-console/php-console": "^3.1.3",
2135 "phpunit/phpunit": "~4.5", 2138 "phpunit/phpunit": "~4.5",
2136 "phpunit/phpunit-mock-objects": "2.3.0", 2139 "phpunit/phpunit-mock-objects": "2.3.0",
2137 "raven/raven": "~0.11", 2140 "raven/raven": "^0.13",
2138 "ruflin/elastica": ">=0.90 <3.0", 2141 "ruflin/elastica": ">=0.90 <3.0",
2139 "swiftmailer/swiftmailer": "~5.3", 2142 "swiftmailer/swiftmailer": "~5.3",
2140 "videlalvaro/php-amqplib": "~2.4" 2143 "videlalvaro/php-amqplib": "~2.4"
@@ -2180,7 +2183,7 @@
2180 "logging", 2183 "logging",
2181 "psr-3" 2184 "psr-3"
2182 ], 2185 ],
2183 "time": "2015-08-31 09:17:37" 2186 "time": "2015-10-14 12:51:02"
2184 }, 2187 },
2185 { 2188 {
2186 "name": "neitanod/forceutf8", 2189 "name": "neitanod/forceutf8",
@@ -2218,40 +2221,44 @@
2218 }, 2221 },
2219 { 2222 {
2220 "name": "nelmio/api-doc-bundle", 2223 "name": "nelmio/api-doc-bundle",
2221 "version": "2.9.0", 2224 "version": "2.10.3",
2222 "target-dir": "Nelmio/ApiDocBundle", 2225 "target-dir": "Nelmio/ApiDocBundle",
2223 "source": { 2226 "source": {
2224 "type": "git", 2227 "type": "git",
2225 "url": "https://github.com/nelmio/NelmioApiDocBundle.git", 2228 "url": "https://github.com/nelmio/NelmioApiDocBundle.git",
2226 "reference": "de31760fd84a45fadbb4fe24db050b5e29ea70d1" 2229 "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e"
2227 }, 2230 },
2228 "dist": { 2231 "dist": {
2229 "type": "zip", 2232 "type": "zip",
2230 "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/de31760fd84a45fadbb4fe24db050b5e29ea70d1", 2233 "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/be90e8aad60b7701097b900c4a3a971a50f9862e",
2231 "reference": "de31760fd84a45fadbb4fe24db050b5e29ea70d1", 2234 "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e",
2232 "shasum": "" 2235 "shasum": ""
2233 }, 2236 },
2234 "require": { 2237 "require": {
2235 "michelf/php-markdown": "~1.4", 2238 "michelf/php-markdown": "~1.4",
2236 "symfony/console": "~2.1", 2239 "php": ">=5.3",
2237 "symfony/framework-bundle": "~2.1", 2240 "symfony/console": "~2.3",
2238 "symfony/twig-bundle": "~2.1" 2241 "symfony/framework-bundle": "~2.3",
2242 "symfony/twig-bundle": "~2.3"
2239 }, 2243 },
2240 "conflict": { 2244 "conflict": {
2241 "jms/serializer": "<0.12", 2245 "jms/serializer": "<0.12",
2242 "jms/serializer-bundle": "<0.11" 2246 "jms/serializer-bundle": "<0.11",
2247 "twig/twig": "<1.12"
2243 }, 2248 },
2244 "require-dev": { 2249 "require-dev": {
2245 "dunglas/api-bundle": "dev-master", 2250 "dunglas/api-bundle": "~1.0",
2246 "friendsofsymfony/rest-bundle": "~1.0", 2251 "friendsofsymfony/rest-bundle": "~1.0",
2247 "jms/serializer-bundle": ">=0.11", 2252 "jms/serializer-bundle": ">=0.11",
2248 "sensio/framework-extra-bundle": "~3.0", 2253 "sensio/framework-extra-bundle": "~3.0",
2249 "symfony/browser-kit": "~2.1", 2254 "symfony/browser-kit": "~2.3",
2250 "symfony/css-selector": "~2.1", 2255 "symfony/css-selector": "~2.3",
2251 "symfony/form": "~2.1", 2256 "symfony/finder": "~2.3",
2252 "symfony/serializer": "~2.7@dev", 2257 "symfony/form": "~2.3",
2253 "symfony/validator": "~2.1", 2258 "symfony/phpunit-bridge": "~2.7",
2254 "symfony/yaml": "~2.1" 2259 "symfony/serializer": "~2.7",
2260 "symfony/validator": "~2.3",
2261 "symfony/yaml": "~2.3"
2255 }, 2262 },
2256 "suggest": { 2263 "suggest": {
2257 "dunglas/api-bundle": "For making use of resources definitions of DunglasApiBundle.", 2264 "dunglas/api-bundle": "For making use of resources definitions of DunglasApiBundle.",
@@ -2263,7 +2270,7 @@
2263 "type": "symfony-bundle", 2270 "type": "symfony-bundle",
2264 "extra": { 2271 "extra": {
2265 "branch-alias": { 2272 "branch-alias": {
2266 "dev-master": "2.9.x-dev" 2273 "dev-master": "2.10.x-dev"
2267 } 2274 }
2268 }, 2275 },
2269 "autoload": { 2276 "autoload": {
@@ -2292,7 +2299,7 @@
2292 "documentation", 2299 "documentation",
2293 "rest" 2300 "rest"
2294 ], 2301 ],
2295 "time": "2015-05-16 17:16:14" 2302 "time": "2015-10-28 09:30:40"
2296 }, 2303 },
2297 { 2304 {
2298 "name": "nelmio/cors-bundle", 2305 "name": "nelmio/cors-bundle",
@@ -2649,17 +2656,17 @@
2649 }, 2656 },
2650 { 2657 {
2651 "name": "sensio/distribution-bundle", 2658 "name": "sensio/distribution-bundle",
2652 "version": "v3.0.31", 2659 "version": "v3.0.33",
2653 "target-dir": "Sensio/Bundle/DistributionBundle", 2660 "target-dir": "Sensio/Bundle/DistributionBundle",
2654 "source": { 2661 "source": {
2655 "type": "git", 2662 "type": "git",
2656 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", 2663 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
2657 "reference": "3a900814bd57bf20f9453ae81ff8772bc95d7fff" 2664 "reference": "63245e12c948bf50278383e70fd5d6841af17e17"
2658 }, 2665 },
2659 "dist": { 2666 "dist": {
2660 "type": "zip", 2667 "type": "zip",
2661 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/3a900814bd57bf20f9453ae81ff8772bc95d7fff", 2668 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/63245e12c948bf50278383e70fd5d6841af17e17",
2662 "reference": "3a900814bd57bf20f9453ae81ff8772bc95d7fff", 2669 "reference": "63245e12c948bf50278383e70fd5d6841af17e17",
2663 "shasum": "" 2670 "shasum": ""
2664 }, 2671 },
2665 "require": { 2672 "require": {
@@ -2705,7 +2712,7 @@
2705 "configuration", 2712 "configuration",
2706 "distribution" 2713 "distribution"
2707 ], 2714 ],
2708 "time": "2015-08-03 10:07:12" 2715 "time": "2015-10-27 18:46:42"
2709 }, 2716 },
2710 { 2717 {
2711 "name": "sensio/framework-extra-bundle", 2718 "name": "sensio/framework-extra-bundle",
@@ -3194,16 +3201,16 @@
3194 }, 3201 },
3195 { 3202 {
3196 "name": "symfony/symfony", 3203 "name": "symfony/symfony",
3197 "version": "v2.7.5", 3204 "version": "v2.7.6",
3198 "source": { 3205 "source": {
3199 "type": "git", 3206 "type": "git",
3200 "url": "https://github.com/symfony/symfony.git", 3207 "url": "https://github.com/symfony/symfony.git",
3201 "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" 3208 "reference": "66b2e9662c44d478b69e48278aa54079a006eb42"
3202 }, 3209 },
3203 "dist": { 3210 "dist": {
3204 "type": "zip", 3211 "type": "zip",
3205 "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", 3212 "url": "https://api.github.com/repos/symfony/symfony/zipball/66b2e9662c44d478b69e48278aa54079a006eb42",
3206 "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", 3213 "reference": "66b2e9662c44d478b69e48278aa54079a006eb42",
3207 "shasum": "" 3214 "shasum": ""
3208 }, 3215 },
3209 "require": { 3216 "require": {
@@ -3266,8 +3273,7 @@
3266 "egulias/email-validator": "~1.2", 3273 "egulias/email-validator": "~1.2",
3267 "ircmaxell/password-compat": "~1.0", 3274 "ircmaxell/password-compat": "~1.0",
3268 "monolog/monolog": "~1.11", 3275 "monolog/monolog": "~1.11",
3269 "ocramius/proxy-manager": "~0.4|~1.0", 3276 "ocramius/proxy-manager": "~0.4|~1.0"
3270 "symfony/phpunit-bridge": "self.version"
3271 }, 3277 },
3272 "type": "library", 3278 "type": "library",
3273 "extra": { 3279 "extra": {
@@ -3312,7 +3318,7 @@
3312 "keywords": [ 3318 "keywords": [
3313 "framework" 3319 "framework"
3314 ], 3320 ],
3315 "time": "2015-09-25 11:16:52" 3321 "time": "2015-10-27 19:07:24"
3316 }, 3322 },
3317 { 3323 {
3318 "name": "tecnickcom/tcpdf", 3324 "name": "tecnickcom/tcpdf",
@@ -3431,16 +3437,16 @@
3431 }, 3437 },
3432 { 3438 {
3433 "name": "twig/twig", 3439 "name": "twig/twig",
3434 "version": "v1.22.3", 3440 "version": "v1.23.0",
3435 "source": { 3441 "source": {
3436 "type": "git", 3442 "type": "git",
3437 "url": "https://github.com/twigphp/Twig.git", 3443 "url": "https://github.com/twigphp/Twig.git",
3438 "reference": "ebfc36b7e77b0c1175afe30459cf943010245540" 3444 "reference": "5868cd822fd6cf626d5f805439575f9c323cee2a"
3439 }, 3445 },
3440 "dist": { 3446 "dist": {
3441 "type": "zip", 3447 "type": "zip",
3442 "url": "https://api.github.com/repos/twigphp/Twig/zipball/ebfc36b7e77b0c1175afe30459cf943010245540", 3448 "url": "https://api.github.com/repos/twigphp/Twig/zipball/5868cd822fd6cf626d5f805439575f9c323cee2a",
3443 "reference": "ebfc36b7e77b0c1175afe30459cf943010245540", 3449 "reference": "5868cd822fd6cf626d5f805439575f9c323cee2a",
3444 "shasum": "" 3450 "shasum": ""
3445 }, 3451 },
3446 "require": { 3452 "require": {
@@ -3453,7 +3459,7 @@
3453 "type": "library", 3459 "type": "library",
3454 "extra": { 3460 "extra": {
3455 "branch-alias": { 3461 "branch-alias": {
3456 "dev-master": "1.22-dev" 3462 "dev-master": "1.23-dev"
3457 } 3463 }
3458 }, 3464 },
3459 "autoload": { 3465 "autoload": {
@@ -3488,7 +3494,7 @@
3488 "keywords": [ 3494 "keywords": [
3489 "templating" 3495 "templating"
3490 ], 3496 ],
3491 "time": "2015-10-13 07:07:02" 3497 "time": "2015-10-29 23:29:01"
3492 }, 3498 },
3493 { 3499 {
3494 "name": "willdurand/hateoas", 3500 "name": "willdurand/hateoas",
@@ -3596,7 +3602,7 @@
3596 ], 3602 ],
3597 "authors": [ 3603 "authors": [
3598 { 3604 {
3599 "name": "William DURAND", 3605 "name": "William Durand",
3600 "email": "william.durand1@gmail.com" 3606 "email": "william.durand1@gmail.com"
3601 } 3607 }
3602 ], 3608 ],
@@ -4163,16 +4169,16 @@
4163 }, 4169 },
4164 { 4170 {
4165 "name": "phpunit/phpunit", 4171 "name": "phpunit/phpunit",
4166 "version": "4.8.12", 4172 "version": "4.8.16",
4167 "source": { 4173 "source": {
4168 "type": "git", 4174 "type": "git",
4169 "url": "https://github.com/sebastianbergmann/phpunit.git", 4175 "url": "https://github.com/sebastianbergmann/phpunit.git",
4170 "reference": "00194eb95989190a73198390ceca081ad3441a7f" 4176 "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e"
4171 }, 4177 },
4172 "dist": { 4178 "dist": {
4173 "type": "zip", 4179 "type": "zip",
4174 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00194eb95989190a73198390ceca081ad3441a7f", 4180 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/625f8c345606ed0f3a141dfb88f4116f0e22978e",
4175 "reference": "00194eb95989190a73198390ceca081ad3441a7f", 4181 "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e",
4176 "shasum": "" 4182 "shasum": ""
4177 }, 4183 },
4178 "require": { 4184 "require": {
@@ -4231,7 +4237,7 @@
4231 "testing", 4237 "testing",
4232 "xunit" 4238 "xunit"
4233 ], 4239 ],
4234 "time": "2015-10-12 03:36:47" 4240 "time": "2015-10-23 06:48:33"
4235 }, 4241 },
4236 { 4242 {
4237 "name": "phpunit/phpunit-mock-objects", 4243 "name": "phpunit/phpunit-mock-objects",
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index e29fcd1f..3c479ff6 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -42,6 +42,10 @@ services:
42 class: Graby\Graby 42 class: Graby\Graby
43 arguments: 43 arguments:
44 - { error_message: false } 44 - { error_message: false }
45 calls:
46 - [ setLogger, [ @logger ] ]
47 tags:
48 - { name: monolog.logger, channel: graby }
45 49
46 wallabag_core.content_proxy: 50 wallabag_core.content_proxy:
47 class: Wallabag\CoreBundle\Helper\ContentProxy 51 class: Wallabag\CoreBundle\Helper\ContentProxy