Skip to content

Update package to Laravel 5.4 #1067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update package to Laravel 5.4 #1067

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Frozennode/Administrator/AdministratorServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function register()
include __DIR__.'/../../routes.php';

//the admin validator
$this->app['admin_validator'] = $this->app->share(function($app)
$this->app->singleton('admin_validator',function($app)
{
//get the original validator class so we can set it back after creating our own
$originalValidator = LValidator::make(array(), array());
Expand Down Expand Up @@ -87,35 +87,35 @@ public function register()
});

//set up the shared instances
$this->app['admin_config_factory'] = $this->app->share(function($app)
$this->app->singleton('admin_config_factory',function($app)
{
return new ConfigFactory($app->make('admin_validator'), LValidator::make(array(), array()), config('administrator'));
});

$this->app['admin_field_factory'] = $this->app->share(function($app)
$this->app->singleton('admin_field_factory',function($app)
{
return new FieldFactory($app->make('admin_validator'), $app->make('itemconfig'), $app->make('db'));
});

$this->app['admin_datatable'] = $this->app->share(function($app)
$this->app->singleton('admin_datatable',function($app)
{
$dataTable = new DataTable($app->make('itemconfig'), $app->make('admin_column_factory'), $app->make('admin_field_factory'));
$dataTable->setRowsPerPage($app->make('session.store'), config('administrator.global_rows_per_page'));

return $dataTable;
});

$this->app['admin_column_factory'] = $this->app->share(function($app)
$this->app->singleton('admin_column_factory',function($app)
{
return new ColumnFactory($app->make('admin_validator'), $app->make('itemconfig'), $app->make('db'));
});

$this->app['admin_action_factory'] = $this->app->share(function($app)
$this->app->singleton('admin_action_factory',function($app)
{
return new ActionFactory($app->make('admin_validator'), $app->make('itemconfig'), $app->make('db'));
});

$this->app['admin_menu'] = $this->app->share(function($app)
$this->app->singleton('admin_menu',function($app)
{
return new Menu($app->make('config'), $app->make('admin_config_factory'));
});
Expand Down