diff --git a/src/Bridges/HttpDI/HttpExtension.php b/src/Bridges/HttpDI/HttpExtension.php index 0cbb6eb9..a84d6e65 100644 --- a/src/Bridges/HttpDI/HttpExtension.php +++ b/src/Bridges/HttpDI/HttpExtension.php @@ -27,28 +27,28 @@ class HttpExtension extends Nette\DI\CompilerExtension public function loadConfiguration() { - $container = $this->getContainerBuilder(); + $builder = $this->getContainerBuilder(); $config = $this->validateConfig($this->defaults); - $container->addDefinition($this->prefix('requestFactory')) + $builder->addDefinition($this->prefix('requestFactory')) ->setClass(Nette\Http\RequestFactory::class) ->addSetup('setProxy', [$config['proxy']]); - $container->addDefinition($this->prefix('request')) + $builder->addDefinition($this->prefix('request')) ->setClass(Nette\Http\Request::class) ->setFactory('@Nette\Http\RequestFactory::createHttpRequest'); - $container->addDefinition($this->prefix('response')) + $builder->addDefinition($this->prefix('response')) ->setClass(Nette\Http\Response::class); - $container->addDefinition($this->prefix('context')) + $builder->addDefinition($this->prefix('context')) ->setClass(Nette\Http\Context::class); if ($this->name === 'http') { - $container->addAlias('nette.httpRequestFactory', $this->prefix('requestFactory')); - $container->addAlias('nette.httpContext', $this->prefix('context')); - $container->addAlias('httpRequest', $this->prefix('request')); - $container->addAlias('httpResponse', $this->prefix('response')); + $builder->addAlias('nette.httpRequestFactory', $this->prefix('requestFactory')); + $builder->addAlias('nette.httpContext', $this->prefix('context')); + $builder->addAlias('httpRequest', $this->prefix('request')); + $builder->addAlias('httpResponse', $this->prefix('response')); } } diff --git a/src/Bridges/HttpDI/SessionExtension.php b/src/Bridges/HttpDI/SessionExtension.php index 894a39f8..c0d09978 100644 --- a/src/Bridges/HttpDI/SessionExtension.php +++ b/src/Bridges/HttpDI/SessionExtension.php @@ -33,11 +33,11 @@ public function __construct($debugMode = FALSE) public function loadConfiguration() { - $container = $this->getContainerBuilder(); + $builder = $this->getContainerBuilder(); $config = $this->getConfig() + $this->defaults; $this->setConfig($config); - $session = $container->addDefinition($this->prefix('session')) + $session = $builder->addDefinition($this->prefix('session')) ->setClass(Nette\Http\Session::class); if ($config['expiration']) { @@ -56,7 +56,7 @@ public function loadConfiguration() } if ($this->name === 'session') { - $container->addAlias('session', $this->prefix('session')); + $builder->addAlias('session', $this->prefix('session')); } }