diff --git a/README.md b/README.md index bd8dcc70..265ff02b 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index e385eb44..fc21d05d 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -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) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 3dabc68c..052bcc0d 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -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) diff --git a/app/Http/Controllers/API/InteractionController.php b/app/Http/Controllers/API/InteractionController.php index a1dcf921..0bf87441 100644 --- a/app/Http/Controllers/API/InteractionController.php +++ b/app/Http/Controllers/API/InteractionController.php @@ -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 diff --git a/app/Http/Controllers/API/PlaylistController.php b/app/Http/Controllers/API/PlaylistController.php index d39484eb..0753d4a4 100644 --- a/app/Http/Controllers/API/PlaylistController.php +++ b/app/Http/Controllers/API/PlaylistController.php @@ -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 { diff --git a/app/Http/Controllers/API/SongController.php b/app/Http/Controllers/API/SongController.php index 82d9ed14..51dc09cf 100644 --- a/app/Http/Controllers/API/SongController.php +++ b/app/Http/Controllers/API/SongController.php @@ -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 diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php index 115b27f8..8a899445 100644 --- a/app/Http/Controllers/API/UserController.php +++ b/app/Http/Controllers/API/UserController.php @@ -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 diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index cc22dac3..e15f4e0a 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -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 { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 4eb37d58..e749914f 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -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 { diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index b424aa9a..cc03ccc1 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -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 */ diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index a338e821..b440ed6f 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -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 */ diff --git a/app/Http/Requests/API/UserStoreRequest.php b/app/Http/Requests/API/UserStoreRequest.php index e35fcb95..eaaa1982 100644 --- a/app/Http/Requests/API/UserStoreRequest.php +++ b/app/Http/Requests/API/UserStoreRequest.php @@ -24,7 +24,7 @@ class UserStoreRequest extends Request return [ 'name' => 'required', 'email' => 'required|email|unique:users', - 'password' => 'required' + 'password' => 'required', ]; } } diff --git a/app/Http/Streamers/PHPStreamer.php b/app/Http/Streamers/PHPStreamer.php index f907d1c7..41a30c52 100644 --- a/app/Http/Streamers/PHPStreamer.php +++ b/app/Http/Streamers/PHPStreamer.php @@ -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); diff --git a/app/Http/routes.php b/app/Http/routes.php index b996106c..f67c8a08 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -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'); }); diff --git a/app/Models/Artist.php b/app/Models/Artist.php index 6387d05f..932982f0 100644 --- a/app/Models/Artist.php +++ b/app/Models/Artist.php @@ -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; } diff --git a/app/Models/Interaction.php b/app/Models/Interaction.php index adb80ab8..032ebdd1 100644 --- a/app/Models/Interaction.php +++ b/app/Models/Interaction.php @@ -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 */ diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php index a7f499d8..46c491f3 100644 --- a/app/Models/Playlist.php +++ b/app/Models/Playlist.php @@ -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 { diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 84917e7f..479ae78a 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -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) { diff --git a/app/Models/User.php b/app/Models/User.php index 91849459..1efac739 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -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() { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index a3c006a5..2d32c55c 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -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); }); } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 95f64110..f5b24dc2 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -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) diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a94bd89b..a3c11f6b 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -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; diff --git a/app/Providers/MediaServiceProvider.php b/app/Providers/MediaServiceProvider.php index 12e699a8..1e5e76aa 100644 --- a/app/Providers/MediaServiceProvider.php +++ b/app/Providers/MediaServiceProvider.php @@ -24,7 +24,7 @@ class MediaServiceProvider extends ServiceProvider */ public function register() { - app()->singleton('Media', function() { + app()->singleton('Media', function () { return new Media(); }); } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 390a1646..1dd85ed3 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -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) diff --git a/app/Services/Media.php b/app/Services/Media.php index e10476a7..e50b79d3 100644 --- a/app/Services/Media.php +++ b/app/Services/Media.php @@ -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; } diff --git a/app/Traits/CanFilterByUser.php b/app/Traits/CanFilterByUser.php index 2bbba271..45d80ec7 100644 --- a/app/Traits/CanFilterByUser.php +++ b/app/Traits/CanFilterByUser.php @@ -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 { diff --git a/composer.json b/composer.json index fa84a16f..ee6a6c53 100644 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/composer.lock b/composer.lock index 68a9ddce..4430ef87 100644 --- a/composer.lock +++ b/composer.lock @@ -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", diff --git a/config/session.php b/config/session.php index 96a2fe02..c62f8d4e 100644 --- a/config/session.php +++ b/config/session.php @@ -29,7 +29,7 @@ return [ | */ - 'lifetime' => 30*24*60, + 'lifetime' => 30 * 24 * 60, 'expire_on_close' => false, diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index f8fb02b4..41d65b37 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,7 +1,7 @@ */ diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index a14053ba..5c1ea601 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,4 +1,4 @@ -@charset "urf-8"; +@charset "utf-8"; @import "partials/_vars.scss"; @import "partials/_mixins.scss"; diff --git a/server.php b/server.php index 900d472e..7df54b96 100644 --- a/server.php +++ b/server.php @@ -1,12 +1,10 @@ */ - $uri = urldecode( parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) ); diff --git a/tests/InteractionTest.php b/tests/InteractionTest.php index e7cc2f26..7115e7e3 100644 --- a/tests/InteractionTest.php +++ b/tests/InteractionTest.php @@ -1,9 +1,9 @@