github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-01 14:14:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2154 from flarum/fl/2055-l58

Browse Source 
Upgrade to Laravel 5.8
This commit is contained in:
Franz Liedke 2020-05-12 15:20:01 +02:00 committed by GitHub
commit 37a30b1b81
4 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
framework/core/composer.json
View File

@ -41,21 +41,21 @@
"dflydev/fig-cookies": "^1.0.2", "dflydev/fig-cookies": "^1.0.2",
"doctrine/dbal": "^2.7", "doctrine/dbal": "^2.7",
"franzl/whoops-middleware": "^0.4.0", "franzl/whoops-middleware": "^0.4.0",
"illuminate/bus": "5.7.*", "illuminate/bus": "5.8.*",
"illuminate/cache": "5.7.*", "illuminate/cache": "5.8.*",
"illuminate/config": "5.7.*", "illuminate/config": "5.8.*",
"illuminate/container": "5.7.*", "illuminate/container": "5.8.*",
"illuminate/contracts": "5.7.*", "illuminate/contracts": "5.8.*",
"illuminate/database": "5.7.*", "illuminate/database": "5.8.*",
"illuminate/events": "5.7.*", "illuminate/events": "5.8.*",
"illuminate/filesystem": "5.7.*", "illuminate/filesystem": "5.8.*",
"illuminate/hashing": "5.7.*", "illuminate/hashing": "5.8.*",
"illuminate/mail": "5.7.*", "illuminate/mail": "5.8.*",
"illuminate/queue": "5.7.*", "illuminate/queue": "5.8.*",
"illuminate/session": "5.7.*", "illuminate/session": "5.8.*",
"illuminate/support": "5.7.*", "illuminate/support": "5.8.*",
"illuminate/validation": "5.7.*", "illuminate/validation": "5.8.*",
"illuminate/view": "5.7.*", "illuminate/view": "5.8.*",
"intervention/image": "^2.5.0", "intervention/image": "^2.5.0",
"laminas/laminas-diactoros": "^1.8.4", "laminas/laminas-diactoros": "^1.8.4",
"laminas/laminas-httphandlerrunner": "^1.0", "laminas/laminas-httphandlerrunner": "^1.0",

2
framework/core/src/Http/Middleware/HandleErrors.php
View File

@ -41,7 +41,7 @@ class HandleErrors implements Middleware
*/ */
protected $reporters; protected $reporters;
public function __construct(Registry $registry, HttpFormatter $formatter, array $reporters) public function __construct(Registry $registry, HttpFormatter $formatter, iterable $reporters)
{ {
$this->registry = $registry; $this->registry = $registry;
$this->formatter = $formatter; $this->formatter = $formatter;

8
framework/core/src/Notification/NotificationRepository.php
View File

@ -11,7 +11,6 @@ namespace Flarum\Notification;
use Carbon\Carbon; use Carbon\Carbon;
use Flarum\User\User; use Flarum\User\User;
use Illuminate\Database\Query\Expression;
class NotificationRepository class NotificationRepository
{ {
@ -36,11 +35,8 @@ class NotificationRepository
->skip($offset) ->skip($offset)
->take($limit); ->take($limit);
return Notification::select('notifications.*') return Notification::select('notifications.*', 'p.unread_count')
->selectRaw('p.unread_count') ->joinSub($primaries, 'p', 'notifications.id', '=', 'p.id')
// Expression is necessary until Laravel 5.8.
// See https://github.com/laravel/framework/pull/28400
->joinSub($primaries, 'p', 'notifications.id', '=', new Expression('p.id'))
->latest() ->latest()
->get(); ->get();
} }

24
framework/core/tests/integration/setup.php
View File

@ -14,12 +14,12 @@ use Flarum\Install\Installation;
require __DIR__.'/../../vendor/autoload.php'; require __DIR__.'/../../vendor/autoload.php';
$host = env('DB_HOST', 'localhost'); $host = getenv('DB_HOST') ?: 'localhost';
$port = intval(env('DB_PORT', 3306)); $port = intval(getenv('DB_PORT') ?: 3306);
$name = env('DB_DATABASE', 'flarum_test'); $name = getenv('DB_DATABASE') ?: 'flarum_test';
$user = env('DB_USERNAME', 'root'); $user = getenv('DB_USERNAME') ?: 'root';
$pass = env('DB_PASSWORD', ''); $pass = getenv('DB_PASSWORD') ?: '';
$pref = env('DB_PREFIX', ''); $pref = getenv('DB_PREFIX') ?: '';
echo "Connecting to database $name at $host:$port.\n"; echo "Connecting to database $name at $host:$port.\n";
echo "Logging in as $user with password '$pass'.\n"; echo "Logging in as $user with password '$pass'.\n";
@ -48,15 +48,9 @@ $pipeline = $installation
->configPath('config.php') ->configPath('config.php')
->debugMode(true) ->debugMode(true)
->baseUrl(BaseUrl::fromString('http://localhost')) ->baseUrl(BaseUrl::fromString('http://localhost'))
->databaseConfig(new DatabaseConfig( ->databaseConfig(
'mysql', new DatabaseConfig('mysql', $host, $port, $name, $user, $pass, $pref)
env('DB_HOST', 'localhost'), )
intval(env('DB_PORT', 3306)),
env('DB_DATABASE', 'flarum_test'),
env('DB_USERNAME', 'root'),
env('DB_PASSWORD', ''),
env('DB_PREFIX', '')
))
->adminUser(new AdminUser( ->adminUser(new AdminUser(
'admin', 'admin',
'secret', 'secret',