mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-22 21:18:00 +01:00
Updates following 5.6 shift
This commit is contained in:
Adam Lavin
parent
6dbe58a2b5
commit
76a01273f6
12 changed files with 1494 additions and 1000 deletions
|
|
@ -63,11 +63,11 @@ class AppServiceProvider extends ServiceProvider
|
|||
// any weirdness with merging array indices. $merge = false is
|
||||
// set below so that no morphMap array merging happens!
|
||||
Relation::morphMap([
|
||||
App\Models\Activity::TARGET_TRACK => App\Models\Track::class,
|
||||
App\Models\Activity::TARGET_ALBUM => App\Models\Album::class,
|
||||
App\Models\Activity::TARGET_PLAYLIST => App\Models\Playlist::class,
|
||||
App\Models\Activity::TARGET_USER => App\Models\User::class,
|
||||
App\Models\Activity::TARGET_COMMENT => App\Models\Comment::class,
|
||||
\App\Models\Activity::TARGET_TRACK => \App\Models\Track::class,
|
||||
\App\Models\Activity::TARGET_ALBUM => \App\Models\Album::class,
|
||||
\App\Models\Activity::TARGET_PLAYLIST => \App\Models\Playlist::class,
|
||||
\App\Models\Activity::TARGET_USER => \App\Models\User::class,
|
||||
\App\Models\Activity::TARGET_COMMENT => \App\Models\Comment::class,
|
||||
], false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,37 +10,34 @@
|
|||
"license": "AGPL",
|
||||
"type": "project",
|
||||
"require": {
|
||||
"php": ">=7.0.1",
|
||||
"php": "^7.1.3",
|
||||
"laravel/framework": "5.6.*",
|
||||
"codescale/ffmpeg-php": "2.7.0",
|
||||
"intouch/laravel-newrelic": "*",
|
||||
"barryvdh/laravel-ide-helper": "^2.1",
|
||||
"barryvdh/laravel-ide-helper": "v2.8.0",
|
||||
"guzzlehttp/guzzle": "~6.0",
|
||||
"doctrine/dbal": "2.5.*",
|
||||
"venturecraft/revisionable": "^1.23",
|
||||
"venturecraft/revisionable": "^1.36",
|
||||
"pda/pheanstalk": "~3.0",
|
||||
"cviebrock/laravel-elasticsearch": "^1.0",
|
||||
"barryvdh/laravel-debugbar": "~2.4",
|
||||
"cviebrock/laravel-elasticsearch": "4.0.0",
|
||||
"barryvdh/laravel-debugbar": "~3.4",
|
||||
"predis/predis": "^1.0",
|
||||
"ksubileau/color-thief-php": "^1.3",
|
||||
"graham-campbell/exceptions": "^10.0",
|
||||
"graham-campbell/exceptions": "^12.0",
|
||||
"minishlink/web-push": "^1.0",
|
||||
"alsofronie/eloquent-uuid": "^1.0",
|
||||
"poniverse/api": "dev-rewrite",
|
||||
"barryvdh/laravel-cors": "^0.10",
|
||||
"fruitcake/laravel-cors": "2.0.1",
|
||||
"laravel/tinker": "^1.0",
|
||||
"doctrine/collections": "v1.4.*",
|
||||
"doctrine/annotations": "v1.4.*",
|
||||
"doctrine/cache": "v1.6.*",
|
||||
"doctrine/instantiator": "1.0.*",
|
||||
"fideloper/proxy": "^4.0"
|
||||
"doctrine/instantiator": "1.0.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"fzaninotto/faker": "~1.4",
|
||||
"mockery/mockery": "^1.0",
|
||||
"phpunit/phpunit": "^7.0",
|
||||
"phpspec/phpspec": "~2.1",
|
||||
"filp/whoops": "^2.1",
|
||||
"filp/whoops": "^2.0",
|
||||
"symfony/dom-crawler": "~3.1",
|
||||
"symfony/css-selector": "~3.1",
|
||||
"laravel/browser-kit-testing": "2.*",
|
||||
|
|
|
|||
2385
composer.lock
generated
2385
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -163,7 +163,6 @@ return [
|
|||
App\Providers\AuthServiceProvider::class,
|
||||
App\Providers\NotificationServiceProvider::class,
|
||||
|
||||
Intouch\LaravelNewrelic\NewrelicServiceProvider::class,
|
||||
Cviebrock\LaravelElasticsearch\ServiceProvider::class,
|
||||
Poniverse\Lib\PoniverseServiceProvider::class,
|
||||
],
|
||||
|
|
@ -215,7 +214,6 @@ return [
|
|||
'View' => Illuminate\Support\Facades\View::class,
|
||||
|
||||
'Elasticsearch' => Cviebrock\LaravelElasticsearch\Facade::class,
|
||||
'Newrelic' => Intouch\LaravelNewrelic\Facades\Newrelic::class,
|
||||
'Notification' => App\Facades\Notification::class,
|
||||
|
||||
],
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ return [
|
|||
'providers' => [
|
||||
'users' => [
|
||||
'driver' => 'eloquent',
|
||||
'model' => App\User::class,
|
||||
'model' => App\Models\User::class,
|
||||
],
|
||||
|
||||
// 'users' => [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'default' => env('DB_CONNECTION', 'mysql'),
|
||||
'default' => env('DB_CONNECTION', 'pgsql'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
@ -39,6 +39,12 @@ return [
|
|||
'prefix' => '',
|
||||
],
|
||||
|
||||
'memory' => [
|
||||
'driver' => 'sqlite',
|
||||
'database' => ':memory:',
|
||||
'prefix' => '',
|
||||
],
|
||||
|
||||
'mysql' => [
|
||||
'driver' => 'mysql',
|
||||
'host' => env('DB_HOST', '127.0.0.1'),
|
||||
|
|
@ -56,11 +62,11 @@ return [
|
|||
|
||||
'pgsql' => [
|
||||
'driver' => 'pgsql',
|
||||
'host' => env('DB_HOST', '127.0.0.1'),
|
||||
'port' => env('DB_PORT', '5432'),
|
||||
'database' => env('DB_DATABASE', 'forge'),
|
||||
'username' => env('DB_USERNAME', 'forge'),
|
||||
'password' => env('DB_PASSWORD', ''),
|
||||
'host' => env('POSTGRESQL_DB_HOST', '127.0.0.1'),
|
||||
'port' => env('POSTGRESQL_DB_PORT', '5432'),
|
||||
'database' => env('POSTGRESQL_DB_DATABASE', 'forge'),
|
||||
'username' => env('POSTGRESQL_DB_USERNAME', 'forge'),
|
||||
'password' => env('POSTGRESQL_DB_PASSWORD', ''),
|
||||
'charset' => 'utf8',
|
||||
'prefix' => '',
|
||||
'schema' => 'public',
|
||||
|
|
|
|||
|
|
@ -48,6 +48,11 @@ return [
|
|||
'root' => storage_path('app'),
|
||||
],
|
||||
|
||||
'testing' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app').'/test-files',
|
||||
],
|
||||
|
||||
'public' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app/public'),
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ return [
|
|||
*/
|
||||
|
||||
'from' => [
|
||||
'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
|
||||
'name' => env('MAIL_FROM_NAME', 'Example'),
|
||||
'address' => env('MAIL_FROM_ADDRESS', 'hello@pony.fm'),
|
||||
'name' => env('MAIL_FROM_NAME', 'Pony.fm'),
|
||||
],
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default NewRelic Integration Settings
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
/*
|
||||
* Will automatically name transactions in NewRelic,
|
||||
* using the Laravel route name, action or request.
|
||||
*
|
||||
* Set this to false to use the NewRelic default naming
|
||||
* scheme, or to set your own in your application.
|
||||
*/
|
||||
'auto_name_transactions' => true,
|
||||
|
||||
/*
|
||||
* Define the name used when automatically naming transactions.
|
||||
* a token string:
|
||||
* a pattern you define yourself, available tokens:
|
||||
* {controller} = Controller@action or Closure@path
|
||||
* {method} = GET / POST / etc.
|
||||
* {route} = route name if named, otherwise same as {controller}
|
||||
* {path} = the registered route path (includes variable names)
|
||||
* {uri} = the actual URI requested
|
||||
* anything that is not a matched token will remain a string literal
|
||||
* example:
|
||||
* "GET /world" with pattern 'hello {path} you really {method} me' would return:
|
||||
* 'hello /world you really GET me'
|
||||
*/
|
||||
'name_provider' => '{route}',
|
||||
|
||||
/*
|
||||
* Will cause an exception to be thrown if the NewRelic
|
||||
* PHP agent is not found / installed
|
||||
*/
|
||||
'throw_if_not_installed' => false,
|
||||
|
||||
];
|
||||
|
|
@ -79,7 +79,7 @@ return [
|
|||
*/
|
||||
|
||||
'failed' => [
|
||||
'database' => env('DB_CONNECTION', 'mysql'),
|
||||
'database' => env('DB_CONNECTION', 'pgsql'),
|
||||
'table' => 'failed_jobs',
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ return [
|
|||
],
|
||||
|
||||
'stripe' => [
|
||||
'model' => App\User::class,
|
||||
'model' => App\Models\User::class,
|
||||
'key' => env('STRIPE_KEY'),
|
||||
'secret' => env('STRIPE_SECRET'),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
<php>
|
||||
<env name="APP_ENV" value="testing"/>
|
||||
<env name="APP_KEY" value="CMOxJYitit2cFgI9FbbxJJpWxBBZl6RU"/>
|
||||
<env name="BCRYPT_ROUNDS" value="4"/>
|
||||
<env name="CACHE_DRIVER" value="array"/>
|
||||
<env name="SESSION_DRIVER" value="array"/>
|
||||
<env name="QUEUE_DRIVER" value="sync"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue