Skip to content

Commit

Permalink
Some changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mesour committed Dec 2, 2015
1 parent 96df6e4 commit 60f7c38
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
10 changes: 7 additions & 3 deletions src/Mesour/Bridges/Nette/ApplicationFactory.php
Expand Up @@ -10,6 +10,12 @@
namespace Mesour\Bridges\Nette;

use Mesour\UI;
use Nette\Application\IPresenter;
use Nette\Application\IPresenterFactory;
use Nette\Application\PresenterFactory;
use Nette\Application\Request;
use Nette\Application\UI\Presenter;
use Nette\DI\Container;
use Nette\Http\Session;
use Nette\Application\Application;

Expand All @@ -25,15 +31,13 @@ class ApplicationFactory
/**
* @param $name
* @param Session $session
* @param Application $netteApplication
* @return UI\Application
* @throws \Mesour\Components\BadStateException
*/
static public function createApplication($name, Session $session, Application $netteApplication)
static public function createApplication($name, Session $session)
{
$application = new UI\Application($name);
$application->setSession(new \Mesour\Bridges\Nette\Session($session));
$application->setLink(new Link($netteApplication->getPresenter()));
$application->setRequest($_REQUEST);
$application->run();
return $application;
Expand Down
5 changes: 4 additions & 1 deletion src/Mesour/Bridges/Nette/DI/ApplicationExtension.php
Expand Up @@ -9,7 +9,10 @@

namespace Mesour\Bridges\Nette\DI;

use App\Version2Module\Presenters\SubItemsPresenter;
use Nette\Application\IPresenter;
use Nette\DI\CompilerExtension;
use Nette\PhpGenerator\ClassType;


/**
Expand All @@ -32,7 +35,7 @@ public function loadConfiguration()

$builder->addDefinition($this->prefix('mesourApplication'))
->setFactory('Mesour\Bridges\Nette\ApplicationFactory::createApplication', [
$config['name'], '@session', '@application'
$config['name'], '@session'
]);
}

Expand Down

0 comments on commit 60f7c38

Please sign in to comment.