aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.lock516
-rw-r--r--src/Wallabag/ApiBundle/Controller/WallabagRestController.php1
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php1
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php5
4 files changed, 409 insertions, 114 deletions
diff --git a/composer.lock b/composer.lock
index 559a08dc..fd1dd398 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
1{ 1{
2 "_readme": [ 2 "_readme": [
3 "This file locks the dependencies of your project to a known state", 3 "This file locks the dependencies of your project to a known state",
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "52545aca8a752dfc2969d6cb9f0cb8d3", 7 "hash": "5799a00ed8336543f0bfe7320df73ca2",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "doctrine/annotations", 10 "name": "doctrine/annotations",
@@ -897,6 +897,165 @@
897 "time": "2015-06-16 08:39:26" 897 "time": "2015-06-16 08:39:26"
898 }, 898 },
899 { 899 {
900 "name": "guzzlehttp/guzzle",
901 "version": "5.3.0",
902 "source": {
903 "type": "git",
904 "url": "https://github.com/guzzle/guzzle.git",
905 "reference": "f3c8c22471cb55475105c14769644a49c3262b93"
906 },
907 "dist": {
908 "type": "zip",
909 "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f3c8c22471cb55475105c14769644a49c3262b93",
910 "reference": "f3c8c22471cb55475105c14769644a49c3262b93",
911 "shasum": ""
912 },
913 "require": {
914 "guzzlehttp/ringphp": "^1.1",
915 "php": ">=5.4.0"
916 },
917 "require-dev": {
918 "ext-curl": "*",
919 "phpunit/phpunit": "^4.0",
920 "psr/log": "^1.0"
921 },
922 "type": "library",
923 "extra": {
924 "branch-alias": {
925 "dev-master": "5.0-dev"
926 }
927 },
928 "autoload": {
929 "psr-4": {
930 "GuzzleHttp\\": "src/"
931 }
932 },
933 "notification-url": "https://packagist.org/downloads/",
934 "license": [
935 "MIT"
936 ],
937 "authors": [
938 {
939 "name": "Michael Dowling",
940 "email": "mtdowling@gmail.com",
941 "homepage": "https://github.com/mtdowling"
942 }
943 ],
944 "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
945 "homepage": "http://guzzlephp.org/",
946 "keywords": [
947 "client",
948 "curl",
949 "framework",
950 "http",
951 "http client",
952 "rest",
953 "web service"
954 ],
955 "time": "2015-05-20 03:47:55"
956 },
957 {
958 "name": "guzzlehttp/ringphp",
959 "version": "1.1.0",
960 "source": {
961 "type": "git",
962 "url": "https://github.com/guzzle/RingPHP.git",
963 "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
964 },
965 "dist": {
966 "type": "zip",
967 "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
968 "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
969 "shasum": ""
970 },
971 "require": {
972 "guzzlehttp/streams": "~3.0",
973 "php": ">=5.4.0",
974 "react/promise": "~2.0"
975 },
976 "require-dev": {
977 "ext-curl": "*",
978 "phpunit/phpunit": "~4.0"
979 },
980 "suggest": {
981 "ext-curl": "Guzzle will use specific adapters if cURL is present"
982 },
983 "type": "library",
984 "extra": {
985 "branch-alias": {
986 "dev-master": "1.1-dev"
987 }
988 },
989 "autoload": {
990 "psr-4": {
991 "GuzzleHttp\\Ring\\": "src/"
992 }
993 },
994 "notification-url": "https://packagist.org/downloads/",
995 "license": [
996 "MIT"
997 ],
998 "authors": [
999 {
1000 "name": "Michael Dowling",
1001 "email": "mtdowling@gmail.com",
1002 "homepage": "https://github.com/mtdowling"
1003 }
1004 ],
1005 "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
1006 "time": "2015-05-20 03:37:09"
1007 },
1008 {
1009 "name": "guzzlehttp/streams",
1010 "version": "3.0.0",
1011 "source": {
1012 "type": "git",
1013 "url": "https://github.com/guzzle/streams.git",
1014 "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
1015 },
1016 "dist": {
1017 "type": "zip",
1018 "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
1019 "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
1020 "shasum": ""
1021 },
1022 "require": {
1023 "php": ">=5.4.0"
1024 },
1025 "require-dev": {
1026 "phpunit/phpunit": "~4.0"
1027 },
1028 "type": "library",
1029 "extra": {
1030 "branch-alias": {
1031 "dev-master": "3.0-dev"
1032 }
1033 },
1034 "autoload": {
1035 "psr-4": {
1036 "GuzzleHttp\\Stream\\": "src/"
1037 }
1038 },
1039 "notification-url": "https://packagist.org/downloads/",
1040 "license": [
1041 "MIT"
1042 ],
1043 "authors": [
1044 {
1045 "name": "Michael Dowling",
1046 "email": "mtdowling@gmail.com",
1047 "homepage": "https://github.com/mtdowling"
1048 }
1049 ],
1050 "description": "Provides a simple abstraction over streams of data",
1051 "homepage": "http://guzzlephp.org/",
1052 "keywords": [
1053 "Guzzle",
1054 "stream"
1055 ],
1056 "time": "2014-10-12 19:18:40"
1057 },
1058 {
900 "name": "htmlawed/htmlawed", 1059 "name": "htmlawed/htmlawed",
901 "version": "1.1.19", 1060 "version": "1.1.19",
902 "source": { 1061 "source": {
@@ -994,6 +1153,148 @@
994 "time": "2015-06-03 08:27:03" 1153 "time": "2015-06-03 08:27:03"
995 }, 1154 },
996 { 1155 {
1156 "name": "j0k3r/graby",
1157 "version": "dev-master",
1158 "source": {
1159 "type": "git",
1160 "url": "https://github.com/j0k3r/graby.git",
1161 "reference": "ee648fa45efb38b6eb35fdf17606ddac1e414665"
1162 },
1163 "dist": {
1164 "type": "zip",
1165 "url": "https://api.github.com/repos/j0k3r/graby/zipball/ee648fa45efb38b6eb35fdf17606ddac1e414665",
1166 "reference": "ee648fa45efb38b6eb35fdf17606ddac1e414665",
1167 "shasum": ""
1168 },
1169 "require": {
1170 "guzzlehttp/guzzle": "^5.2.0",
1171 "htmlawed/htmlawed": "^1.1.19",
1172 "j0k3r/graby-site-config": "*",
1173 "j0k3r/php-readability": "^1.0",
1174 "monolog/monolog": "^1.13.1",
1175 "neitanod/forceutf8": "^1.4",
1176 "php": ">=5.4",
1177 "simplepie/simplepie": "^1.3.1",
1178 "symfony/finder": "^2.6.6",
1179 "symfony/options-resolver": "^2.6.6"
1180 },
1181 "type": "library",
1182 "autoload": {
1183 "psr-4": {
1184 "Graby\\": "src/"
1185 }
1186 },
1187 "notification-url": "https://packagist.org/downloads/",
1188 "license": [
1189 "AGPL-3.0"
1190 ],
1191 "authors": [
1192 {
1193 "name": "Jeremy Benoist",
1194 "email": "jeremy.benoist@gmail.com",
1195 "role": "Developer"
1196 },
1197 {
1198 "name": "FiveFilters.org",
1199 "email": "fivefilters@fivefilters.org",
1200 "role": "Developer (original version)"
1201 }
1202 ],
1203 "description": "Graby helps you extract article content from web pages",
1204 "time": "2015-08-19 23:05:12"
1205 },
1206 {
1207 "name": "j0k3r/graby-site-config",
1208 "version": "dev-master",
1209 "source": {
1210 "type": "git",
1211 "url": "https://github.com/j0k3r/graby-site-config.git",
1212 "reference": "13b5e27c8e73580e703cdaec9c8ad3a5ade3c547"
1213 },
1214 "dist": {
1215 "type": "zip",
1216 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/13b5e27c8e73580e703cdaec9c8ad3a5ade3c547",
1217 "reference": "13b5e27c8e73580e703cdaec9c8ad3a5ade3c547",
1218 "shasum": ""
1219 },
1220 "type": "library",
1221 "notification-url": "https://packagist.org/downloads/",
1222 "license": [
1223 "AGPL-3.0"
1224 ],
1225 "authors": [
1226 {
1227 "name": "Jeremy Benoist",
1228 "email": "jeremy.benoist@gmail.com"
1229 }
1230 ],
1231 "description": "Graby site config files",
1232 "time": "2015-08-07 19:10:45"
1233 },
1234 {
1235 "name": "j0k3r/php-readability",
1236 "version": "v1.0.3",
1237 "source": {
1238 "type": "git",
1239 "url": "https://github.com/j0k3r/php-readability.git",
1240 "reference": "91b80b70e2193fb852d96daf1fe17303876881dc"
1241 },
1242 "dist": {
1243 "type": "zip",
1244 "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/91b80b70e2193fb852d96daf1fe17303876881dc",
1245 "reference": "91b80b70e2193fb852d96daf1fe17303876881dc",
1246 "shasum": ""
1247 },
1248 "require": {
1249 "ext-tidy": ">=1.2",
1250 "php": ">=5.3.3"
1251 },
1252 "type": "library",
1253 "autoload": {
1254 "psr-4": {
1255 "Readability\\": "src/"
1256 }
1257 },
1258 "notification-url": "https://packagist.org/downloads/",
1259 "license": [
1260 "Apache-2.0"
1261 ],
1262 "authors": [
1263 {
1264 "name": "Keyvan Minoukadeh",
1265 "email": "keyvan@keyvan.net",
1266 "homepage": "http://keyvan.net",
1267 "role": "Developer (ported original JS code to PHP)"
1268 },
1269 {
1270 "name": "Arc90",
1271 "homepage": "http://arc90.com",
1272 "role": "Developer (original JS version)"
1273 },
1274 {
1275 "name": "Jeremy Benoist",
1276 "email": "jeremy.benoist@gmail.com",
1277 "homepage": "http://www.j0k3r.net",
1278 "role": "Developer"
1279 },
1280 {
1281 "name": "DitherSky",
1282 "homepage": "https://github.com/Dither",
1283 "role": "Developer (https://github.com/Dither/full-text-rss)"
1284 }
1285 ],
1286 "description": "Automatic article extraction from HTML",
1287 "keywords": [
1288 "article",
1289 "article extraction",
1290 "content",
1291 "content extraction",
1292 "extraction",
1293 "html"
1294 ],
1295 "time": "2015-08-19 21:12:31"
1296 },
1297 {
997 "name": "jdorn/sql-formatter", 1298 "name": "jdorn/sql-formatter",
998 "version": "v1.2.17", 1299 "version": "v1.2.17",
999 "source": { 1300 "source": {
@@ -1463,12 +1764,12 @@
1463 "version": "1.5", 1764 "version": "1.5",
1464 "source": { 1765 "source": {
1465 "type": "git", 1766 "type": "git",
1466 "url": "https://github.com/matgargano/simplehtmldom.git", 1767 "url": "https://github.com/matstars/simplehtmldom.git",
1467 "reference": "37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be" 1768 "reference": "37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be"
1468 }, 1769 },
1469 "dist": { 1770 "dist": {
1470 "type": "zip", 1771 "type": "zip",
1471 "url": "https://api.github.com/repos/matgargano/simplehtmldom/zipball/37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be", 1772 "url": "https://api.github.com/repos/matstars/simplehtmldom/zipball/37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be",
1472 "reference": "37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be", 1773 "reference": "37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be",
1473 "shasum": "" 1774 "shasum": ""
1474 }, 1775 },
@@ -1491,7 +1792,9 @@
1491 "authors": [ 1792 "authors": [
1492 { 1793 {
1493 "name": "S.C. Chen", 1794 "name": "S.C. Chen",
1494 "email": "me578022@gmail.com" 1795 "email": "me578022@gmail.com",
1796 "homepage": "http://simplehtmldom.sourceforge.net/",
1797 "role": "Lead Developer"
1495 } 1798 }
1496 ], 1799 ],
1497 "description": "Composer package that gives you access to and (unlike all the others at this time) autoloads S.C. Chen's PHP Simple HTML DOM Parser Library", 1800 "description": "Composer package that gives you access to and (unlike all the others at this time) autoloads S.C. Chen's PHP Simple HTML DOM Parser Library",
@@ -1631,6 +1934,40 @@
1631 "time": "2015-08-09 17:44:44" 1934 "time": "2015-08-09 17:44:44"
1632 }, 1935 },
1633 { 1936 {
1937 "name": "neitanod/forceutf8",
1938 "version": "v1.4",
1939 "source": {
1940 "type": "git",
1941 "url": "https://github.com/neitanod/forceutf8.git",
1942 "reference": "28d50d579179abac1f6a55b03c6d9d3f6573867c"
1943 },
1944 "dist": {
1945 "type": "zip",
1946 "url": "https://api.github.com/repos/neitanod/forceutf8/zipball/28d50d579179abac1f6a55b03c6d9d3f6573867c",
1947 "reference": "28d50d579179abac1f6a55b03c6d9d3f6573867c",
1948 "shasum": ""
1949 },
1950 "require": {
1951 "php": ">=5.2.0"
1952 },
1953 "type": "library",
1954 "autoload": {
1955 "psr-0": {
1956 "ForceUTF8\\": "src/"
1957 }
1958 },
1959 "notification-url": "https://packagist.org/downloads/",
1960 "authors": [
1961 {
1962 "name": "Sebastián Grignoli",
1963 "email": "grignoli@gmail.com"
1964 }
1965 ],
1966 "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.",
1967 "homepage": "https://github.com/neitanod/forceutf8",
1968 "time": "2014-09-24 14:59:43"
1969 },
1970 {
1634 "name": "nelmio/api-doc-bundle", 1971 "name": "nelmio/api-doc-bundle",
1635 "version": "2.9.0", 1972 "version": "2.9.0",
1636 "target-dir": "Nelmio/ApiDocBundle", 1973 "target-dir": "Nelmio/ApiDocBundle",
@@ -1968,6 +2305,50 @@
1968 "time": "2012-12-21 11:40:51" 2305 "time": "2012-12-21 11:40:51"
1969 }, 2306 },
1970 { 2307 {
2308 "name": "react/promise",
2309 "version": "v2.2.1",
2310 "source": {
2311 "type": "git",
2312 "url": "https://github.com/reactphp/promise.git",
2313 "reference": "3b6fca09c7d56321057fa8867c8dbe1abf648627"
2314 },
2315 "dist": {
2316 "type": "zip",
2317 "url": "https://api.github.com/repos/reactphp/promise/zipball/3b6fca09c7d56321057fa8867c8dbe1abf648627",
2318 "reference": "3b6fca09c7d56321057fa8867c8dbe1abf648627",
2319 "shasum": ""
2320 },
2321 "require": {
2322 "php": ">=5.4.0"
2323 },
2324 "type": "library",
2325 "extra": {
2326 "branch-alias": {
2327 "dev-master": "2.0-dev"
2328 }
2329 },
2330 "autoload": {
2331 "psr-4": {
2332 "React\\Promise\\": "src/"
2333 },
2334 "files": [
2335 "src/functions_include.php"
2336 ]
2337 },
2338 "notification-url": "https://packagist.org/downloads/",
2339 "license": [
2340 "MIT"
2341 ],
2342 "authors": [
2343 {
2344 "name": "Jan Sorgalla",
2345 "email": "jsorgalla@gmail.com"
2346 }
2347 ],
2348 "description": "A lightweight implementation of CommonJS Promises/A for PHP",
2349 "time": "2015-07-03 13:48:55"
2350 },
2351 {
1971 "name": "sensio/distribution-bundle", 2352 "name": "sensio/distribution-bundle",
1972 "version": "v3.0.31", 2353 "version": "v3.0.31",
1973 "target-dir": "Sensio/Bundle/DistributionBundle", 2354 "target-dir": "Sensio/Bundle/DistributionBundle",
@@ -2601,20 +2982,20 @@
2601 }, 2982 },
2602 { 2983 {
2603 "name": "twig/extensions", 2984 "name": "twig/extensions",
2604 "version": "v1.2.0", 2985 "version": "v1.3.0",
2605 "source": { 2986 "source": {
2606 "type": "git", 2987 "type": "git",
2607 "url": "https://github.com/twigphp/Twig-extensions.git", 2988 "url": "https://github.com/twigphp/Twig-extensions.git",
2608 "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd" 2989 "reference": "449e3c8a9ffad7c2479c7864557275a32b037499"
2609 }, 2990 },
2610 "dist": { 2991 "dist": {
2611 "type": "zip", 2992 "type": "zip",
2612 "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", 2993 "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499",
2613 "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", 2994 "reference": "449e3c8a9ffad7c2479c7864557275a32b037499",
2614 "shasum": "" 2995 "shasum": ""
2615 }, 2996 },
2616 "require": { 2997 "require": {
2617 "twig/twig": "~1.12" 2998 "twig/twig": "~1.20|~2.0"
2618 }, 2999 },
2619 "require-dev": { 3000 "require-dev": {
2620 "symfony/translation": "~2.3" 3001 "symfony/translation": "~2.3"
@@ -2625,7 +3006,7 @@
2625 "type": "library", 3006 "type": "library",
2626 "extra": { 3007 "extra": {
2627 "branch-alias": { 3008 "branch-alias": {
2628 "dev-master": "1.2.x-dev" 3009 "dev-master": "1.3-dev"
2629 } 3010 }
2630 }, 3011 },
2631 "autoload": { 3012 "autoload": {
@@ -2649,7 +3030,7 @@
2649 "i18n", 3030 "i18n",
2650 "text" 3031 "text"
2651 ], 3032 ],
2652 "time": "2014-10-30 14:30:03" 3033 "time": "2015-08-22 16:38:35"
2653 }, 3034 },
2654 { 3035 {
2655 "name": "twig/twig", 3036 "name": "twig/twig",
@@ -2709,91 +3090,6 @@
2709 "time": "2015-08-12 15:56:39" 3090 "time": "2015-08-12 15:56:39"
2710 }, 3091 },
2711 { 3092 {
2712 "name": "wallabag/Fivefilters_Libraries",
2713 "version": "1.0.1",
2714 "source": {
2715 "type": "git",
2716 "url": "https://github.com/wallabag/Fivefilters_Libraries.git",
2717 "reference": "6a07427e07308c746e0216ed254e41e053ab3448"
2718 },
2719 "dist": {
2720 "type": "zip",
2721 "url": "https://api.github.com/repos/wallabag/Fivefilters_Libraries/zipball/6a07427e07308c746e0216ed254e41e053ab3448",
2722 "reference": "6a07427e07308c746e0216ed254e41e053ab3448",
2723 "shasum": ""
2724 },
2725 "type": "library",
2726 "authors": [
2727 {
2728 "name": "Nicolas Lœuillet",
2729 "email": "nicolas@loeuillet.org",
2730 "homepage": "http://www.cdetc.fr"
2731 }
2732 ],
2733 "description": "Libraries from @fivefilters.",
2734 "homepage": "https://github.com/wallabag/Fivefilters_Libraries",
2735 "support": {
2736 "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/1.0.1",
2737 "issues": "https://github.com/wallabag/Fivefilters_Libraries/issues"
2738 },
2739 "time": "2015-08-14 10:11:06"
2740 },
2741 {
2742 "name": "wallabag/php-readability",
2743 "version": "v1.0",
2744 "source": {
2745 "type": "git",
2746 "url": "https://github.com/wallabag/php-readability.git",
2747 "reference": "e25182cdd1ccdebdce1149ab79c886eae1363674"
2748 },
2749 "dist": {
2750 "type": "zip",
2751 "url": "https://api.github.com/repos/wallabag/php-readability/zipball/e25182cdd1ccdebdce1149ab79c886eae1363674",
2752 "reference": "e25182cdd1ccdebdce1149ab79c886eae1363674",
2753 "shasum": ""
2754 },
2755 "require": {
2756 "php": ">=5.2"
2757 },
2758 "type": "library",
2759 "autoload": {
2760 "psr-0": {
2761 "Readability": ""
2762 }
2763 },
2764 "license": [
2765 "Apache-2.0"
2766 ],
2767 "authors": [
2768 {
2769 "name": "Keyvan Minoukadeh",
2770 "email": "keyvan@keyvan.net",
2771 "homepage": "http://keyvan.net",
2772 "role": "Developer (ported original JS code to PHP)"
2773 },
2774 {
2775 "name": "Arc90",
2776 "homepage": "http://arc90.com",
2777 "role": "Developer (original JS version)"
2778 }
2779 ],
2780 "description": "Automatic article extraction from HTML",
2781 "homepage": "http://code.fivefilters.org/php-readability/",
2782 "keywords": [
2783 "article",
2784 "article extraction",
2785 "content",
2786 "content extraction",
2787 "extraction",
2788 "html"
2789 ],
2790 "support": {
2791 "source": "https://github.com/wallabag/php-readability/tree/v1.0",
2792 "issues": "https://github.com/wallabag/php-readability/issues"
2793 },
2794 "time": "2013-04-17 13:51:09"
2795 },
2796 {
2797 "name": "willdurand/hateoas", 3093 "name": "willdurand/hateoas",
2798 "version": "v2.6.0", 3094 "version": "v2.6.0",
2799 "source": { 3095 "source": {
@@ -3466,16 +3762,16 @@
3466 }, 3762 },
3467 { 3763 {
3468 "name": "phpunit/phpunit", 3764 "name": "phpunit/phpunit",
3469 "version": "4.8.4", 3765 "version": "4.8.6",
3470 "source": { 3766 "source": {
3471 "type": "git", 3767 "type": "git",
3472 "url": "https://github.com/sebastianbergmann/phpunit.git", 3768 "url": "https://github.com/sebastianbergmann/phpunit.git",
3473 "reference": "55bf1d6092b0e13a1f26bd5eaffeef3d8ad85ea7" 3769 "reference": "2246830f4a1a551c67933e4171bf2126dc29d357"
3474 }, 3770 },
3475 "dist": { 3771 "dist": {
3476 "type": "zip", 3772 "type": "zip",
3477 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/55bf1d6092b0e13a1f26bd5eaffeef3d8ad85ea7", 3773 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2246830f4a1a551c67933e4171bf2126dc29d357",
3478 "reference": "55bf1d6092b0e13a1f26bd5eaffeef3d8ad85ea7", 3774 "reference": "2246830f4a1a551c67933e4171bf2126dc29d357",
3479 "shasum": "" 3775 "shasum": ""
3480 }, 3776 },
3481 "require": { 3777 "require": {
@@ -3534,24 +3830,24 @@
3534 "testing", 3830 "testing",
3535 "xunit" 3831 "xunit"
3536 ], 3832 ],
3537 "time": "2015-08-15 04:21:23" 3833 "time": "2015-08-24 04:09:38"
3538 }, 3834 },
3539 { 3835 {
3540 "name": "phpunit/phpunit-mock-objects", 3836 "name": "phpunit/phpunit-mock-objects",
3541 "version": "2.3.6", 3837 "version": "2.3.7",
3542 "source": { 3838 "source": {
3543 "type": "git", 3839 "type": "git",
3544 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", 3840 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
3545 "reference": "18dfbcb81d05e2296c0bcddd4db96cade75e6f42" 3841 "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
3546 }, 3842 },
3547 "dist": { 3843 "dist": {
3548 "type": "zip", 3844 "type": "zip",
3549 "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/18dfbcb81d05e2296c0bcddd4db96cade75e6f42", 3845 "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
3550 "reference": "18dfbcb81d05e2296c0bcddd4db96cade75e6f42", 3846 "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
3551 "shasum": "" 3847 "shasum": ""
3552 }, 3848 },
3553 "require": { 3849 "require": {
3554 "doctrine/instantiator": "~1.0,>=1.0.2", 3850 "doctrine/instantiator": "^1.0.2",
3555 "php": ">=5.3.3", 3851 "php": ">=5.3.3",
3556 "phpunit/php-text-template": "~1.2", 3852 "phpunit/php-text-template": "~1.2",
3557 "sebastian/exporter": "~1.2" 3853 "sebastian/exporter": "~1.2"
@@ -3590,7 +3886,7 @@
3590 "mock", 3886 "mock",
3591 "xunit" 3887 "xunit"
3592 ], 3888 ],
3593 "time": "2015-07-10 06:54:24" 3889 "time": "2015-08-19 09:14:08"
3594 }, 3890 },
3595 { 3891 {
3596 "name": "sebastian/comparator", 3892 "name": "sebastian/comparator",
@@ -4014,7 +4310,9 @@
4014 ], 4310 ],
4015 "aliases": [], 4311 "aliases": [],
4016 "minimum-stability": "dev", 4312 "minimum-stability": "dev",
4017 "stability-flags": [], 4313 "stability-flags": {
4314 "j0k3r/graby": 20
4315 },
4018 "prefer-stable": true, 4316 "prefer-stable": true,
4019 "prefer-lowest": false, 4317 "prefer-lowest": false,
4020 "platform": { 4318 "platform": {
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
index d5579de4..9ca008bf 100644
--- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
@@ -8,7 +8,6 @@ use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\HttpFoundation\Response; 8use Symfony\Component\HttpFoundation\Response;
9use Wallabag\CoreBundle\Entity\Entry; 9use Wallabag\CoreBundle\Entity\Entry;
10use Wallabag\CoreBundle\Entity\Tag; 10use Wallabag\CoreBundle\Entity\Tag;
11use Wallabag\CoreBundle\Service\Extractor;
12use Hateoas\Configuration\Route; 11use Hateoas\Configuration\Route;
13use Hateoas\Representation\Factory\PagerfantaFactory; 12use Hateoas\Representation\Factory\PagerfantaFactory;
14 13
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index bd87c6f4..8e714763 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -6,7 +6,6 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 6use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use Wallabag\CoreBundle\Entity\Entry; 8use Wallabag\CoreBundle\Entity\Entry;
9use Wallabag\CoreBundle\Service\Extractor;
10use Wallabag\CoreBundle\Form\Type\NewEntryType; 9use Wallabag\CoreBundle\Form\Type\NewEntryType;
11use Wallabag\CoreBundle\Form\Type\EditEntryType; 10use Wallabag\CoreBundle\Form\Type\EditEntryType;
12use Wallabag\CoreBundle\Filter\EntryFilterType; 11use Wallabag\CoreBundle\Filter\EntryFilterType;
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 5e3f9a37..e684c9b1 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -428,7 +428,7 @@ class Entry
428 } 428 }
429 429
430 /** 430 /**
431 * Set previewPicture 431 * Set previewPicture.
432 * 432 *
433 * @param string $previewPicture 433 * @param string $previewPicture
434 * 434 *
@@ -442,7 +442,7 @@ class Entry
442 } 442 }
443 443
444 /** 444 /**
445 * Get previewPicture 445 * Get previewPicture.
446 * 446 *
447 * @return string 447 * @return string
448 */ 448 */
@@ -450,5 +450,4 @@ class Entry
450 { 450 {
451 return $this->previewPicture; 451 return $this->previewPicture;
452 } 452 }
453
454} 453}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 13:43:44 +0000