From 799f4294db90c44277e17ec460d8b283ab2bb049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mor=C3=A1vek=20=5BXificurk=5D?= <petr@pada.cz>
Date: Wed, 1 Jul 2015 20:30:52 +0200
Subject: [PATCH] SkautisExtension: opraveno expandovani parametru konfigurace

---
 src/SkautisExtension.php                         |  3 ++-
 ...xtension.phpt => SkautisExtension.debug.phpt} |  0
 .../SkautisExtension.production.phpt             | 16 ++++++++++++++++
 tests/SkautisNette/files/config.neon             |  1 -
 4 files changed, 18 insertions(+), 2 deletions(-)
 rename tests/SkautisNette/{SkautisExtension.phpt => SkautisExtension.debug.phpt} (100%)
 create mode 100644 tests/SkautisNette/SkautisExtension.production.phpt

diff --git a/src/SkautisExtension.php b/src/SkautisExtension.php
index 3d9b7b3..3651a9a 100644
--- a/src/SkautisExtension.php
+++ b/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']));
diff --git a/tests/SkautisNette/SkautisExtension.phpt b/tests/SkautisNette/SkautisExtension.debug.phpt
similarity index 100%
rename from tests/SkautisNette/SkautisExtension.phpt
rename to tests/SkautisNette/SkautisExtension.debug.phpt
diff --git a/tests/SkautisNette/SkautisExtension.production.phpt b/tests/SkautisNette/SkautisExtension.production.phpt
new file mode 100644
index 0000000..6fc0727
--- /dev/null
+++ b/tests/SkautisNette/SkautisExtension.production.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'));
diff --git a/tests/SkautisNette/files/config.neon b/tests/SkautisNette/files/config.neon
index 50b6e3a..3070c48 100644
--- a/tests/SkautisNette/files/config.neon
+++ b/tests/SkautisNette/files/config.neon
@@ -3,4 +3,3 @@ extensions:
 
 skautis:
 	applicationId: test
-	profiler: true