fix tests for lowest dependency composer

Gruntfile.js

@@ -14,6 +14,9 @@ module.exports = function (grunt) {
             composer_update: {
                 command: 'composer update'
             },
+            composer_update_prefer_lowest: {
+                command: 'composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable'
+            },
             test: {
                 command: 'vendor\\bin\\tester tests -s -p php'
             },
@@ -22,10 +25,10 @@ module.exports = function (grunt) {
                 command: 'composer create-project nette/code-checker nette-code-checker'
             },
             netteCodeChecker: {
-                command: 'php ..\\..\\nette-code-checker\\src\\code-checker -d src -d tests --short-arrays --strict-types'
+                command: 'php ..\\..\\nette-code-checker\\code-checker -d src -d tests --short-arrays --strict-types'
             },
             netteCodeCheckerFIX: {
-                command: 'php ..\\..\\nette-code-checker\\src\\code-checker -d src -d tests --short-arrays --strict-types --fix'
+                command: 'php ..\\..\\nette-code-checker\\code-checker -d src -d tests --short-arrays --strict-types --fix'
             },
             netteCodingStandard: {
                 command: 'php ..\\..\\nette-coding-standard\\ecs check src tests --config ..\\..\\nette-coding-standard\\coding-standard-php71.yml'

src/BaseNetteGMap.php

@@ -10,7 +10,7 @@ class BaseNetteGMap extends Nette\Application\UI\Control
 
 	/**
 	 * Zoom of map (min: 0, max: 16)
-	 * @var int Zoom of map 
+	 * @var int Zoom of map
 	 */
 	private $zoom;
 

src/layer.latte

@@ -1,3 +1,3 @@
 <div id="nettegmap" class="nettegmap-layer" data-map-attr="{$json}">
     <div class="nettegmap-canvas"></div>
-</div>
+</div>

src/viewer.latte

@@ -1,3 +1,3 @@
 <div id="nettegmap" class="nettegmap-viewer" data-map-attr="{$json}">
     <div class="nettegmap-canvas"></div>
-</div>
+</div>

tests/GMapUtilsTest.phpt

@@ -6,15 +6,6 @@ $container = require __DIR__ . '/bootstrap.php';
 
 class GMapUtilsTest extends Tester\TestCase
 {
-	private $container;
-
-
-	public function __construct(Nette\DI\Container $container)
-	{
-		$this->container = $container;
-	}
-
-
 	public function setUp()
 	{
 	}
@@ -29,5 +20,5 @@ class GMapUtilsTest extends Tester\TestCase
 }
 
 
-$test = new GMapUtilsTest($container);
+$test = new GMapUtilsTest();
 $test->run();

tests/GMapViewerTest.phpt

@@ -6,15 +6,6 @@ $container = require __DIR__ . '/bootstrap.php';
 
 class GMapViewerTest extends Tester\TestCase
 {
-	private $container;
-
-
-	public function __construct(Nette\DI\Container $container)
-	{
-		$this->container = $container;
-	}
-
-
 	public function setUp()
 	{
 	}
@@ -32,5 +23,5 @@ class GMapViewerTest extends Tester\TestCase
 }
 
 
-$test = new GMapViewerTest($container);
+$test = new GMapViewerTest();
 $test->run();

tests/GpsPointTest.phpt

@@ -8,15 +8,6 @@ require __DIR__ . '/../src/GpsPoint.php';
 
 class GpsPointTest extends Tester\TestCase
 {
-	private $container;
-
-
-	public function __construct(Nette\DI\Container $container)
-	{
-		$this->container = $container;
-	}
-
-
 	public function setUp()
 	{
 	}
@@ -45,5 +36,5 @@ class GpsPointTest extends Tester\TestCase
 	}
 }
 
-$test = new GpsPointTest($container);
+$test = new GpsPointTest();
 $test->run();

tests/bootstrap.php

@@ -1,13 +1,29 @@
 <?php
+
 declare(strict_types=1);
-require __DIR__ . '/../vendor/autoload.php';
+
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	echo 'Install Nette Tester using `composer install`';
+	exit(1);
+}
+
 
 Tester\Environment::setup();
+date_default_timezone_set('Europe/Prague');
+
 
-$configurator = new Nette\Configurator;
-$configurator->setDebugMode(false);
-$configurator->setTempDirectory(__DIR__ . '/temp');
+function before(\Closure $function = null)
+{
+	static $val;
+	if (!func_num_args()) {
+		return $val ? $val() : null;
+	}
+	$val = $function;
+}
 
-$configurator->addConfig(__DIR__ . '/config/config.neon');
 
-return $configurator->createContainer();
+function test(\Closure $function): void
+{
+	before();
+	$function();
+}