Mirrors/koel
2
0
Fork 0
mirror of https://github.com/koel/koel synced 2024-11-24 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
Pedro Borges 2015-12-14 16:12:20 -02:00
commit d21736d59d
51 changed files with 126 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -2,6 +2,6 @@
![Showcase](http://koel.phanan.net/dist/img/showcase.png)
**Koel** (also styled as **koel**, with a lowercase k) is a simple web-based personal audio streaming service written in [Vue](http://vuejs.org/) at the client side and [Laravel](http://laravel.com/) on server side. Targetting web developers, Koel embraces some of the more modern web technologies – flexbox, audio and drag-and-drop API to name a few – to do its job.
**Koel** (also styled as **koel**, with a lowercase k) is a simple web-based personal audio streaming service written in [Vue](http://vuejs.org/) at the client side and [Laravel](http://laravel.com/) on server side. Targeting web developers, Koel embraces some of the more modern web technologies – flexbox, audio and drag-and-drop API to name a few – to do its job.
For system requirements, installation guides, as well as other documentation, head over to [Wiki](https://github.com/phanan/koel/wiki).

3
app/Console/Kernel.php
View file

@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*/
protected function schedule(Schedule $schedule)

10
app/Exceptions/Handler.php
View file

@ -4,9 +4,9 @@ namespace App\Exceptions;
use Exception;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
class Handler extends ExceptionHandler
{
@ -25,7 +25,8 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param \Exception $e
*
* @return void
*/
public function report(Exception $e)
@ -36,8 +37,9 @@ class Handler extends ExceptionHandler
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @param \Illuminate\Http\Request $request
* @param \Exception $e
*
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)

2
app/Http/Controllers/API/InteractionController.php
View file

@ -2,8 +2,8 @@
namespace App\Http\Controllers\API;
use App\Models\Interaction;
use App\Http\Requests\API\BatchInteractionRequest;
use App\Models\Interaction;
use Illuminate\Http\Request;
class InteractionController extends Controller

4
app/Http/Controllers/API/PlaylistController.php
View file

@ -2,9 +2,9 @@
namespace App\Http\Controllers\API;
use Illuminate\Http\Request;
use App\Models\Playlist;
use App\Http\Requests\API\PlaylistStoreRequest;
use App\Models\Playlist;
use Illuminate\Http\Request;
class PlaylistController extends Controller
{

2
app/Http/Controllers/API/SongController.php
View file

@ -2,8 +2,8 @@
namespace App\Http\Controllers\API;
use App\Http\Streamers\XSendFileStreamer;
use App\Http\Streamers\PHPStreamer;
use App\Http\Streamers\XSendFileStreamer;
use App\Models\Song;
class SongController extends Controller

4
app/Http/Controllers/API/UserController.php
View file

@ -2,10 +2,10 @@
namespace App\Http\Controllers\API;
use App\Models\User;
use App\Http\Requests\API\ProfileUpdateRequest;
use App\Http\Requests\API\UserStoreRequest;
use App\Http\Requests\API\UserUpdateRequest;
use App\Http\Requests\API\ProfileUpdateRequest;
use App\Models\User;
use Hash;
class UserController extends Controller

6
app/Http/Controllers/Auth/AuthController.php
View file

@ -2,11 +2,11 @@
namespace App\Http\Controllers\Auth;
use App\User;
use Validator;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use App\User;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Validator;
class AuthController extends Controller
{

6
app/Http/Controllers/Controller.php
View file

@ -2,10 +2,10 @@
namespace App\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
abstract class Controller extends BaseController
{

6
app/Http/Middleware/Authenticate.php
View file

@ -17,7 +17,7 @@ class Authenticate
/**
* Create a new filter instance.
*
* @param Guard $auth
* @param Guard $auth
*/
public function __construct(Guard $auth)
{
@ -27,8 +27,8 @@ class Authenticate
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/

6
app/Http/Middleware/RedirectIfAuthenticated.php
View file

@ -17,7 +17,7 @@ class RedirectIfAuthenticated
/**
* Create a new filter instance.
*
* @param Guard $auth
* @param Guard $auth
*/
public function __construct(Guard $auth)
{
@ -27,8 +27,8 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/

2
app/Http/Requests/API/UserStoreRequest.php
View file

@ -24,7 +24,7 @@ class UserStoreRequest extends Request
return [
'name' => 'required',
'email' => 'required|email|unique:users',
'password' => 'required'
'password' => 'required',
];
}
}

2
app/Http/Streamers/PHPStreamer.php
View file

@ -102,7 +102,7 @@ class PHPStreamer extends BaseStreamer implements StreamerInterface
// Read in blocks of 8KB so we don't chew up memory on the server
$read = ($length > 8192) ? 8192 : $length;
$length -= $read;
print(fread($fp, $read));
echo fread($fp, $read);
}
fclose($fp);

6
app/Http/routes.php
View file

@ -30,9 +30,9 @@ Route::group(['prefix' => 'api', 'middleware' => 'auth', 'namespace' => 'API'],
post('interaction/batch/like', 'InteractionController@batchLike');
post('interaction/batch/unlike', 'InteractionController@batchUnlike');
resource('playlist', 'PlaylistController');
put('playlist/{playlist}/sync', 'PlaylistController@sync')->where(['playlist' => '\d+']);
resource('playlist', 'PlaylistController', ['only' => ['store', 'update', 'destroy']]);
put('playlist/{id}/sync', 'PlaylistController@sync')->where(['id' => '\d+']);
resource('user', 'UserController');
resource('user', 'UserController', ['only' => ['store', 'update', 'destroy']]);
put('me', 'UserController@updateProfile');
});

2
app/Models/Artist.php
View file

@ -21,7 +21,7 @@ class Artist extends Model
return $this->hasMany(Album::class);
}
public function getNameAttribute($value)
public function getNameAttribute($value)
{
return $value ?: self::UNKNOWN_NAME;
}

14
app/Models/Interaction.php
View file

@ -2,9 +2,9 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Traits\CanFilterByUser;
use DB;
use Illuminate\Database\Eloquent\Model;
/**
* @property bool liked
@ -36,7 +36,7 @@ class Interaction extends Model
/**
* Increase the number of times a song is played by a user.
*
* @param string $songId
* @param string $songId
* @param int|null $userId
*
* @return Interaction
@ -61,7 +61,7 @@ class Interaction extends Model
/**
* Like or unlike a song on behalf of a user.
*
* @param string $songId
* @param string $songId
* @param int|null $userId
*
* @return Interaction
@ -86,8 +86,8 @@ class Interaction extends Model
/**
* Like several songs at once.
*
* @param array $songIds
* @param int|null $userId
* @param array $songIds
* @param int|null $userId
*
* @return array
*/
@ -117,8 +117,8 @@ class Interaction extends Model
/**
* Unlike several songs at once.
*
* @param array $songIds
* @param int|null $userId
* @param array $songIds
* @param int|null $userId
*
* @return int
*/

2
app/Models/Playlist.php
View file

@ -2,8 +2,8 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Traits\CanFilterByUser;
use Illuminate\Database\Eloquent\Model;
class Playlist extends Model
{

5
app/Models/Setting.php
View file

@ -2,10 +2,8 @@
namespace App\Models;
use App\Facades\Media;
use Illuminate\Database\Eloquent\Model;
class Setting extends Model
{
protected $primaryKey = 'key';
@ -35,8 +33,7 @@ class Setting extends Model
*
* @param string|array $key The key of the setting, or an associative array of settings,
* in which case $value will be discarded.
* @param mixed $value
*
* @param mixed $value
*/
public static function set($key, $value = null)
{

11
app/Models/User.php
View file

@ -3,14 +3,15 @@
namespace App\Models;
use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Auth\Access\Authorizable;
class User extends Model implements AuthenticatableContract,
class User extends Model implements
AuthenticatableContract,
AuthorizableContract,
CanResetPasswordContract
{
@ -39,7 +40,7 @@ class User extends Model implements AuthenticatableContract,
*
* @var array
*/
protected $hidden = ['password', 'remember_token', 'created_at', 'updated_at' ];
protected $hidden = ['password', 'remember_token', 'created_at', 'updated_at'];
public function playlists()
{

4
app/Providers/AppServiceProvider.php
View file

@ -15,8 +15,8 @@ class AppServiceProvider extends ServiceProvider
public function boot()
{
// Add some custom validation rules
Validator::extend('valid_path', function($attribute, $value, $parameters, $validator) {
return (is_dir($value) && is_readable($value));
Validator::extend('valid_path', function ($attribute, $value, $parameters, $validator) {
return is_dir($value) && is_readable($value);
});
}

3
app/Providers/AuthServiceProvider.php
View file

@ -24,7 +24,8 @@ class AuthServiceProvider extends ServiceProvider
/**
* Register any application authentication / authorization services.
*
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
*
* @return void
*/
public function boot(GateContract $gate)

2
app/Providers/EventServiceProvider.php
View file

@ -3,8 +3,8 @@
namespace App\Providers;
use App\Facades\Media;
use App\Models\Song;
use App\Models\Album;
use App\Models\Song;
use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;

2
app/Providers/MediaServiceProvider.php
View file

@ -24,7 +24,7 @@ class MediaServiceProvider extends ServiceProvider
*/
public function register()
{
app()->singleton('Media', function() {
app()->singleton('Media', function () {
return new Media();
});
}

7
app/Providers/RouteServiceProvider.php
View file

@ -5,6 +5,7 @@ namespace App\Providers;
use App\Models\User;
use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Routing\Router;
class RouteServiceProvider extends ServiceProvider
{
@ -20,7 +21,8 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define your route model bindings, pattern filters, etc.
*
* @param \Illuminate\Routing\Router $router
* @param \Illuminate\Routing\Router $router
*
* @return void
*/
public function boot(Router $router)
@ -34,7 +36,8 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define the routes for the application.
*
* @param \Illuminate\Routing\Router $router
* @param \Illuminate\Routing\Router $router
*
* @return void
*/
public function map(Router $router)

8
app/Services/Media.php
View file

@ -2,17 +2,17 @@
namespace App\Services;
use App\Console\Commands\SyncMedia;
use App\Models\Album;
use App\Models\Artist;
use App\Models\Setting;
use App\Models\Song;
use Exception;
use getID3;
use getid3_lib;
use Exception;
use Illuminate\Support\Facades\Log;
use Symfony\Component\Finder\SplFileInfo;
use Symfony\Component\Finder\Finder;
use App\Console\Commands\SyncMedia;
use Symfony\Component\Finder\SplFileInfo;
class Media
{
@ -158,7 +158,7 @@ class Media
// We'll still prefer getting ID3v2 tags directly later.
// Read on.
getid3_lib::CopyTagsToComments($info);
if (!isset($info['playtime_seconds'])) {
return;
}

2
app/Traits/CanFilterByUser.php
View file

@ -4,8 +4,6 @@ namespace App\Traits;
/**
* Indicate that a (Model) object collection can be filtered by the current authenticated user.
*
* @package App\Traits
*/
trait CanFilterByUser
{

5
composer.json
View file

@ -12,7 +12,7 @@
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1",
"barryvdh/laravel-ide-helper": "^2.1",
"phanan/cascading-config": "~2.0"
@ -33,7 +33,8 @@
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
"php artisan optimize",
"php -r \"if (!file_exists('.env')) copy('.env.example', '.env');\""
],
"pre-update-cmd": [
"php artisan clear-compiled"

140
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "214210ccfea435b9b1935b61e9423e57",
"content-hash": "b8a1d73c0af4d7130181c201436a442d",
"hash": "d6bc7d442de58681377bb1c28e216590",
"content-hash": "6ae1cb335a5047084101d16a3b864ac8",
"packages": [
{
"name": "classpreloader/classpreloader",
@ -2190,48 +2190,6 @@
],
"time": "2015-04-02 19:54:00"
},
{
"name": "myclabs/deep-copy",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e3abefcd7f106677fd352cd7c187d6c969aa9ddc",
"reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"doctrine/collections": "1.*",
"phpunit/phpunit": "~4.1"
},
"type": "library",
"autoload": {
"psr-4": {
"DeepCopy\\": "src/DeepCopy/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Create deep copies (clones) of your objects",
"homepage": "https://github.com/myclabs/DeepCopy",
"keywords": [
"clone",
"copy",
"duplicate",
"object",
"object graph"
],
"time": "2015-11-07 22:20:37"
},
{
"name": "phanan/cascading-config",
"version": "2.0.0",
@ -2503,20 +2461,20 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "3.0.2",
"version": "2.2.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "f7bb5cddf4ffe113eeb737b05241adb947b43f9d"
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7bb5cddf4ffe113eeb737b05241adb947b43f9d",
"reference": "f7bb5cddf4ffe113eeb737b05241adb947b43f9d",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
"shasum": ""
},
"require": {
"php": ">=5.6",
"php": ">=5.3.3",
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "~1.3",
@ -2525,7 +2483,7 @@
},
"require-dev": {
"ext-xdebug": ">=2.1.4",
"phpunit/phpunit": "~5"
"phpunit/phpunit": "~4"
},
"suggest": {
"ext-dom": "*",
@ -2535,7 +2493,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
"dev-master": "2.2.x-dev"
}
},
"autoload": {
@ -2561,7 +2519,7 @@
"testing",
"xunit"
],
"time": "2015-11-12 21:08:20"
"time": "2015-10-06 15:47:00"
},
{
"name": "phpunit/php-file-iterator",
@ -2743,16 +2701,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.1.3",
"version": "4.8.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "c047ff05d2279404af9a7e89e2a7151c32c88022"
"reference": "ea76b17bced0500a28098626b84eda12dbcf119c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c047ff05d2279404af9a7e89e2a7151c32c88022",
"reference": "c047ff05d2279404af9a7e89e2a7151c32c88022",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c",
"reference": "ea76b17bced0500a28098626b84eda12dbcf119c",
"shasum": ""
},
"require": {
@ -2761,20 +2719,18 @@
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
"myclabs/deep-copy": "~1.3",
"php": ">=5.6",
"php": ">=5.3.3",
"phpspec/prophecy": "^1.3.1",
"phpunit/php-code-coverage": "~3.0",
"phpunit/php-code-coverage": "~2.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": ">=1.0.6",
"phpunit/phpunit-mock-objects": ">=3.0.5",
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
"sebastian/environment": "~1.3",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
"sebastian/resource-operations": "~1.0",
"sebastian/version": "~1.0",
"symfony/yaml": "~2.1|~3.0"
},
@ -2787,7 +2743,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.1.x-dev"
"dev-master": "4.8.x-dev"
}
},
"autoload": {
@ -2813,30 +2769,30 @@
"testing",
"xunit"
],
"time": "2015-12-10 07:54:54"
"time": "2015-12-12 07:45:58"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "3.0.6",
"version": "2.3.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "49bc700750196c04dd6bc2c4c99cb632b893836b"
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/49bc700750196c04dd6bc2c4c99cb632b893836b",
"reference": "49bc700750196c04dd6bc2c4c99cb632b893836b",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": ">=5.6",
"php": ">=5.3.3",
"phpunit/php-text-template": "~1.2",
"sebastian/exporter": "~1.2"
},
"require-dev": {
"phpunit/phpunit": "~5"
"phpunit/phpunit": "~4.4"
},
"suggest": {
"ext-soap": "*"
@ -2844,7 +2800,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
"dev-master": "2.3.x-dev"
}
},
"autoload": {
@ -2869,7 +2825,7 @@
"mock",
"xunit"
],
"time": "2015-12-08 08:47:06"
"time": "2015-10-02 06:51:40"
},
{
"name": "sebastian/comparator",
@ -3207,48 +3163,6 @@
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2015-11-11 19:50:13"
},
{
"name": "sebastian/resource-operations",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"shasum": ""
},
"require": {
"php": ">=5.6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2015-07-28 20:34:47"
},
{
"name": "sebastian/version",
"version": "1.0.6",

2
config/session.php
View file

@ -29,7 +29,7 @@ return [
|
*/
'lifetime' => 30*24*60,
'lifetime' => 30 * 24 * 60,
'expire_on_close' => false,

2
database/migrations/2014_10_12_000000_create_users_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateUsersTable extends Migration
{

2
database/migrations/2014_10_12_100000_create_password_resets_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePasswordResetsTable extends Migration
{

2
database/migrations/2015_11_23_074600_create_artists_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateArtistsTable extends Migration
{

2
database/migrations/2015_11_23_074709_create_albums_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateAlbumsTable extends Migration
{

2
database/migrations/2015_11_23_074713_create_songs_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateSongsTable extends Migration
{

2
database/migrations/2015_11_23_074723_create_playlists_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePlaylistsTable extends Migration
{

2
database/migrations/2015_11_23_074733_create_interactions_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateInteractionsTable extends Migration
{

2
database/migrations/2015_11_23_082854_create_playlist_song_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePlaylistSongTable extends Migration
{

2
database/migrations/2015_11_25_033351_create_settings_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateSettingsTable extends Migration
{

2
database/seeds/AlbumTableSeeder.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Seeder;
use App\Models\Album;
use App\Models\Artist;
use Illuminate\Database\Seeder;
class AlbumTableSeeder extends Seeder
{

2
database/seeds/ArtistTableSeeder.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Seeder;
use App\Models\Artist;
use Illuminate\Database\Seeder;
class ArtistTableSeeder extends Seeder
{

2
database/seeds/DatabaseSeeder.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Seeder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder
{

2
database/seeds/SettingTableSeeder.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Seeder;
use App\Models\Setting;
use Illuminate\Database\Seeder;
class SettingTableSeeder extends Seeder
{

2
database/seeds/UserTableSeeder.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Seeder;
use App\Models\User;
use Illuminate\Database\Seeder;
class UserTableSeeder extends Seeder
{

3
index.php
View file

@ -1,9 +1,8 @@
<?php
/**
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans.
*
* @package Laravel
* @author Taylor Otwell <taylorotwell@gmail.com>
*/

2
resources/assets/sass/app.scss
View file

@ -1,4 +1,4 @@
@charset "urf-8";
@charset "utf-8";
@import "partials/_vars.scss";
@import "partials/_mixins.scss";

4
server.php
View file

@ -1,12 +1,10 @@
<?php
/**
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans.
*
* @package Laravel
* @author Taylor Otwell <taylorotwell@gmail.com>
*/
$uri = urldecode(
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
);

4
tests/InteractionTest.php
View file

@ -1,9 +1,9 @@
<?php
use App\Models\Song;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithoutMiddleware;
use App\Models\User;
use App\Models\Song;
class InteractionTest extends TestCase
{

4
tests/MediaTest.php
View file

@ -1,10 +1,10 @@
<?php
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithoutMiddleware;
use App\Models\Album;
use App\Models\Song;
use App\Services\Media;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithoutMiddleware;
class MediaTest extends TestCase
{

8
tests/PlaylistTest.php
View file

@ -1,10 +1,10 @@
<?php
use Illuminate\Foundation\Testing\WithoutMiddleware;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use App\Models\User;
use App\Models\Song;
use App\Models\Playlist;
use App\Models\Song;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithoutMiddleware;
class PlaylistTest extends TestCase
{

8
tests/TestCase.php
View file

@ -1,11 +1,11 @@
<?php
use Illuminate\Support\Facades\Artisan;
use Illuminate\Foundation\Testing\TestCase as IlluminateTestCase;
use App\Models\User;
use App\Models\Artist;
use App\Models\Album;
use App\Models\Artist;
use App\Models\Song;
use App\Models\User;
use Illuminate\Foundation\Testing\TestCase as IlluminateTestCase;
use Illuminate\Support\Facades\Artisan;
abstract class TestCase extends IlluminateTestCase
{

6
tests/UserTest.php
View file

@ -1,12 +1,12 @@
<?php
use Illuminate\Foundation\Testing\WithoutMiddleware;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithoutMiddleware;
class UserTest extends TestCase
{
use WithoutMiddleware;
use WithoutMiddleware, DatabaseTransactions;
public function testCreateUser()
{