extensions: updated for recent nette/di

nette · Feb 6, 2015 · b7c910a · b7c910a
1 parent 6516241
commit b7c910a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -81,15 +81,14 @@ public function beforeCompile()
  $container = $this->getContainerBuilder();
  $all = array();
 
- foreach ($container->findByType('Nette\Application\IPresenter', FALSE) as $name) {
- $def = $container->getDefinition($name);
- $all[strtolower($def->getClass())] = $def;
+ foreach ($container->findByType('Nette\Application\IPresenter') as $def) {
+ $all[$def->getClass()] = $def;
  }
 
  $counter = 0;
  foreach ($this->findPresenters() as $class) {
- if (empty($all[$tmp = strtolower($class)])) {
- $all[$tmp] = $container->addDefinition($this->prefix(++$counter))->setClass($class);
+ if (empty($all[$class])) {
+ $all[$class] = $container->addDefinition($this->prefix(++$counter))->setClass($class);
  }
  }
 

diff --git a/src/Bridges/ApplicationDI/RoutingExtension.php b/src/Bridges/ApplicationDI/RoutingExtension.php
@@ -67,7 +67,7 @@ public function beforeCompile()
  public function afterCompile(Nette\PhpGenerator\ClassType $class)
  {
  if (!empty($this->config['cache'])) {
- $method = $class->methods[Nette\DI\Container::getMethodName($this->prefix('router'))];
+ $method = $class->getMethod(Nette\DI\Container::getMethodName($this->prefix('router')));
  try {
  $router = serialize(eval($method->getBody()));
  } catch (\Exception $e) {

diff --git a/tests/Application/MicroPresenter.response.phpt b/tests/Application/MicroPresenter.response.phpt
@@ -33,7 +33,7 @@ class MicroContainer extends Nette\DI\Container
 
  protected $meta = array(
  'types' => array(
- 'nette\\bridges\\applicationlatte\\ilattefactory' => array(1 => array('latte.latteFactory')),
+ 'Nette\\Bridges\\ApplicationLatte\\ILatteFactory' => array(1 => array('latte.latteFactory')),
  ),
  );