diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-02-11 11:52:10 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-02-11 11:52:10 +0100 |
| commit | 874e3e10a45a5b3c662bac1112bbdc1acb0adb95 (patch) | |
| tree | 630bbdd3da57a5af0b92eea24dd2ef0f3125d785 /src | |
| parent | 70b54da2b13d4c32530ee2f634acb8453d7829a6 (diff) | |
| download | wallabag-874e3e10a45a5b3c662bac1112bbdc1acb0adb95.tar.gz wallabag-874e3e10a45a5b3c662bac1112bbdc1acb0adb95.tar.zst wallabag-874e3e10a45a5b3c662bac1112bbdc1acb0adb95.zip | |
phpdoc
Diffstat (limited to 'src')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/WallabagRestController.php | 2 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php | 4 |
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 | ||
| 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 WallabagRestControllerTest extends WebTestCase | 7 | class 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 |