mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-13 16:05:05 +02:00
Code Issues Releases Wiki Activity

Use class constant to get qualified class names

Browse Source
This commit is contained in:
Franz Liedke
2018-12-14 01:47:54 +01:00
parent 5c9fa4c62d
commit 3e0cd3a21f
6 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Database/DatabaseServiceProvider.php
View File

@@ -12,7 +12,10 @@
namespace Flarum\Database;
use Flarum\Foundation\AbstractServiceProvider;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Database\ConnectionInterface;
use Illuminate\Database\ConnectionResolver;
use Illuminate\Database\ConnectionResolverInterface;
use Illuminate\Database\Connectors\ConnectionFactory;
class DatabaseServiceProvider extends AbstractServiceProvider
@@ -28,14 +31,14 @@ class DatabaseServiceProvider extends AbstractServiceProvider
$dbConfig = $this->app->config('database');
$dbConfig['engine'] = 'InnoDB';
$connection = $factory->make($dbConfig);
$connection->setEventDispatcher($this->app->make('Illuminate\Contracts\Events\Dispatcher'));
$connection->setEventDispatcher($this->app->make(Dispatcher::class));
return $connection;
});
$this->app->alias('flarum.db', 'Illuminate\Database\ConnectionInterface');
$this->app->alias('flarum.db', ConnectionInterface::class);
$this->app->singleton('Illuminate\Database\ConnectionResolverInterface', function () {
$this->app->singleton(ConnectionResolverInterface::class, function () {
$resolver = new ConnectionResolver([
'flarum' => $this->app->make('flarum.db'),
]);
@@ -44,7 +47,7 @@ class DatabaseServiceProvider extends AbstractServiceProvider
return $resolver;
});
$this->app->alias('Illuminate\Database\ConnectionResolverInterface', 'db');
$this->app->alias(ConnectionResolverInterface::class, 'db');
}
/**
@@ -52,7 +55,7 @@ class DatabaseServiceProvider extends AbstractServiceProvider
*/
public function boot()
{
AbstractModel::setConnectionResolver($this->app->make('Illuminate\Database\ConnectionResolverInterface'));
AbstractModel::setConnectionResolver($this->app->make(ConnectionResolverInterface::class));
AbstractModel::setEventDispatcher($this->app->make('events'));
}
}

5
src/Database/MigrationServiceProvider.php
View File

@@ -13,6 +13,7 @@ namespace Flarum\Database;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Foundation\Application;
use Illuminate\Filesystem\Filesystem;
class MigrationServiceProvider extends AbstractServiceProvider
{
@@ -21,12 +22,12 @@ class MigrationServiceProvider extends AbstractServiceProvider
*/
public function register()
{
$this->app->singleton('Flarum\Database\MigrationRepositoryInterface', function ($app) {
$this->app->singleton(MigrationRepositoryInterface::class, function ($app) {
return new DatabaseMigrationRepository($app['flarum.db'], 'migrations');
});
$this->app->bind(MigrationCreator::class, function (Application $app) {
return new MigrationCreator($app->make('Illuminate\Filesystem\Filesystem'), $app->basePath());
return new MigrationCreator($app->make(Filesystem::class), $app->basePath());
});
}
}