Skip to content

replacing app->share with app->singleton #1063

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 2 commits into
base: v5
Choose a base branch
from
Open

replacing app->share with app->singleton #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
219e8bc
replacing app->share with app->singleton
vanandmkrtchyan Aug 25, 2017
682d970
replacing app->share with app->singleton
vanandmkrtchyan Aug 25, 2017
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"require": {
"php": ">=5.4.0",
"laravel/framework": "4.1.*"
"laravel/framework": "5.4.*"
},
"require-dev": {
"mockery/mockery": "0.9.0"
Expand Down
20 changes: 10 additions & 10 deletions src/AdministratorServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function register()
*/
protected function registerManager()
{
$this->app['admin.manager'] = $this->app->share(function($app)
$this->app->singleton('admin.manager',function($app)
{
return new Manager;
});
Expand All @@ -91,7 +91,7 @@ protected function registerManager()
*/
protected function registerValidator()
{
$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([], []);
Expand Down Expand Up @@ -122,7 +122,7 @@ protected function registerValidator()
*/
protected function registerRouteFilters()
{
$this->app['admin.routing.filter'] = $this->app->share(function($app)
$this->app->singleton('admin.routing.filter',function($app)
{
return new Filter($app);
});
Expand All @@ -145,7 +145,7 @@ protected function registerRouteFilters()
*/
protected function registerViewComposers()
{
$this->app['admin.view.composer'] = $this->app->share(function($app)
$this->app->singleton('admin.view.composer',function($app)
{
return new Composer($app);
});
Expand All @@ -170,22 +170,22 @@ protected function registerViewComposers()
protected function registerFactories()
{
//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(Config::get('administrator::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.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'));
});
Expand All @@ -196,7 +196,7 @@ protected function registerFactories()
*/
protected function registerMenu()
{
$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 All @@ -207,7 +207,7 @@ protected function registerMenu()
*/
protected function registerGrid()
{
$this->app['admin.grid'] = $this->app->share(function($app)
$this->app->singleton('admin.grid', 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::get('administrator::administrator.global.rows.per.page'));
Expand Down