aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json30
-rw-r--r--composer.lock354
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig11
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php31
5 files changed, 91 insertions, 339 deletions
diff --git a/composer.json b/composer.json
index 19db9814..709b23ac 100644
--- a/composer.json
+++ b/composer.json
@@ -29,30 +29,10 @@
29 "repositories": [ 29 "repositories": [
30 { 30 {
31 "type": "vcs", 31 "type": "vcs",
32 "url": "https://github.com/wallabag/PHP-Flash-Messages"
33 },
34 {
35 "type": "vcs",
36 "url": "https://github.com/wallabag/kriss_php5"
37 },
38 {
39 "type": "vcs",
40 "url": "https://github.com/wallabag/pagination"
41 },
42 {
43 "type": "vcs",
44 "url": "https://github.com/wallabag/PHPePub"
45 },
46 {
47 "type": "vcs",
48 "url": "https://github.com/wallabag/php-readability" 32 "url": "https://github.com/wallabag/php-readability"
49 }, 33 },
50 { 34 {
51 "type": "vcs", 35 "type": "vcs",
52 "url": "https://github.com/wallabag/phpMobi"
53 },
54 {
55 "type": "vcs",
56 "url": "https://github.com/wallabag/Fivefilters_Libraries" 36 "url": "https://github.com/wallabag/Fivefilters_Libraries"
57 } 37 }
58 ], 38 ],
@@ -69,7 +49,6 @@
69 "sensio/framework-extra-bundle": "~3.0", 49 "sensio/framework-extra-bundle": "~3.0",
70 "incenteev/composer-parameter-handler": "~2.0", 50 "incenteev/composer-parameter-handler": "~2.0",
71 "nelmio/cors-bundle": "~1.4.0", 51 "nelmio/cors-bundle": "~1.4.0",
72 "umpirsky/twig-gettext-extractor": "~1.1.5",
73 "friendsofsymfony/rest-bundle": "~1.4", 52 "friendsofsymfony/rest-bundle": "~1.4",
74 "jms/serializer-bundle": "~0.13", 53 "jms/serializer-bundle": "~0.13",
75 "nelmio/api-doc-bundle": "~2.7", 54 "nelmio/api-doc-bundle": "~2.7",
@@ -80,13 +59,8 @@
80 "willdurand/hateoas-bundle": "~0.5.0", 59 "willdurand/hateoas-bundle": "~0.5.0",
81 "htmlawed/htmlawed": "~1.1.19", 60 "htmlawed/htmlawed": "~1.1.19",
82 "liip/theme-bundle": "~1.1.3", 61 "liip/theme-bundle": "~1.1.3",
83 "wallabag/PHP-Flash-Messages": "dev-master", 62 "wallabag/php-readability": "~1.0.0",
84 "wallabag/kriss_php5": "dev-master", 63 "wallabag/Fivefilters_Libraries": "~1.0",
85 "wallabag/pagination": "dev-master",
86 "wallabag/PHPePub": "dev-master",
87 "wallabag/php-readability": "dev-master",
88 "wallabag/phpMobi": "dev-master",
89 "wallabag/Fivefilters_Libraries": "dev-master",
90 "pagerfanta/pagerfanta": "~1.0.3", 64 "pagerfanta/pagerfanta": "~1.0.3",
91 "lexik/form-filter-bundle": "~4.0" 65 "lexik/form-filter-bundle": "~4.0"
92 }, 66 },
diff --git a/composer.lock b/composer.lock
index a9902472..559a08dc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
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 https://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": "14a5e3837adfc98bca8d7eef22c9cc45", 7 "hash": "52545aca8a752dfc2969d6cb9f0cb8d3",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "doctrine/annotations", 10 "name": "doctrine/annotations",
@@ -356,16 +356,16 @@
356 }, 356 },
357 { 357 {
358 "name": "doctrine/doctrine-bundle", 358 "name": "doctrine/doctrine-bundle",
359 "version": "v1.5.0", 359 "version": "v1.5.1",
360 "source": { 360 "source": {
361 "type": "git", 361 "type": "git",
362 "url": "https://github.com/doctrine/DoctrineBundle.git", 362 "url": "https://github.com/doctrine/DoctrineBundle.git",
363 "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f" 363 "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01"
364 }, 364 },
365 "dist": { 365 "dist": {
366 "type": "zip", 366 "type": "zip",
367 "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f", 367 "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01",
368 "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f", 368 "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01",
369 "shasum": "" 369 "shasum": ""
370 }, 370 },
371 "require": { 371 "require": {
@@ -373,16 +373,16 @@
373 "doctrine/doctrine-cache-bundle": "~1.0", 373 "doctrine/doctrine-cache-bundle": "~1.0",
374 "jdorn/sql-formatter": "~1.1", 374 "jdorn/sql-formatter": "~1.1",
375 "php": ">=5.3.2", 375 "php": ">=5.3.2",
376 "symfony/console": "~2.3", 376 "symfony/console": "~2.3|~3.0",
377 "symfony/doctrine-bridge": "~2.2", 377 "symfony/doctrine-bridge": "~2.2|~3.0",
378 "symfony/framework-bundle": "~2.3" 378 "symfony/framework-bundle": "~2.3|~3.0"
379 }, 379 },
380 "require-dev": { 380 "require-dev": {
381 "doctrine/orm": "~2.3", 381 "doctrine/orm": "~2.3",
382 "phpunit/phpunit": "~4", 382 "phpunit/phpunit": "~4",
383 "satooshi/php-coveralls": "~0.6.1", 383 "satooshi/php-coveralls": "~0.6.1",
384 "symfony/validator": "~2.2", 384 "symfony/validator": "~2.2|~3.0",
385 "symfony/yaml": "~2.2", 385 "symfony/yaml": "~2.2|~3.0",
386 "twig/twig": "~1.10" 386 "twig/twig": "~1.10"
387 }, 387 },
388 "suggest": { 388 "suggest": {
@@ -430,7 +430,7 @@
430 "orm", 430 "orm",
431 "persistence" 431 "persistence"
432 ], 432 ],
433 "time": "2015-05-28 12:27:15" 433 "time": "2015-08-12 15:52:00"
434 }, 434 },
435 { 435 {
436 "name": "doctrine/doctrine-cache-bundle", 436 "name": "doctrine/doctrine-cache-bundle",
@@ -1491,9 +1491,7 @@
1491 "authors": [ 1491 "authors": [
1492 { 1492 {
1493 "name": "S.C. Chen", 1493 "name": "S.C. Chen",
1494 "email": "me578022@gmail.com", 1494 "email": "me578022@gmail.com"
1495 "homepage": "http://simplehtmldom.sourceforge.net/",
1496 "role": "Lead Developer"
1497 } 1495 }
1498 ], 1496 ],
1499 "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", 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",
@@ -2655,16 +2653,16 @@
2655 }, 2653 },
2656 { 2654 {
2657 "name": "twig/twig", 2655 "name": "twig/twig",
2658 "version": "v1.19.0", 2656 "version": "v1.20.0",
2659 "source": { 2657 "source": {
2660 "type": "git", 2658 "type": "git",
2661 "url": "https://github.com/twigphp/Twig.git", 2659 "url": "https://github.com/twigphp/Twig.git",
2662 "reference": "edbeaf43b0a606cdaadc32a11d2673614a377b90" 2660 "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844"
2663 }, 2661 },
2664 "dist": { 2662 "dist": {
2665 "type": "zip", 2663 "type": "zip",
2666 "url": "https://api.github.com/repos/twigphp/Twig/zipball/edbeaf43b0a606cdaadc32a11d2673614a377b90", 2664 "url": "https://api.github.com/repos/twigphp/Twig/zipball/1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844",
2667 "reference": "edbeaf43b0a606cdaadc32a11d2673614a377b90", 2665 "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844",
2668 "shasum": "" 2666 "shasum": ""
2669 }, 2667 },
2670 "require": { 2668 "require": {
@@ -2673,7 +2671,7 @@
2673 "type": "library", 2671 "type": "library",
2674 "extra": { 2672 "extra": {
2675 "branch-alias": { 2673 "branch-alias": {
2676 "dev-master": "1.19-dev" 2674 "dev-master": "1.20-dev"
2677 } 2675 }
2678 }, 2676 },
2679 "autoload": { 2677 "autoload": {
@@ -2708,69 +2706,20 @@
2708 "keywords": [ 2706 "keywords": [
2709 "templating" 2707 "templating"
2710 ], 2708 ],
2711 "time": "2015-07-31 13:45:26" 2709 "time": "2015-08-12 15:56:39"
2712 },
2713 {
2714 "name": "umpirsky/twig-gettext-extractor",
2715 "version": "1.1.5",
2716 "source": {
2717 "type": "git",
2718 "url": "https://github.com/umpirsky/Twig-Gettext-Extractor.git",
2719 "reference": "a2cdf8693e874ce83603c84e1cc46efb3d516c3f"
2720 },
2721 "dist": {
2722 "type": "zip",
2723 "url": "https://api.github.com/repos/umpirsky/Twig-Gettext-Extractor/zipball/a2cdf8693e874ce83603c84e1cc46efb3d516c3f",
2724 "reference": "a2cdf8693e874ce83603c84e1cc46efb3d516c3f",
2725 "shasum": ""
2726 },
2727 "require": {
2728 "php": ">=5.3.3",
2729 "symfony/filesystem": "~2.0",
2730 "symfony/form": "~2.0",
2731 "symfony/routing": "~2.0",
2732 "symfony/translation": "~2.0",
2733 "symfony/twig-bridge": "~2.0",
2734 "twig/extensions": "~1.0",
2735 "twig/twig": "~1.2"
2736 },
2737 "require-dev": {
2738 "symfony/config": "2.1.*"
2739 },
2740 "bin": [
2741 "twig-gettext-extractor"
2742 ],
2743 "type": "application",
2744 "autoload": {
2745 "psr-0": {
2746 "Twig\\Gettext": "."
2747 }
2748 },
2749 "notification-url": "https://packagist.org/downloads/",
2750 "license": [
2751 "MIT"
2752 ],
2753 "authors": [
2754 {
2755 "name": "Саша Стаменковић",
2756 "email": "umpirsky@gmail.com"
2757 }
2758 ],
2759 "description": "The Twig Gettext Extractor is Poedit friendly tool which extracts translations from twig templates.",
2760 "time": "2015-02-25 14:41:10"
2761 }, 2710 },
2762 { 2711 {
2763 "name": "wallabag/Fivefilters_Libraries", 2712 "name": "wallabag/Fivefilters_Libraries",
2764 "version": "dev-master", 2713 "version": "1.0.1",
2765 "source": { 2714 "source": {
2766 "type": "git", 2715 "type": "git",
2767 "url": "https://github.com/wallabag/Fivefilters_Libraries.git", 2716 "url": "https://github.com/wallabag/Fivefilters_Libraries.git",
2768 "reference": "93b5469d6036a68ce60f126f8430b3e1fbf1562f" 2717 "reference": "6a07427e07308c746e0216ed254e41e053ab3448"
2769 }, 2718 },
2770 "dist": { 2719 "dist": {
2771 "type": "zip", 2720 "type": "zip",
2772 "url": "https://api.github.com/repos/wallabag/Fivefilters_Libraries/zipball/93b5469d6036a68ce60f126f8430b3e1fbf1562f", 2721 "url": "https://api.github.com/repos/wallabag/Fivefilters_Libraries/zipball/6a07427e07308c746e0216ed254e41e053ab3448",
2773 "reference": "93b5469d6036a68ce60f126f8430b3e1fbf1562f", 2722 "reference": "6a07427e07308c746e0216ed254e41e053ab3448",
2774 "shasum": "" 2723 "shasum": ""
2775 }, 2724 },
2776 "type": "library", 2725 "type": "library",
@@ -2784,187 +2733,23 @@
2784 "description": "Libraries from @fivefilters.", 2733 "description": "Libraries from @fivefilters.",
2785 "homepage": "https://github.com/wallabag/Fivefilters_Libraries", 2734 "homepage": "https://github.com/wallabag/Fivefilters_Libraries",
2786 "support": { 2735 "support": {
2787 "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/1.0.0", 2736 "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/1.0.1",
2788 "issues": "https://github.com/wallabag/Fivefilters_Libraries/issues" 2737 "issues": "https://github.com/wallabag/Fivefilters_Libraries/issues"
2789 }, 2738 },
2790 "time": "2015-01-19 20:19:28" 2739 "time": "2015-08-14 10:11:06"
2791 },
2792 {
2793 "name": "wallabag/PHPePub",
2794 "version": "dev-master",
2795 "source": {
2796 "type": "git",
2797 "url": "https://github.com/wallabag/PHPePub.git",
2798 "reference": "7c78733d33344308520758d7f3f7bc2cc51b3512"
2799 },
2800 "dist": {
2801 "type": "zip",
2802 "url": "https://api.github.com/repos/wallabag/PHPePub/zipball/7c78733d33344308520758d7f3f7bc2cc51b3512",
2803 "reference": "7c78733d33344308520758d7f3f7bc2cc51b3512",
2804 "shasum": ""
2805 },
2806 "require": {
2807 "php": ">=5.3.0"
2808 },
2809 "type": "library",
2810 "autoload": {
2811 "classmap": [
2812 "EPub.php",
2813 "EPub.HtmlEntities.php",
2814 "EPub.NCX.php",
2815 "EPub.OPF.php",
2816 "EPubChapterSplitter.php",
2817 "lib.uuid.php",
2818 "Logger.php",
2819 "Zip.php"
2820 ]
2821 },
2822 "authors": [
2823 {
2824 "name": "Nicolas LÅ“uillet",
2825 "email": "nicolas@loeuillet.org",
2826 "homepage": "http://www.cdetc.fr"
2827 }
2828 ],
2829 "description": "PHP Classes for dynamically generating EPub files.",
2830 "homepage": "https://github.com/wallabag/PHPePub",
2831 "support": {
2832 "source": "https://github.com/wallabag/PHPePub/tree/2.1.0"
2833 },
2834 "time": "2015-01-19 11:44:19"
2835 },
2836 {
2837 "name": "wallabag/kriss_php5",
2838 "version": "dev-master",
2839 "source": {
2840 "type": "git",
2841 "url": "https://github.com/wallabag/kriss_php5.git",
2842 "reference": "f2dd88621a04828cdeb8d9a59b72fd34c94658b1"
2843 },
2844 "dist": {
2845 "type": "zip",
2846 "url": "https://api.github.com/repos/wallabag/kriss_php5/zipball/f2dd88621a04828cdeb8d9a59b72fd34c94658b1",
2847 "reference": "f2dd88621a04828cdeb8d9a59b72fd34c94658b1",
2848 "shasum": ""
2849 },
2850 "require": {
2851 "php": ">=5.3.0"
2852 },
2853 "type": "library",
2854 "autoload": {
2855 "files": [
2856 "Session.php"
2857 ]
2858 },
2859 "authors": [
2860 {
2861 "name": "Nicolas LÅ“uillet",
2862 "email": "nicolas@loeuillet.org",
2863 "homepage": "http://www.cdetc.fr"
2864 }
2865 ],
2866 "description": "A simple and smart (or stupid) php5 snippets repository",
2867 "homepage": "https://github.com/wallabag/kriss_php5",
2868 "support": {
2869 "source": "https://github.com/wallabag/kriss_php5/tree/1.0.0"
2870 },
2871 "time": "2015-01-18 21:21:43"
2872 },
2873 {
2874 "name": "wallabag/pagination",
2875 "version": "dev-master",
2876 "source": {
2877 "type": "git",
2878 "url": "https://github.com/wallabag/pagination.git",
2879 "reference": "54e442b31c90e50e331cb8ac400537e0eda30deb"
2880 },
2881 "dist": {
2882 "type": "zip",
2883 "url": "https://api.github.com/repos/wallabag/pagination/zipball/54e442b31c90e50e331cb8ac400537e0eda30deb",
2884 "reference": "54e442b31c90e50e331cb8ac400537e0eda30deb",
2885 "shasum": ""
2886 },
2887 "require": {
2888 "php": ">=5.3.0"
2889 },
2890 "type": "library",
2891 "autoload": {
2892 "files": [
2893 "paginator.php"
2894 ]
2895 },
2896 "authors": [
2897 {
2898 "name": "Nicolas LÅ“uillet",
2899 "email": "nicolas@loeuillet.org",
2900 "homepage": "http://www.cdetc.fr"
2901 }
2902 ],
2903 "description": "Paginate record sets, not tied in directly to a database.",
2904 "homepage": "https://github.com/wallabag/pagination",
2905 "support": {
2906 "source": "https://github.com/wallabag/pagination/tree/1.0.0"
2907 },
2908 "time": "2015-01-19 09:24:39"
2909 },
2910 {
2911 "name": "wallabag/php-flash-messages",
2912 "version": "dev-master",
2913 "source": {
2914 "type": "git",
2915 "url": "https://github.com/wallabag/PHP-Flash-Messages.git",
2916 "reference": "ea68eb768f32156baa15f7a3cd880ba8ff5af6ab"
2917 },
2918 "dist": {
2919 "type": "zip",
2920 "url": "https://api.github.com/repos/wallabag/PHP-Flash-Messages/zipball/ea68eb768f32156baa15f7a3cd880ba8ff5af6ab",
2921 "reference": "ea68eb768f32156baa15f7a3cd880ba8ff5af6ab",
2922 "shasum": ""
2923 },
2924 "require": {
2925 "php": ">=5.3.0"
2926 },
2927 "type": "library",
2928 "autoload": {
2929 "files": [
2930 "class.messages.php"
2931 ]
2932 },
2933 "license": [
2934 "Apache"
2935 ],
2936 "authors": [
2937 {
2938 "name": "Nicolas LÅ“uillet",
2939 "email": "nicolas@loeuillet.org",
2940 "homepage": "http://www.cdetc.fr"
2941 }
2942 ],
2943 "description": "Session-based Flash Messages class for PHP",
2944 "homepage": "https://github.com/wallabag/PHP-Flash-Messages",
2945 "keywords": [
2946 "flash",
2947 "messages",
2948 "php-flash-messages",
2949 "sessions"
2950 ],
2951 "support": {
2952 "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/1.0.0"
2953 },
2954 "time": "2015-01-18 19:51:55"
2955 }, 2740 },
2956 { 2741 {
2957 "name": "wallabag/php-readability", 2742 "name": "wallabag/php-readability",
2958 "version": "dev-master", 2743 "version": "v1.0",
2959 "source": { 2744 "source": {
2960 "type": "git", 2745 "type": "git",
2961 "url": "https://github.com/wallabag/php-readability.git", 2746 "url": "https://github.com/wallabag/php-readability.git",
2962 "reference": "a37a1482b9964ae1804dbed0bffa00988523c387" 2747 "reference": "e25182cdd1ccdebdce1149ab79c886eae1363674"
2963 }, 2748 },
2964 "dist": { 2749 "dist": {
2965 "type": "zip", 2750 "type": "zip",
2966 "url": "https://api.github.com/repos/wallabag/php-readability/zipball/a37a1482b9964ae1804dbed0bffa00988523c387", 2751 "url": "https://api.github.com/repos/wallabag/php-readability/zipball/e25182cdd1ccdebdce1149ab79c886eae1363674",
2967 "reference": "a37a1482b9964ae1804dbed0bffa00988523c387", 2752 "reference": "e25182cdd1ccdebdce1149ab79c886eae1363674",
2968 "shasum": "" 2753 "shasum": ""
2969 }, 2754 },
2970 "require": { 2755 "require": {
@@ -2993,7 +2778,7 @@
2993 } 2778 }
2994 ], 2779 ],
2995 "description": "Automatic article extraction from HTML", 2780 "description": "Automatic article extraction from HTML",
2996 "homepage": "https://github.com/wallabag/php-readability", 2781 "homepage": "http://code.fivefilters.org/php-readability/",
2997 "keywords": [ 2782 "keywords": [
2998 "article", 2783 "article",
2999 "article extraction", 2784 "article extraction",
@@ -3003,47 +2788,10 @@
3003 "html" 2788 "html"
3004 ], 2789 ],
3005 "support": { 2790 "support": {
3006 "source": "https://github.com/wallabag/php-readability/tree/1.0.0", 2791 "source": "https://github.com/wallabag/php-readability/tree/v1.0",
3007 "issues": "https://github.com/wallabag/php-readability/issues" 2792 "issues": "https://github.com/wallabag/php-readability/issues"
3008 }, 2793 },
3009 "time": "2015-01-19 12:25:38" 2794 "time": "2013-04-17 13:51:09"
3010 },
3011 {
3012 "name": "wallabag/phpMobi",
3013 "version": "dev-master",
3014 "source": {
3015 "type": "git",
3016 "url": "https://github.com/wallabag/phpMobi.git",
3017 "reference": "5137696542f08f8e6a0603c01970c6d3eca9873d"
3018 },
3019 "dist": {
3020 "type": "zip",
3021 "url": "https://api.github.com/repos/wallabag/phpMobi/zipball/5137696542f08f8e6a0603c01970c6d3eca9873d",
3022 "reference": "5137696542f08f8e6a0603c01970c6d3eca9873d",
3023 "shasum": ""
3024 },
3025 "require": {
3026 "php": ">=5.3.0"
3027 },
3028 "type": "library",
3029 "autoload": {
3030 "files": [
3031 "MOBIClass/MOBI.php"
3032 ]
3033 },
3034 "authors": [
3035 {
3036 "name": "Nicolas LÅ“uillet",
3037 "email": "nicolas@loeuillet.org",
3038 "homepage": "http://www.cdetc.fr"
3039 }
3040 ],
3041 "description": "An experimental Mobipocket file creator in PHP.",
3042 "homepage": "https://github.com/wallabag/phpMobi",
3043 "support": {
3044 "source": "https://github.com/wallabag/phpMobi/tree/1.0.0"
3045 },
3046 "time": "2015-01-19 12:43:17"
3047 }, 2795 },
3048 { 2796 {
3049 "name": "willdurand/hateoas", 2797 "name": "willdurand/hateoas",
@@ -3418,16 +3166,16 @@
3418 }, 3166 },
3419 { 3167 {
3420 "name": "phpspec/prophecy", 3168 "name": "phpspec/prophecy",
3421 "version": "v1.4.1", 3169 "version": "v1.5.0",
3422 "source": { 3170 "source": {
3423 "type": "git", 3171 "type": "git",
3424 "url": "https://github.com/phpspec/prophecy.git", 3172 "url": "https://github.com/phpspec/prophecy.git",
3425 "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373" 3173 "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
3426 }, 3174 },
3427 "dist": { 3175 "dist": {
3428 "type": "zip", 3176 "type": "zip",
3429 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373", 3177 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
3430 "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373", 3178 "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
3431 "shasum": "" 3179 "shasum": ""
3432 }, 3180 },
3433 "require": { 3181 "require": {
@@ -3474,7 +3222,7 @@
3474 "spy", 3222 "spy",
3475 "stub" 3223 "stub"
3476 ], 3224 ],
3477 "time": "2015-04-27 22:15:08" 3225 "time": "2015-08-13 10:07:40"
3478 }, 3226 },
3479 { 3227 {
3480 "name": "phpunit/php-code-coverage", 3228 "name": "phpunit/php-code-coverage",
@@ -3669,16 +3417,16 @@
3669 }, 3417 },
3670 { 3418 {
3671 "name": "phpunit/php-token-stream", 3419 "name": "phpunit/php-token-stream",
3672 "version": "1.4.3", 3420 "version": "1.4.6",
3673 "source": { 3421 "source": {
3674 "type": "git", 3422 "type": "git",
3675 "url": "https://github.com/sebastianbergmann/php-token-stream.git", 3423 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
3676 "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9" 3424 "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b"
3677 }, 3425 },
3678 "dist": { 3426 "dist": {
3679 "type": "zip", 3427 "type": "zip",
3680 "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9", 3428 "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
3681 "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9", 3429 "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
3682 "shasum": "" 3430 "shasum": ""
3683 }, 3431 },
3684 "require": { 3432 "require": {
@@ -3714,20 +3462,20 @@
3714 "keywords": [ 3462 "keywords": [
3715 "tokenizer" 3463 "tokenizer"
3716 ], 3464 ],
3717 "time": "2015-06-19 03:43:16" 3465 "time": "2015-08-16 08:51:00"
3718 }, 3466 },
3719 { 3467 {
3720 "name": "phpunit/phpunit", 3468 "name": "phpunit/phpunit",
3721 "version": "4.8.3", 3469 "version": "4.8.4",
3722 "source": { 3470 "source": {
3723 "type": "git", 3471 "type": "git",
3724 "url": "https://github.com/sebastianbergmann/phpunit.git", 3472 "url": "https://github.com/sebastianbergmann/phpunit.git",
3725 "reference": "fd3050e26e3105f416d74c4d33aea659b406c59d" 3473 "reference": "55bf1d6092b0e13a1f26bd5eaffeef3d8ad85ea7"
3726 }, 3474 },
3727 "dist": { 3475 "dist": {
3728 "type": "zip", 3476 "type": "zip",
3729 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fd3050e26e3105f416d74c4d33aea659b406c59d", 3477 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/55bf1d6092b0e13a1f26bd5eaffeef3d8ad85ea7",
3730 "reference": "fd3050e26e3105f416d74c4d33aea659b406c59d", 3478 "reference": "55bf1d6092b0e13a1f26bd5eaffeef3d8ad85ea7",
3731 "shasum": "" 3479 "shasum": ""
3732 }, 3480 },
3733 "require": { 3481 "require": {
@@ -3786,7 +3534,7 @@
3786 "testing", 3534 "testing",
3787 "xunit" 3535 "xunit"
3788 ], 3536 ],
3789 "time": "2015-08-10 09:16:56" 3537 "time": "2015-08-15 04:21:23"
3790 }, 3538 },
3791 { 3539 {
3792 "name": "phpunit/phpunit-mock-objects", 3540 "name": "phpunit/phpunit-mock-objects",
@@ -4266,15 +4014,7 @@
4266 ], 4014 ],
4267 "aliases": [], 4015 "aliases": [],
4268 "minimum-stability": "dev", 4016 "minimum-stability": "dev",
4269 "stability-flags": { 4017 "stability-flags": [],
4270 "wallabag/php-flash-messages": 20,
4271 "wallabag/kriss_php5": 20,
4272 "wallabag/pagination": 20,
4273 "wallabag/phpepub": 20,
4274 "wallabag/php-readability": 20,
4275 "wallabag/phpmobi": 20,
4276 "wallabag/fivefilters_libraries": 20
4277 },
4278 "prefer-stable": true, 4018 "prefer-stable": true,
4279 "prefer-lowest": false, 4019 "prefer-lowest": false,
4280 "platform": { 4020 "platform": {
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 6944a686..93ce650e 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -265,7 +265,7 @@ class EntryController extends Controller
265 265
266 $this->get('session')->getFlashBag()->add( 266 $this->get('session')->getFlashBag()->add(
267 'notice', 267 'notice',
268 'Entry archived' 268 'Entry ' . ($entry->isArchived() ? 'archived' : 'unarchived')
269 ); 269 );
270 270
271 return $this->redirect($request->headers->get('referer')); 271 return $this->redirect($request->headers->get('referer'));
@@ -290,7 +290,7 @@ class EntryController extends Controller
290 290
291 $this->get('session')->getFlashBag()->add( 291 $this->get('session')->getFlashBag()->add(
292 'notice', 292 'notice',
293 'Entry starred' 293 'Entry ' . ($entry->isStarred() ? 'starred' : 'unstarred')
294 ); 294 );
295 295
296 return $this->redirect($request->headers->get('referer')); 296 return $this->redirect($request->headers->get('referer'));
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index d6dd7c37..41ce9eee 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -23,7 +23,7 @@
23 <a href="{{ path(app.request.attributes.get('_route'), app.request.query.all|merge({'page': p})) }}">{{ p }}</a> 23 <a href="{{ path(app.request.attributes.get('_route'), app.request.query.all|merge({'page': p})) }}">{{ p }}</a>
24 </li> 24 </li>
25 {% endfor %} 25 {% endfor %}
26 </div> 26 </ul>
27 </div> 27 </div>
28 {% endblock %} 28 {% endblock %}
29 <br /> 29 <br />
@@ -81,6 +81,15 @@
81 <label>{% trans %}Create at{% endtrans %}</label> 81 <label>{% trans %}Create at{% endtrans %}</label>
82 </div> 82 </div>
83 83
84 <div class="input-field col s6">
85 {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
86 <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label>
87 </div>
88 <div class="input-field col s6">
89 {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }}
90 <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label>
91 </div>
92
84 <div class="col s6"> 93 <div class="col s6">
85 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a> 94 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
86 </div> 95 </div>
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
index 0bd18c44..87c16415 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
@@ -241,7 +241,7 @@ class EntryControllerTest extends WallabagCoreTestCase
241 $this->assertEquals(403, $client->getResponse()->getStatusCode()); 241 $this->assertEquals(403, $client->getResponse()->getStatusCode());
242 } 242 }
243 243
244 public function testFilterOnUnreadeView() 244 public function testFilterOnReadingTime()
245 { 245 {
246 $this->logInAs('admin'); 246 $this->logInAs('admin');
247 $client = $this->getClient(); 247 $client = $this->getClient();
@@ -260,6 +260,35 @@ class EntryControllerTest extends WallabagCoreTestCase
260 $this->assertCount(1, $crawler->filter('div[class=entry]')); 260 $this->assertCount(1, $crawler->filter('div[class=entry]'));
261 } 261 }
262 262
263 public function testFilterOnCreationDate()
264 {
265 $this->logInAs('admin');
266 $client = $this->getClient();
267
268 $crawler = $client->request('GET', '/unread/list');
269
270 $form = $crawler->filter('button[id=submit-filter]')->form();
271
272 $data = array(
273 'entry_filter[createdAt][left_date]' => date('d/m/Y'),
274 'entry_filter[createdAt][right_date]' => date('d/m/Y', strtotime("+1 day"))
275 );
276
277 $crawler = $client->submit($form, $data);
278
279 $this->assertCount(4, $crawler->filter('div[class=entry]'));
280
281 $data = array(
282 'entry_filter[createdAt][left_date]' => '01/01/1970',
283 'entry_filter[createdAt][right_date]' => '01/01/1970'
284 );
285
286 $crawler = $client->submit($form, $data);
287
288 $this->assertCount(0, $crawler->filter('div[class=entry]'));
289
290 }
291
263 public function testPaginationWithFilter() 292 public function testPaginationWithFilter()
264 { 293 {
265 $this->logInAs('admin'); 294 $this->logInAs('admin');
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 22:53:59 +0000