Merge branch 'master' of github.com:phanan/koel

This commit is contained in:
Phan An 2017-12-10 01:23:11 +01:00
commit d2a535bcc1
8 changed files with 41 additions and 25 deletions

View file

@ -7,7 +7,6 @@ use Exception;
use Illuminate\Http\JsonResponse;
use JWTAuth;
use Log;
use Tymon\JWTAuth\Exceptions\JWTException;
class AuthController extends Controller
{

View file

@ -65,8 +65,9 @@ class PlaylistController extends Controller
* @param PlaylistSyncRequest $request
* @param Playlist $playlist
*
* @return JsonResponse
* @throws AuthorizationException
*
* @return JsonResponse
*/
public function sync(PlaylistSyncRequest $request, Playlist $playlist)
{
@ -82,8 +83,9 @@ class PlaylistController extends Controller
*
* @param Playlist $playlist
*
* @return JsonResponse
* @throws AuthorizationException
*
* @return JsonResponse
*/
public function getSongs(Playlist $playlist)
{

View file

@ -111,8 +111,9 @@ class Download
/**
* @param Playlist $playlist
*
* @return string
* @throws Exception
*
* @return string
*/
protected function fromPlaylist(Playlist $playlist)
{
@ -122,8 +123,9 @@ class Download
/**
* @param Album $album
*
* @return string
* @throws Exception
*
* @return string
*/
protected function fromAlbum(Album $album)
{
@ -133,8 +135,9 @@ class Download
/**
* @param Artist $artist
*
* @return string
* @throws Exception
*
* @return string
*/
protected function fromArtist(Artist $artist)
{

View file

@ -237,6 +237,7 @@ class Media
/**
* Tidy up the library by deleting empty albums and artists.
*
* @throws Exception
*/
public function tidy()

View file

@ -44,6 +44,7 @@ class InteractionTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function user_can_like_and_unlike_a_song()
@ -73,6 +74,7 @@ class InteractionTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function user_can_like_and_unlike_songs_in_batch()

View file

@ -25,6 +25,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function songs_can_be_synced()
@ -91,6 +92,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function songs_can_be_force_synced()
@ -129,6 +131,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function songs_can_be_synced_with_selectively_tags()
@ -158,6 +161,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function all_tags_are_catered_for_if_syncing_new_file()
@ -183,6 +187,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function added_song_is_synced_when_watching()
@ -198,6 +203,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function deleted_song_is_synced_when_watching()
@ -214,6 +220,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function deleted_directory_is_synced_when_watching()
@ -256,6 +263,7 @@ class MediaTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function hidden_files_can_optionally_be_ignored_when_syncing()

View file

@ -18,6 +18,7 @@ class YouTubeTest extends TestCase
/**
* @test
*
* @throws \Exception
*/
public function videos_can_be_searched_from_youtube()