Remove config sections for Nette 2.2

Kdyby · Apr 21, 2016 · 4e569b8 · 4e569b8
1 parent b75aee3
commit 4e569b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/tests/KdybyTests/Translation/TestCase.php b/tests/KdybyTests/Translation/TestCase.php
@@ -29,7 +29,7 @@ protected function createContainer($configName = NULL)
 		$config->addParameters(['appDir' => __DIR__]);
 		Kdyby\Translation\DI\TranslationExtension::register($config);
 		Kdyby\Monolog\DI\MonologExtension::register($config);
-		$config->addConfig(__DIR__ . '/../nette-reset.neon', !isset($config->defaultExtensions['nette']) ? 'v23' : 'v22');
+		$config->addConfig(__DIR__ . '/../nette-reset.neon');
 
 		if ($configName) {
 			$config->addConfig(__DIR__ . '/config/' . $configName . '.neon');

diff --git a/tests/KdybyTests/nette-reset.neon b/tests/KdybyTests/nette-reset.neon
@@ -1,30 +1,19 @@
-common:
-	php:
-		date.timezone: Europe/Prague
+php:
+	date.timezone: Europe/Prague
 
 
-	services:
-		cacheStorage:
-			class: Nette\Caching\Storages\MemoryStorage
+services:
+	cacheStorage:
+		class: Nette\Caching\Storages\MemoryStorage
 
 
-	translation:
-		whitelist: [cs, sk, en]
-		resolvers:
-			session: on
+translation:
+	whitelist: [cs, sk, en]
+	resolvers:
+		session: on
 
+http:
+	frames: null
 
-v22 < common:
-	nette:
-		security:
-			frames: null
-
-		session:
-			autoStart: false
-
-v23 < common:
-	http:
-		frames: null
-
-	session:
-		autoStart: false
+session:
+	autoStart: false