Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-07 13:03:06 +02:00
Code Issues Packages Projects Releases Activity

[Refactoring] after changing from static to instance methods the is an thus does not need to be passed through any more

Browse Source
This commit is contained in:
Tobias Braner
2016-03-24 09:54:38 +01:00
parent 6f91e27389
commit 1d2c4ea2a6
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/src/Grav/Common/Grav.php
View File

@@ -398,16 +398,14 @@ class Grav extends Container
* of a Service Provider or a pair of serviceKey => serviceClass that
* gets directly mapped into the container.
*
* @param Container $container
*
* @return void
*/
protected function registerServices($container) {
protected function registerServices() {
foreach (self::$diMap as $serviceKey => $serviceClass) {
if (is_int($serviceKey)) {
$this->registerServiceProvider($container, $serviceClass);
$this->registerServiceProvider($serviceClass);
} else {
$this->registerService($container, $serviceKey, $serviceClass);
$this->registerService($serviceKey, $serviceClass);
}
}
}
@@ -415,26 +413,24 @@ class Grav extends Container
/**
* Register a service provider with the container.
*
* @param Container $container
* @param string $serviceClass
*
* @return void
*/
protected function registerServiceProvider($container, $serviceClass) {
$container->register(new $serviceClass);
protected function registerServiceProvider($serviceClass) {
$this->register(new $serviceClass);
}
/**
* Register a service with the container.
*
* @param Container $container
* @param string $serviceKey
* @param string $serviceClass
*
* @return void
*/
protected function registerService($container, $serviceKey, $serviceClass) {
$container[$serviceKey] = function ($c) use ($serviceClass) {
protected function registerService($serviceKey, $serviceClass) {
$this[$serviceKey] = function ($c) use ($serviceClass) {
return new $serviceClass($c);
};
}