aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r--src/Wallabag/CoreBundle/Controller/WallabagRestController.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index fcd212ef..3cfb8a77 100644
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -20,7 +20,7 @@ class WallabagRestController extends Controller
20 * {"name"="username", "dataType"="string", "required"=true, "description"="username"} 20 * {"name"="username", "dataType"="string", "required"=true, "description"="username"}
21 * } 21 * }
22 * ) 22 * )
23 * @return string 23 * @return array
24 */ 24 */
25 public function getSaltAction($username) 25 public function getSaltAction($username)
26 { 26 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
index cbc31621..298cf10c 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
@@ -2,9 +2,9 @@
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Wallabag\CoreBundle\Tests\Controller;
4 4
5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; 5use Wallabag\CoreBundle\Tests\WallabagTestCase;
6 6
7class WallabagRestControllerTest extends WebTestCase 7class WallabagRestControllerTest extends WallabagTestCase
8{ 8{
9 /** 9 /**
10 * Generate HTTP headers for authenticate user on API 10 * Generate HTTP headers for authenticate user on API