diff options
-rw-r--r-- | app/AppKernel.php | 1 | ||||
-rw-r--r-- | app/build.xml | 7 | ||||
-rw-r--r-- | composer.json | 1 | ||||
-rw-r--r-- | composer.lock | 140 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 22 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php | 35 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php | 34 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 63 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php | 38 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php | 40 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Tests/WallabagTestCase.php | 34 |
11 files changed, 361 insertions, 54 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 515c79ec..3dfefd58 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -28,6 +28,7 @@ class AppKernel extends Kernel | |||
28 | $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); | 28 | $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); |
29 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); | 29 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); |
30 | $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); | 30 | $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); |
31 | $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(); | ||
31 | } | 32 | } |
32 | 33 | ||
33 | return $bundles; | 34 | return $bundles; |
diff --git a/app/build.xml b/app/build.xml index 6427867c..a8e43f0d 100644 --- a/app/build.xml +++ b/app/build.xml | |||
@@ -34,5 +34,12 @@ | |||
34 | <arg value="cache:clear"/> | 34 | <arg value="cache:clear"/> |
35 | <arg value="--env=test"/> | 35 | <arg value="--env=test"/> |
36 | </exec> | 36 | </exec> |
37 | <exec executable="php"> | ||
38 | <arg value="${basedir}/../app/console"/> | ||
39 | <arg value="doctrine:fixtures:load"/> | ||
40 | <arg value="--no-interaction"/> | ||
41 | <arg value="--purge-with-truncate"/> | ||
42 | <arg value="--env=test"/> | ||
43 | </exec> | ||
37 | </target> | 44 | </target> |
38 | </project> | 45 | </project> |
diff --git a/composer.json b/composer.json index 8771ea90..0136ed2e 100644 --- a/composer.json +++ b/composer.json | |||
@@ -83,6 +83,7 @@ | |||
83 | "wallabag/Fivefilters_Libraries": "dev-master" | 83 | "wallabag/Fivefilters_Libraries": "dev-master" |
84 | }, | 84 | }, |
85 | "require-dev": { | 85 | "require-dev": { |
86 | "doctrine/doctrine-fixtures-bundle": "dev-master", | ||
86 | "sensio/generator-bundle": "~2.5", | 87 | "sensio/generator-bundle": "~2.5", |
87 | "phpunit/phpunit": "~4.4" | 88 | "phpunit/phpunit": "~4.4" |
88 | }, | 89 | }, |
diff --git a/composer.lock b/composer.lock index dded6dd7..a7890ac2 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -4,7 +4,7 @@ | |||
4 | "Read more about it at http://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": "5005a650aa4368bd3485939efd9e24ac", | 7 | "hash": "16c2143e6e1977d625f5557f07dfc118", |
8 | "packages": [ | 8 | "packages": [ |
9 | { | 9 | { |
10 | "name": "doctrine/annotations", | 10 | "name": "doctrine/annotations", |
@@ -1666,21 +1666,20 @@ | |||
1666 | }, | 1666 | }, |
1667 | { | 1667 | { |
1668 | "name": "robmorgan/phinx", | 1668 | "name": "robmorgan/phinx", |
1669 | "version": "v0.4.1", | 1669 | "version": "v0.4.2.1", |
1670 | "source": { | 1670 | "source": { |
1671 | "type": "git", | 1671 | "type": "git", |
1672 | "url": "https://github.com/robmorgan/phinx.git", | 1672 | "url": "https://github.com/robmorgan/phinx.git", |
1673 | "reference": "357210707c000f50edea802d84b74724ad122478" | 1673 | "reference": "1bc1396392d4073b8b29ee5289e445889cbc12b5" |
1674 | }, | 1674 | }, |
1675 | "dist": { | 1675 | "dist": { |
1676 | "type": "zip", | 1676 | "type": "zip", |
1677 | "url": "https://api.github.com/repos/robmorgan/phinx/zipball/357210707c000f50edea802d84b74724ad122478", | 1677 | "url": "https://api.github.com/repos/robmorgan/phinx/zipball/1bc1396392d4073b8b29ee5289e445889cbc12b5", |
1678 | "reference": "357210707c000f50edea802d84b74724ad122478", | 1678 | "reference": "1bc1396392d4073b8b29ee5289e445889cbc12b5", |
1679 | "shasum": "" | 1679 | "shasum": "" |
1680 | }, | 1680 | }, |
1681 | "require": { | 1681 | "require": { |
1682 | "php": ">=5.3.2", | 1682 | "php": ">=5.3.2", |
1683 | "symfony/class-loader": "~2.6.0", | ||
1684 | "symfony/config": "~2.6.0", | 1683 | "symfony/config": "~2.6.0", |
1685 | "symfony/console": "~2.6.0", | 1684 | "symfony/console": "~2.6.0", |
1686 | "symfony/yaml": "~2.6.0" | 1685 | "symfony/yaml": "~2.6.0" |
@@ -1694,8 +1693,8 @@ | |||
1694 | ], | 1693 | ], |
1695 | "type": "library", | 1694 | "type": "library", |
1696 | "autoload": { | 1695 | "autoload": { |
1697 | "psr-0": { | 1696 | "psr-4": { |
1698 | "Phinx": "src/" | 1697 | "Phinx\\": "src/Phinx" |
1699 | } | 1698 | } |
1700 | }, | 1699 | }, |
1701 | "notification-url": "https://packagist.org/downloads/", | 1700 | "notification-url": "https://packagist.org/downloads/", |
@@ -1708,6 +1707,12 @@ | |||
1708 | "email": "robbym@gmail.com", | 1707 | "email": "robbym@gmail.com", |
1709 | "homepage": "http://robmorgan.id.au", | 1708 | "homepage": "http://robmorgan.id.au", |
1710 | "role": "Lead Developer" | 1709 | "role": "Lead Developer" |
1710 | }, | ||
1711 | { | ||
1712 | "name": "Woody Gilk", | ||
1713 | "email": "woody.gilk@gmail.com", | ||
1714 | "homepage": "http://shadowhand.me", | ||
1715 | "role": "Developer" | ||
1711 | } | 1716 | } |
1712 | ], | 1717 | ], |
1713 | "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", | 1718 | "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", |
@@ -1719,7 +1724,7 @@ | |||
1719 | "migrations", | 1724 | "migrations", |
1720 | "phinx" | 1725 | "phinx" |
1721 | ], | 1726 | ], |
1722 | "time": "2014-12-23 06:06:14" | 1727 | "time": "2015-02-08 03:41:44" |
1723 | }, | 1728 | }, |
1724 | { | 1729 | { |
1725 | "name": "sensio/distribution-bundle", | 1730 | "name": "sensio/distribution-bundle", |
@@ -2872,6 +2877,120 @@ | |||
2872 | ], | 2877 | ], |
2873 | "packages-dev": [ | 2878 | "packages-dev": [ |
2874 | { | 2879 | { |
2880 | "name": "doctrine/data-fixtures", | ||
2881 | "version": "v1.0.0", | ||
2882 | "source": { | ||
2883 | "type": "git", | ||
2884 | "url": "https://github.com/doctrine/data-fixtures.git", | ||
2885 | "reference": "b4a135c7db56ecc4602b54a2184368f440cac33e" | ||
2886 | }, | ||
2887 | "dist": { | ||
2888 | "type": "zip", | ||
2889 | "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/b4a135c7db56ecc4602b54a2184368f440cac33e", | ||
2890 | "reference": "b4a135c7db56ecc4602b54a2184368f440cac33e", | ||
2891 | "shasum": "" | ||
2892 | }, | ||
2893 | "require": { | ||
2894 | "doctrine/common": ">=2.2,<2.5-dev", | ||
2895 | "php": ">=5.3.2" | ||
2896 | }, | ||
2897 | "require-dev": { | ||
2898 | "doctrine/orm": ">=2.2,<2.5-dev" | ||
2899 | }, | ||
2900 | "suggest": { | ||
2901 | "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", | ||
2902 | "doctrine/orm": "For loading ORM fixtures", | ||
2903 | "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" | ||
2904 | }, | ||
2905 | "type": "library", | ||
2906 | "extra": { | ||
2907 | "branch-alias": { | ||
2908 | "dev-master": "1.0.x-dev" | ||
2909 | } | ||
2910 | }, | ||
2911 | "autoload": { | ||
2912 | "psr-0": { | ||
2913 | "Doctrine\\Common\\DataFixtures": "lib/" | ||
2914 | } | ||
2915 | }, | ||
2916 | "notification-url": "https://packagist.org/downloads/", | ||
2917 | "license": [ | ||
2918 | "MIT" | ||
2919 | ], | ||
2920 | "authors": [ | ||
2921 | { | ||
2922 | "name": "Jonathan Wage", | ||
2923 | "email": "jonwage@gmail.com", | ||
2924 | "homepage": "http://www.jwage.com/", | ||
2925 | "role": "Creator" | ||
2926 | } | ||
2927 | ], | ||
2928 | "description": "Data Fixtures for all Doctrine Object Managers", | ||
2929 | "homepage": "http://www.doctrine-project.org", | ||
2930 | "keywords": [ | ||
2931 | "database" | ||
2932 | ], | ||
2933 | "time": "2013-07-10 17:04:07" | ||
2934 | }, | ||
2935 | { | ||
2936 | "name": "doctrine/doctrine-fixtures-bundle", | ||
2937 | "version": "dev-master", | ||
2938 | "target-dir": "Doctrine/Bundle/FixturesBundle", | ||
2939 | "source": { | ||
2940 | "type": "git", | ||
2941 | "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", | ||
2942 | "reference": "c5ff0542772102ddd4e2fbe173e9ad40ad67c22f" | ||
2943 | }, | ||
2944 | "dist": { | ||
2945 | "type": "zip", | ||
2946 | "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c5ff0542772102ddd4e2fbe173e9ad40ad67c22f", | ||
2947 | "reference": "c5ff0542772102ddd4e2fbe173e9ad40ad67c22f", | ||
2948 | "shasum": "" | ||
2949 | }, | ||
2950 | "require": { | ||
2951 | "doctrine/data-fixtures": "~1.0", | ||
2952 | "doctrine/doctrine-bundle": "~1.0", | ||
2953 | "php": ">=5.3.2", | ||
2954 | "symfony/doctrine-bridge": "~2.1" | ||
2955 | }, | ||
2956 | "type": "symfony-bundle", | ||
2957 | "extra": { | ||
2958 | "branch-alias": { | ||
2959 | "dev-master": "2.2.x-dev" | ||
2960 | } | ||
2961 | }, | ||
2962 | "autoload": { | ||
2963 | "psr-0": { | ||
2964 | "Doctrine\\Bundle\\FixturesBundle": "" | ||
2965 | } | ||
2966 | }, | ||
2967 | "notification-url": "https://packagist.org/downloads/", | ||
2968 | "license": [ | ||
2969 | "MIT" | ||
2970 | ], | ||
2971 | "authors": [ | ||
2972 | { | ||
2973 | "name": "Symfony Community", | ||
2974 | "homepage": "http://symfony.com/contributors" | ||
2975 | }, | ||
2976 | { | ||
2977 | "name": "Doctrine Project", | ||
2978 | "homepage": "http://www.doctrine-project.org" | ||
2979 | }, | ||
2980 | { | ||
2981 | "name": "Fabien Potencier", | ||
2982 | "email": "fabien@symfony.com" | ||
2983 | } | ||
2984 | ], | ||
2985 | "description": "Symfony DoctrineFixturesBundle", | ||
2986 | "homepage": "http://www.doctrine-project.org", | ||
2987 | "keywords": [ | ||
2988 | "Fixture", | ||
2989 | "persistence" | ||
2990 | ], | ||
2991 | "time": "2015-01-19 02:21:37" | ||
2992 | }, | ||
2993 | { | ||
2875 | "name": "doctrine/instantiator", | 2994 | "name": "doctrine/instantiator", |
2876 | "version": "1.0.4", | 2995 | "version": "1.0.4", |
2877 | "source": { | 2996 | "source": { |
@@ -3834,7 +3953,8 @@ | |||
3834 | "wallabag/phpepub": 20, | 3953 | "wallabag/phpepub": 20, |
3835 | "wallabag/php-readability": 20, | 3954 | "wallabag/php-readability": 20, |
3836 | "wallabag/phpmobi": 20, | 3955 | "wallabag/phpmobi": 20, |
3837 | "wallabag/fivefilters_libraries": 20 | 3956 | "wallabag/fivefilters_libraries": 20, |
3957 | "doctrine/doctrine-fixtures-bundle": 20 | ||
3838 | }, | 3958 | }, |
3839 | "prefer-stable": true, | 3959 | "prefer-stable": true, |
3840 | "prefer-lowest": false, | 3960 | "prefer-lowest": false, |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 2dfe2f51..e0697ca3 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -19,9 +19,7 @@ class EntryController extends Controller | |||
19 | */ | 19 | */ |
20 | public function addEntryAction(Request $request) | 20 | public function addEntryAction(Request $request) |
21 | { | 21 | { |
22 | $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:User'); | 22 | $entry = new Entry($this->getUser()); |
23 | $user = $repository->find(1); | ||
24 | $entry = new Entry($user); | ||
25 | 23 | ||
26 | $form = $this->createFormBuilder($entry) | 24 | $form = $this->createFormBuilder($entry) |
27 | ->add('url', 'url') | 25 | ->add('url', 'url') |
@@ -61,10 +59,10 @@ class EntryController extends Controller | |||
61 | */ | 59 | */ |
62 | public function showUnreadAction() | 60 | public function showUnreadAction() |
63 | { | 61 | { |
64 | $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); | ||
65 | // TODO don't give the user ID like this | ||
66 | // TODO change pagination | 62 | // TODO change pagination |
67 | $entries = $repository->findUnreadByUser(1, 0); | 63 | $entries = $this->getDoctrine() |
64 | ->getRepository('WallabagCoreBundle:Entry') | ||
65 | ->findUnreadByUser($this->getUser()->getId(), 0); | ||
68 | 66 | ||
69 | return $this->render( | 67 | return $this->render( |
70 | 'WallabagCoreBundle:Entry:entries.html.twig', | 68 | 'WallabagCoreBundle:Entry:entries.html.twig', |
@@ -80,10 +78,10 @@ class EntryController extends Controller | |||
80 | */ | 78 | */ |
81 | public function showArchiveAction() | 79 | public function showArchiveAction() |
82 | { | 80 | { |
83 | $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); | ||
84 | // TODO don't give the user ID like this | ||
85 | // TODO change pagination | 81 | // TODO change pagination |
86 | $entries = $repository->findArchiveByUser(1, 0); | 82 | $entries = $this->getDoctrine() |
83 | ->getRepository('WallabagCoreBundle:Entry') | ||
84 | ->findArchiveByUser($this->getUser()->getId(), 0); | ||
87 | 85 | ||
88 | return $this->render( | 86 | return $this->render( |
89 | 'WallabagCoreBundle:Entry:entries.html.twig', | 87 | 'WallabagCoreBundle:Entry:entries.html.twig', |
@@ -99,10 +97,10 @@ class EntryController extends Controller | |||
99 | */ | 97 | */ |
100 | public function showStarredAction() | 98 | public function showStarredAction() |
101 | { | 99 | { |
102 | $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); | ||
103 | // TODO don't give the user ID like this | ||
104 | // TODO change pagination | 100 | // TODO change pagination |
105 | $entries = $repository->findStarredByUser(1, 0); | 101 | $entries = $this->getDoctrine() |
102 | ->getRepository('WallabagCoreBundle:Entry') | ||
103 | ->findStarredByUser($this->getUser()->getId(), 0); | ||
106 | 104 | ||
107 | return $this->render( | 105 | return $this->render( |
108 | 'WallabagCoreBundle:Entry:entries.html.twig', | 106 | 'WallabagCoreBundle:Entry:entries.html.twig', |
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php new file mode 100644 index 00000000..fccd06be --- /dev/null +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php | |||
@@ -0,0 +1,35 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\DataFixtures\ORM; | ||
4 | |||
5 | use Doctrine\Common\DataFixtures\AbstractFixture; | ||
6 | use Doctrine\Common\DataFixtures\OrderedFixtureInterface; | ||
7 | use Doctrine\Common\Persistence\ObjectManager; | ||
8 | use Wallabag\CoreBundle\Entity\Entry; | ||
9 | |||
10 | class LoadEntryData extends AbstractFixture implements OrderedFixtureInterface | ||
11 | { | ||
12 | /** | ||
13 | * {@inheritDoc} | ||
14 | */ | ||
15 | public function load(ObjectManager $manager) | ||
16 | { | ||
17 | $entry1 = new Entry($this->getReference('admin-user')); | ||
18 | $entry1->setUrl('http://0.0.0.0'); | ||
19 | $entry1->setTitle('test title'); | ||
20 | $entry1->setContent('This is my content /o/'); | ||
21 | |||
22 | $manager->persist($entry1); | ||
23 | $manager->flush(); | ||
24 | |||
25 | $this->addReference('entry1', $entry1); | ||
26 | } | ||
27 | |||
28 | /** | ||
29 | * {@inheritDoc} | ||
30 | */ | ||
31 | public function getOrder() | ||
32 | { | ||
33 | return 20; | ||
34 | } | ||
35 | } | ||
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php new file mode 100644 index 00000000..da788218 --- /dev/null +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php | |||
@@ -0,0 +1,34 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\DataFixtures\ORM; | ||
4 | |||
5 | use Doctrine\Common\DataFixtures\AbstractFixture; | ||
6 | use Doctrine\Common\DataFixtures\OrderedFixtureInterface; | ||
7 | use Doctrine\Common\Persistence\ObjectManager; | ||
8 | use Wallabag\CoreBundle\Entity\User; | ||
9 | |||
10 | class LoadUserData extends AbstractFixture implements OrderedFixtureInterface | ||
11 | { | ||
12 | /** | ||
13 | * {@inheritDoc} | ||
14 | */ | ||
15 | public function load(ObjectManager $manager) | ||
16 | { | ||
17 | $userAdmin = new User(); | ||
18 | $userAdmin->setUsername('admin'); | ||
19 | $userAdmin->setPassword('test'); | ||
20 | |||
21 | $manager->persist($userAdmin); | ||
22 | $manager->flush(); | ||
23 | |||
24 | $this->addReference('admin-user', $userAdmin); | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * {@inheritDoc} | ||
29 | */ | ||
30 | public function getOrder() | ||
31 | { | ||
32 | return 10; | ||
33 | } | ||
34 | } | ||
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index f4c803f9..5ae1337a 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -11,19 +11,20 @@ class EntryRepository extends EntityRepository | |||
11 | /** | 11 | /** |
12 | * Retrieves unread entries for a user | 12 | * Retrieves unread entries for a user |
13 | * | 13 | * |
14 | * @param $userId | 14 | * @param int $userId |
15 | * @param $firstResult | 15 | * @param int $firstResult |
16 | * @param int $maxResults | 16 | * @param int $maxResults |
17 | * | ||
17 | * @return Paginator | 18 | * @return Paginator |
18 | */ | 19 | */ |
19 | public function findUnreadByUser($userId, $firstResult, $maxResults = 12) | 20 | public function findUnreadByUser($userId, $firstResult, $maxResults = 12) |
20 | { | 21 | { |
21 | $qb = $this->createQueryBuilder('e') | 22 | $qb = $this->createQueryBuilder('e') |
22 | ->select('e') | ||
23 | ->setFirstResult($firstResult) | 23 | ->setFirstResult($firstResult) |
24 | ->setMaxResults($maxResults) | 24 | ->setMaxResults($maxResults) |
25 | ->leftJoin('e.user', 'u') | ||
25 | ->where('e.isArchived = false') | 26 | ->where('e.isArchived = false') |
26 | ->andWhere('e.userId =:userId')->setParameter('userId', $userId) | 27 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) |
27 | ->andWhere('e.isDeleted=false') | 28 | ->andWhere('e.isDeleted=false') |
28 | ->orderBy('e.createdAt', 'desc') | 29 | ->orderBy('e.createdAt', 'desc') |
29 | ->getQuery(); | 30 | ->getQuery(); |
@@ -36,9 +37,10 @@ class EntryRepository extends EntityRepository | |||
36 | /** | 37 | /** |
37 | * Retrieves read entries for a user | 38 | * Retrieves read entries for a user |
38 | * | 39 | * |
39 | * @param $userId | 40 | * @param int $userId |
40 | * @param $firstResult | 41 | * @param int $firstResult |
41 | * @param int $maxResults | 42 | * @param int $maxResults |
43 | * | ||
42 | * @return Paginator | 44 | * @return Paginator |
43 | */ | 45 | */ |
44 | public function findArchiveByUser($userId, $firstResult, $maxResults = 12) | 46 | public function findArchiveByUser($userId, $firstResult, $maxResults = 12) |
@@ -47,8 +49,9 @@ class EntryRepository extends EntityRepository | |||
47 | ->select('e') | 49 | ->select('e') |
48 | ->setFirstResult($firstResult) | 50 | ->setFirstResult($firstResult) |
49 | ->setMaxResults($maxResults) | 51 | ->setMaxResults($maxResults) |
52 | ->leftJoin('e.user', 'u') | ||
50 | ->where('e.isArchived = true') | 53 | ->where('e.isArchived = true') |
51 | ->andWhere('e.userId =:userId')->setParameter('userId', $userId) | 54 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) |
52 | ->andWhere('e.isDeleted=false') | 55 | ->andWhere('e.isDeleted=false') |
53 | ->orderBy('e.createdAt', 'desc') | 56 | ->orderBy('e.createdAt', 'desc') |
54 | ->getQuery(); | 57 | ->getQuery(); |
@@ -61,9 +64,10 @@ class EntryRepository extends EntityRepository | |||
61 | /** | 64 | /** |
62 | * Retrieves starred entries for a user | 65 | * Retrieves starred entries for a user |
63 | * | 66 | * |
64 | * @param $userId | 67 | * @param int $userId |
65 | * @param $firstResult | 68 | * @param int $firstResult |
66 | * @param int $maxResults | 69 | * @param int $maxResults |
70 | * | ||
67 | * @return Paginator | 71 | * @return Paginator |
68 | */ | 72 | */ |
69 | public function findStarredByUser($userId, $firstResult, $maxResults = 12) | 73 | public function findStarredByUser($userId, $firstResult, $maxResults = 12) |
@@ -72,9 +76,10 @@ class EntryRepository extends EntityRepository | |||
72 | ->select('e') | 76 | ->select('e') |
73 | ->setFirstResult($firstResult) | 77 | ->setFirstResult($firstResult) |
74 | ->setMaxResults($maxResults) | 78 | ->setMaxResults($maxResults) |
79 | ->leftJoin('e.user', 'u') | ||
75 | ->where('e.isStarred = true') | 80 | ->where('e.isStarred = true') |
76 | ->andWhere('e.userId =:userId')->setParameter('userId', $userId) | 81 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) |
77 | ->andWhere('e.isDeleted=false') | 82 | ->andWhere('e.isDeleted = false') |
78 | ->orderBy('e.createdAt', 'desc') | 83 | ->orderBy('e.createdAt', 'desc') |
79 | ->getQuery(); | 84 | ->getQuery(); |
80 | 85 | ||
@@ -83,22 +88,34 @@ class EntryRepository extends EntityRepository | |||
83 | return $paginator; | 88 | return $paginator; |
84 | } | 89 | } |
85 | 90 | ||
86 | public function findEntries($userId, $isArchived, $isStarred, $isDeleted, $sort, $order) | 91 | /** |
92 | * Find Entries | ||
93 | * | ||
94 | * @param int $userId | ||
95 | * @param bool $isArchived | ||
96 | * @param bool $isStarred | ||
97 | * @param bool $isDeleted | ||
98 | * @param string $sort | ||
99 | * @param string $order | ||
100 | * | ||
101 | * @return ArrayCollection | ||
102 | */ | ||
103 | public function findEntries($userId, $isArchived = null, $isStarred = null, $isDeleted = null, $sort = 'created', $order = 'ASC') | ||
87 | { | 104 | { |
88 | $qb = $this->createQueryBuilder('e') | 105 | $qb = $this->createQueryBuilder('e') |
89 | ->select('e') | 106 | ->leftJoin('e.user', 'u') |
90 | ->where('e.userId =:userId')->setParameter('userId', $userId); | 107 | ->where('u.id =:userId')->setParameter('userId', $userId); |
91 | 108 | ||
92 | if (!is_null($isArchived)) { | 109 | if (null !== $isArchived) { |
93 | $qb->andWhere('e.isArchived =:isArchived')->setParameter('isArchived', $isArchived); | 110 | $qb->andWhere('e.isArchived =:isArchived')->setParameter('isArchived', (bool) $isArchived); |
94 | } | 111 | } |
95 | 112 | ||
96 | if (!is_null($isStarred)) { | 113 | if (null !== $isStarred) { |
97 | $qb->andWhere('e.isStarred =:isStarred')->setParameter('isStarred', $isStarred); | 114 | $qb->andWhere('e.isStarred =:isStarred')->setParameter('isStarred', (bool) $isStarred); |
98 | } | 115 | } |
99 | 116 | ||
100 | if (!is_null($isDeleted)) { | 117 | if (null !== $isDeleted) { |
101 | $qb->andWhere('e.isDeleted =:isDeleted')->setParameter('isDeleted', $isDeleted); | 118 | $qb->andWhere('e.isDeleted =:isDeleted')->setParameter('isDeleted', (bool) $isDeleted); |
102 | } | 119 | } |
103 | 120 | ||
104 | if ('created' === $sort) { | 121 | if ('created' === $sort) { |
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php index fde210c9..5d8daea3 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php | |||
@@ -2,13 +2,24 @@ | |||
2 | 2 | ||
3 | namespace Wallabag\CoreBundle\Tests\Controller; | 3 | namespace Wallabag\CoreBundle\Tests\Controller; |
4 | 4 | ||
5 | use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; | 5 | use Wallabag\CoreBundle\Tests\WallabagTestCase; |
6 | 6 | ||
7 | class EntryControllerTest extends WebTestCase | 7 | class EntryControllerTest extends WallabagTestCase |
8 | { | 8 | { |
9 | public function testLogin() | ||
10 | { | ||
11 | $client = $this->getClient(); | ||
12 | |||
13 | $crawler = $client->request('GET', '/new'); | ||
14 | |||
15 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); | ||
16 | $this->assertContains('login', $client->getResponse()->headers->get('location')); | ||
17 | } | ||
18 | |||
9 | public function testGetNew() | 19 | public function testGetNew() |
10 | { | 20 | { |
11 | $client = static::createClient(); | 21 | $this->logIn(); |
22 | $client = $this->getClient(); | ||
12 | 23 | ||
13 | $crawler = $client->request('GET', '/new'); | 24 | $crawler = $client->request('GET', '/new'); |
14 | 25 | ||
@@ -20,7 +31,8 @@ class EntryControllerTest extends WebTestCase | |||
20 | 31 | ||
21 | public function testPostNewEmpty() | 32 | public function testPostNewEmpty() |
22 | { | 33 | { |
23 | $client = static::createClient(); | 34 | $this->logIn(); |
35 | $client = $this->getClient(); | ||
24 | 36 | ||
25 | $crawler = $client->request('GET', '/new'); | 37 | $crawler = $client->request('GET', '/new'); |
26 | 38 | ||
@@ -37,7 +49,8 @@ class EntryControllerTest extends WebTestCase | |||
37 | 49 | ||
38 | public function testPostNewOk() | 50 | public function testPostNewOk() |
39 | { | 51 | { |
40 | $client = static::createClient(); | 52 | $this->logIn(); |
53 | $client = $this->getClient(); | ||
41 | 54 | ||
42 | $crawler = $client->request('GET', '/new'); | 55 | $crawler = $client->request('GET', '/new'); |
43 | 56 | ||
@@ -55,13 +68,14 @@ class EntryControllerTest extends WebTestCase | |||
55 | 68 | ||
56 | $crawler = $client->followRedirect(); | 69 | $crawler = $client->followRedirect(); |
57 | 70 | ||
58 | $this->assertCount(1, $alert = $crawler->filter('h2 a')->extract(array('_text'))); | 71 | $this->assertGreaterThan(1, $alert = $crawler->filter('h2 a')->extract(array('_text'))); |
59 | $this->assertContains('Mailjet', $alert[0]); | 72 | $this->assertContains('Mailjet', $alert[0]); |
60 | } | 73 | } |
61 | 74 | ||
62 | public function testArchive() | 75 | public function testArchive() |
63 | { | 76 | { |
64 | $client = static::createClient(); | 77 | $this->logIn(); |
78 | $client = $this->getClient(); | ||
65 | 79 | ||
66 | $crawler = $client->request('GET', '/archive'); | 80 | $crawler = $client->request('GET', '/archive'); |
67 | 81 | ||
@@ -70,7 +84,8 @@ class EntryControllerTest extends WebTestCase | |||
70 | 84 | ||
71 | public function testStarred() | 85 | public function testStarred() |
72 | { | 86 | { |
73 | $client = static::createClient(); | 87 | $this->logIn(); |
88 | $client = $this->getClient(); | ||
74 | 89 | ||
75 | $crawler = $client->request('GET', '/starred'); | 90 | $crawler = $client->request('GET', '/starred'); |
76 | 91 | ||
@@ -79,13 +94,18 @@ class EntryControllerTest extends WebTestCase | |||
79 | 94 | ||
80 | public function testView() | 95 | public function testView() |
81 | { | 96 | { |
82 | $client = static::createClient(); | 97 | $this->logIn(); |
98 | $client = $this->getClient(); | ||
83 | 99 | ||
84 | $content = $client->getContainer() | 100 | $content = $client->getContainer() |
85 | ->get('doctrine.orm.entity_manager') | 101 | ->get('doctrine.orm.entity_manager') |
86 | ->getRepository('WallabagCoreBundle:Entry') | 102 | ->getRepository('WallabagCoreBundle:Entry') |
87 | ->findOneByIsArchived(false); | 103 | ->findOneByIsArchived(false); |
88 | 104 | ||
105 | if (!$content) { | ||
106 | $this->markTestSkipped('No content found in db.'); | ||
107 | } | ||
108 | |||
89 | $crawler = $client->request('GET', '/view/'.$content->getId()); | 109 | $crawler = $client->request('GET', '/view/'.$content->getId()); |
90 | 110 | ||
91 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); | 111 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php new file mode 100644 index 00000000..54cf5073 --- /dev/null +++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php | |||
@@ -0,0 +1,40 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Tests\Controller; | ||
4 | |||
5 | use Wallabag\CoreBundle\Tests\WallabagTestCase; | ||
6 | |||
7 | class SecurityControllerTest extends WallabagTestCase | ||
8 | { | ||
9 | public function testLogin() | ||
10 | { | ||
11 | $client = $this->getClient(); | ||
12 | |||
13 | $crawler = $client->request('GET', '/new'); | ||
14 | |||
15 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); | ||
16 | $this->assertContains('login', $client->getResponse()->headers->get('location')); | ||
17 | } | ||
18 | |||
19 | public function testLoginFail() | ||
20 | { | ||
21 | $client = $this->getClient(); | ||
22 | |||
23 | $crawler = $client->request('GET', '/login'); | ||
24 | |||
25 | $form = $crawler->filter('button[type=submit]')->form(); | ||
26 | $data = array( | ||
27 | '_username' => 'admin', | ||
28 | '_password' => 'admin', | ||
29 | ); | ||
30 | |||
31 | $client->submit($form, $data); | ||
32 | |||
33 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); | ||
34 | $this->assertContains('login', $client->getResponse()->headers->get('location')); | ||
35 | |||
36 | $crawler = $client->followRedirect(); | ||
37 | |||
38 | $this->assertContains('Bad credentials', $client->getResponse()->getContent()); | ||
39 | } | ||
40 | } | ||
diff --git a/src/Wallabag/CoreBundle/Tests/WallabagTestCase.php b/src/Wallabag/CoreBundle/Tests/WallabagTestCase.php new file mode 100644 index 00000000..5f092318 --- /dev/null +++ b/src/Wallabag/CoreBundle/Tests/WallabagTestCase.php | |||
@@ -0,0 +1,34 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Tests; | ||
4 | |||
5 | use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; | ||
6 | use Symfony\Component\BrowserKit\Cookie; | ||
7 | use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; | ||
8 | |||
9 | class WallabagTestCase extends WebTestCase | ||
10 | { | ||
11 | private $client = null; | ||
12 | |||
13 | public function getClient() | ||
14 | { | ||
15 | return $this->client; | ||
16 | } | ||
17 | |||
18 | public function setUp() | ||
19 | { | ||
20 | $this->client = static::createClient(); | ||
21 | } | ||
22 | |||
23 | public function logIn() | ||
24 | { | ||
25 | $crawler = $this->client->request('GET', '/login'); | ||
26 | $form = $crawler->filter('button[type=submit]')->form(); | ||
27 | $data = array( | ||
28 | '_username' => 'admin', | ||
29 | '_password' => 'test', | ||
30 | ); | ||
31 | |||
32 | $this->client->submit($form, $data); | ||
33 | } | ||
34 | } | ||