small refactoring

Author: dg

src/Application/UI/Presenter.php

@@ -1177,7 +1177,7 @@ protected function getGlobalState($forClass = NULL)
 				}
 				if ($since !== $sinces[$key]) {
 					$since = $sinces[$key];
-					$ok = $since && (is_subclass_of($forClass, $since) || $forClass === $since);
+					$ok = $since && is_a($forClass, $since, TRUE);
 				}
 				if (!$ok) {
 					unset($state[$key]);

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -53,14 +53,14 @@ public function __construct($debugMode = FALSE, array $scanDirs = NULL, $tempDir
 	public function loadConfiguration()
 	{
 		$config = $this->validateConfig($this->defaults);
-		$container = $this->getContainerBuilder();
-		$container->addExcludedClasses([UI\Control::class]);
+		$builder = $this->getContainerBuilder();
+		$builder->addExcludedClasses([UI\Control::class]);
 
 		$this->invalidLinkMode = $this->debugMode
 			? UI\Presenter::INVALID_LINK_TEXTUAL | ($config['silentLinks'] ? 0 : UI\Presenter::INVALID_LINK_WARNING)
 			: UI\Presenter::INVALID_LINK_WARNING;
 
-		$application = $container->addDefinition($this->prefix('application'))
+		$application = $builder->addDefinition($this->prefix('application'))
 			->setClass(Nette\Application\Application::class)
 			->addSetup('$catchExceptions', [$config['catchExceptions']])
 			->addSetup('$errorPresenter', [$config['errorPresenter']]);
@@ -70,7 +70,7 @@ public function loadConfiguration()
 		}
 
 		$touch = $this->debugMode && $config['scanDirs'] ? $this->tempFile : NULL;
-		$presenterFactory = $container->addDefinition($this->prefix('presenterFactory'))
+		$presenterFactory = $builder->addDefinition($this->prefix('presenterFactory'))
 			->setClass(Nette\Application\IPresenterFactory::class)
 			->setFactory(Nette\Application\PresenterFactory::class, [new Nette\DI\Statement(
 				Nette\Bridges\ApplicationDI\PresenterFactoryCallback::class, [1 => $this->invalidLinkMode, $touch]
@@ -80,31 +80,31 @@ public function loadConfiguration()
 			$presenterFactory->addSetup('setMapping', [$config['mapping']]);
 		}
 
-		$container->addDefinition($this->prefix('linkGenerator'))
+		$builder->addDefinition($this->prefix('linkGenerator'))
 			->setFactory(Nette\Application\LinkGenerator::class, [
 				1 => new Nette\DI\Statement('@Nette\Http\IRequest::getUrl'),
 			]);
 
 		if ($this->name === 'application') {
-			$container->addAlias('application', $this->prefix('application'));
-			$container->addAlias('nette.presenterFactory', $this->prefix('presenterFactory'));
+			$builder->addAlias('application', $this->prefix('application'));
+			$builder->addAlias('nette.presenterFactory', $this->prefix('presenterFactory'));
 		}
 	}
 
 
 	public function beforeCompile()
 	{
-		$container = $this->getContainerBuilder();
+		$builder = $this->getContainerBuilder();
 		$all = [];
 
-		foreach ($container->findByType(Nette\Application\IPresenter::class) as $def) {
+		foreach ($builder->findByType(Nette\Application\IPresenter::class) as $def) {
 			$all[$def->getClass()] = $def;
 		}
 
 		$counter = 0;
 		foreach ($this->findPresenters() as $class) {
 			if (empty($all[$class])) {
-				$all[$class] = $container->addDefinition($this->prefix(++$counter))->setClass($class);
+				$all[$class] = $builder->addDefinition($this->prefix(++$counter))->setClass($class);
 			}
 		}
 

src/Bridges/ApplicationDI/LatteExtension.php

@@ -42,17 +42,17 @@ public function loadConfiguration()
 		}
 
 		$config = $this->validateConfig($this->defaults);
-		$container = $this->getContainerBuilder();
+		$builder = $this->getContainerBuilder();
 
-		$container->addDefinition($this->prefix('latteFactory'))
+		$builder->addDefinition($this->prefix('latteFactory'))
 			->setClass(Latte\Engine::class)
 			->addSetup('setTempDirectory', [$this->tempDir])
 			->addSetup('setAutoRefresh', [$this->debugMode])
 			->addSetup('setContentType', [$config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML])
 			->addSetup('Nette\Utils\Html::$xhtml = ?', [(bool) $config['xhtml']])
 			->setImplement(Nette\Bridges\ApplicationLatte\ILatteFactory::class);
 
-		$container->addDefinition($this->prefix('templateFactory'))
+		$builder->addDefinition($this->prefix('templateFactory'))
 			->setClass(Nette\Application\UI\ITemplateFactory::class)
 			->setFactory(Nette\Bridges\ApplicationLatte\TemplateFactory::class);
 
@@ -64,8 +64,8 @@ public function loadConfiguration()
 		}
 
 		if ($this->name === 'latte') {
-			$container->addAlias('nette.latteFactory', $this->prefix('latteFactory'));
-			$container->addAlias('nette.templateFactory', $this->prefix('templateFactory'));
+			$builder->addAlias('nette.latteFactory', $this->prefix('latteFactory'));
+			$builder->addAlias('nette.templateFactory', $this->prefix('templateFactory'));
 		}
 	}
 
@@ -76,8 +76,8 @@ public function loadConfiguration()
 	 */
 	public function addMacro(callable $macro)
 	{
-		$container = $this->getContainerBuilder();
-		$container->getDefinition($this->prefix('latteFactory'))
+		$builder = $this->getContainerBuilder();
+		$builder->getDefinition($this->prefix('latteFactory'))
 			->addSetup('?->onCompile[] = function ($engine) { ' . $macro . '($engine->getCompiler()); }', ['@self']);
 	}
 

src/Bridges/ApplicationDI/RoutingExtension.php

@@ -36,9 +36,9 @@ public function __construct($debugMode = FALSE)
 	public function loadConfiguration()
 	{
 		$config = $this->validateConfig($this->defaults);
-		$container = $this->getContainerBuilder();
+		$builder = $this->getContainerBuilder();
 
-		$router = $container->addDefinition($this->prefix('router'))
+		$router = $builder->addDefinition($this->prefix('router'))
 			->setClass(Nette\Application\IRouter::class)
 			->setFactory(Nette\Application\Routers\RouteList::class);
 
@@ -47,17 +47,17 @@ public function loadConfiguration()
 		}
 
 		if ($this->name === 'routing') {
-			$container->addAlias('router', $this->prefix('router'));
+			$builder->addAlias('router', $this->prefix('router'));
 		}
 	}
 
 
 	public function beforeCompile()
 	{
-		$container = $this->getContainerBuilder();
+		$builder = $this->getContainerBuilder();
 
-		if ($this->debugMode && $this->config['debugger'] && $application = $container->getByType(Nette\Application\Application::class)) {
-			$container->getDefinition($application)->addSetup('@Tracy\Bar::addPanel', [
+		if ($this->debugMode && $this->config['debugger'] && $application = $builder->getByType(Nette\Application\Application::class)) {
+			$builder->getDefinition($application)->addSetup('@Tracy\Bar::addPanel', [
 				new Nette\DI\Statement(Nette\Bridges\ApplicationTracy\RoutingPanel::class),
 			]);
 		}