aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php1
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php1
-rw-r--r--tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php2
-rw-r--r--tests/Wallabag/ApiBundle/WallabagApiTestCase.php4
4 files changed, 3 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php
index fd129829..cc7d1f59 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php
@@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\DataFixtures;
4 4
5use Craue\ConfigBundle\Entity\Setting; 5use Craue\ConfigBundle\Entity\Setting;
6use Doctrine\Bundle\FixturesBundle\Fixture; 6use Doctrine\Bundle\FixturesBundle\Fixture;
7use Doctrine\Common\DataFixtures\DependentFixtureInterface;
8use Doctrine\Common\Persistence\ObjectManager; 7use Doctrine\Common\Persistence\ObjectManager;
9use Symfony\Component\DependencyInjection\ContainerAwareInterface; 8use Symfony\Component\DependencyInjection\ContainerAwareInterface;
10use Symfony\Component\DependencyInjection\ContainerInterface; 9use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php
index 803ad778..d78dd0b8 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php
@@ -3,7 +3,6 @@
3namespace Wallabag\CoreBundle\DataFixtures; 3namespace Wallabag\CoreBundle\DataFixtures;
4 4
5use Doctrine\Bundle\FixturesBundle\Fixture; 5use Doctrine\Bundle\FixturesBundle\Fixture;
6use Doctrine\Common\DataFixtures\DependentFixtureInterface;
7use Doctrine\Common\Persistence\ObjectManager; 6use Doctrine\Common\Persistence\ObjectManager;
8use Wallabag\CoreBundle\Entity\Tag; 7use Wallabag\CoreBundle\Entity\Tag;
9 8
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 176da3cd..3696f8f9 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -940,7 +940,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
940 940
941 $content = json_decode($this->client->getResponse()->getContent(), true); 941 $content = json_decode($this->client->getResponse()->getContent(), true);
942 942
943 $this->assertSame(true, $content['exists']); 943 $this->assertTrue($content['exists']);
944 } 944 }
945 945
946 public function testGetEntriesExistsWithManyUrls() 946 public function testGetEntriesExistsWithManyUrls()
diff --git a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
index a0f2f889..fd2e113e 100644
--- a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
+++ b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
@@ -54,11 +54,11 @@ abstract class WallabagApiTestCase extends WebTestCase
54 * Used because on heavy testing we don't want to re-create the database on each run. 54 * Used because on heavy testing we don't want to re-create the database on each run.
55 * Which means "admin" user won't have id 1 all the time. 55 * Which means "admin" user won't have id 1 all the time.
56 * 56 *
57 * @param string $username 57 * @param string $username
58 * 58 *
59 * @return int 59 * @return int
60 */ 60 */
61 public function getUserId($username = 'admin') 61 protected function getUserId($username = 'admin')
62 { 62 {
63 return $this->client 63 return $this->client
64 ->getContainer() 64 ->getContainer()