aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ApiBundle
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-11-09 16:31:59 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-11-09 16:31:59 +0100
commitf1eccfd63f214dcc730ab0d18a694a5465f425db (patch)
treee6cbd355f3a360e5619821fb1415ee26a01f11ce /src/Wallabag/ApiBundle
parent4529d0f4b6b20cbbd1ccb5339a753aff7d35552b (diff)
parent53cf5106891fc64f3f66cb6b3316654a9620239c (diff)
downloadwallabag-f1eccfd63f214dcc730ab0d18a694a5465f425db.tar.gz
wallabag-f1eccfd63f214dcc730ab0d18a694a5465f425db.tar.zst
wallabag-f1eccfd63f214dcc730ab0d18a694a5465f425db.zip
Merge pull request #1500 from wallabag/v2-quote-pgsql
Fix quote strategy for reserved keyword in Postgres
Diffstat (limited to 'src/Wallabag/ApiBundle')
-rw-r--r--src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php4
-rw-r--r--src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php (renamed from src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php)2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
index bc7ef489..bdd36e0c 100644
--- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
+++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
@@ -2,9 +2,9 @@
2 2
3namespace Wallabag\ApiBundle\Tests\Controller; 3namespace Wallabag\ApiBundle\Tests\Controller;
4 4
5use Wallabag\ApiBundle\Tests\AbstractControllerTest; 5use Wallabag\ApiBundle\Tests\WallabagApiTestCase;
6 6
7class WallabagRestControllerTest extends AbstractControllerTest 7class WallabagRestControllerTest extends WallabagApiTestCase
8{ 8{
9 protected static $salt; 9 protected static $salt;
10 10
diff --git a/src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php b/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php
index 09cde0f6..8a57fea2 100644
--- a/src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php
+++ b/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php
@@ -5,7 +5,7 @@ namespace Wallabag\ApiBundle\Tests;
5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; 5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
6use Symfony\Component\BrowserKit\Cookie; 6use Symfony\Component\BrowserKit\Cookie;
7 7
8abstract class AbstractControllerTest extends WebTestCase 8abstract class WallabagApiTestCase extends WebTestCase
9{ 9{
10 /** 10 /**
11 * @var Client 11 * @var Client