Merge pull request #13 from xificurk/extension-fix

SkautisExtension: opraveno expandovani parametru konfigurace

Author: xificurk

src/SkautisExtension.php

@@ -19,7 +19,7 @@ class SkautisExtension extends Nette\DI\CompilerExtension
 	public $defaults = array(
 		'applicationId' => NULL,
 		'testMode' => FALSE,
-		'profiler' => '%debugMode%',
+		'profiler' => NULL,
 		'cache' => TRUE,
 		'compression' => TRUE,
 	);
@@ -29,6 +29,7 @@ public function loadConfiguration()
 	{
 		$container = $this->getContainerBuilder();
 		$config = $this->validateConfig($this->defaults);
+		$config['profiler'] = isset($config['profiler']) ? $config['profiler'] : !empty($container->parameters['debugMode']);
 
 		$container->addDefinition($this->prefix('config'))
 			->setClass('Skautis\Config', array($config['applicationId'], $config['testMode'], $config['cache'], $config['compression']));

tests/SkautisNette/SkautisExtension.phpt renamed to tests/SkautisNette/SkautisExtension.debug.phpt

@@ -0,0 +1,16 @@
+<?php
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$configurator = new Nette\Configurator;
+$configurator->setTempDirectory(TEMP_DIR);
+$configurator->setDebugMode(FALSE);
+$configurator->addConfig(__DIR__ . '/files/config.neon');
+$container = $configurator->createContainer();
+
+Assert::type('Skautis\Skautis', $container->getService('skautis.skautis'));
+Assert::false($container->hasService('skautis.panel'));

tests/SkautisNette/SkautisExtension.production.phpt

@@ -3,4 +3,3 @@ extensions:
 
 skautis:
 	applicationId: test
-	profiler: true