Skip to content

Commit

Permalink
renamed some local vars
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed May 7, 2016
1 parent d1b714e commit 9bb7dcf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions src/Bridges/HttpDI/HttpExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/Bridges/HttpDI/SessionExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']) {
Expand All @@ -56,7 +56,7 @@ public function loadConfiguration()
}

if ($this->name === 'session') {
$container->addAlias('session', $this->prefix('session'));
$builder->addAlias('session', $this->prefix('session'));
}
}

Expand Down

0 comments on commit 9bb7dcf

Please sign in to comment.