Commit 5775fdb0 authored by Fabien Potencier's avatar Fabien Potencier

minor #1004 Register clean up (henrikbjorn)

This PR was squashed before being merged into the 2.0.x-dev branch (closes #1004).

Discussion
----------

Register clean up

Commits
-------

354b7663 Register clean up
parents 0328d904 354b7663
...@@ -143,11 +143,7 @@ class Application extends Container implements HttpKernelInterface, TerminableIn ...@@ -143,11 +143,7 @@ class Application extends Container implements HttpKernelInterface, TerminableIn
{ {
$this->providers[] = $provider; $this->providers[] = $provider;
$provider->register($this); parent::register($provider, $values);
foreach ($values as $key => $value) {
$this[$key] = $value;
}
return $this; return $this;
} }
...@@ -160,17 +156,19 @@ class Application extends Container implements HttpKernelInterface, TerminableIn ...@@ -160,17 +156,19 @@ class Application extends Container implements HttpKernelInterface, TerminableIn
*/ */
public function boot() public function boot()
{ {
if (!$this->booted) { if ($this->booted) {
$this->booted = true; return;
}
foreach ($this->providers as $provider) { $this->booted = true;
if ($provider instanceof EventListenerProviderInterface) {
$provider->subscribe($this, $this['dispatcher']); foreach ($this->providers as $provider) {
} if ($provider instanceof EventListenerProviderInterface) {
$provider->subscribe($this, $this['dispatcher']);
}
if ($provider instanceof BootableProviderInterface) { if ($provider instanceof BootableProviderInterface) {
$provider->boot($this); $provider->boot($this);
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment