Update nette/di 3.0

composer.json

@@ -21,7 +21,7 @@
   "require": {
     "php": ">=7.1",
     "dragonmantank/cron-expression": "^2.2.0",
-    "nette/di": "^2.4.12",
+    "nette/di": "~3.0.0",
     "symfony/console": "^4.2.0"
   },
   "require-dev": {

src/DI/SchedulerExtension.php

@@ -10,23 +10,27 @@
 use Nette\DI\CompilerExtension;
 use Nette\DI\Helpers;
 use Nette\DI\Statement;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
 
 class SchedulerExtension extends CompilerExtension
 {
 
-	/** @var mixed[] */
-	private $defaults = [
-		'path' => '%tempDir%/scheduler',
-		'jobs' => [],
-	];
+	public function getConfigSchema(): Schema
+	{
+		return Expect::structure([
+			 'path' => Expect::string('%tempDir%/scheduler'),
+			 'jobs' => Expect::array(),
+		]);
+	}
 
 	/**
 	 * Register services
 	 */
 	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->validateConfig($this->defaults);
+		$config = (array) $this->config;
 		$config = Helpers::expand($config, $builder->parameters);
 
 		// Scheduler

tests/DI/CallbackJob.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Contributte\Scheduler\DI;
+
+final class CallbackJob
+{
+
+	public static function foo(): void
+	{
+	}
+
+	public function bar(): void
+	{
+	}
+
+}

tests/DI/CustomJob.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Contributte\Scheduler\DI;
+
+use Contributte\Scheduler\IJob;
+use DateTime;
+
+final class CustomJob implements IJob
+{
+
+	public function isDue(DateTime $dateTime): bool
+	{
+		return true;
+	}
+
+	public function run(): void
+	{
+	}
+
+}

tests/DI/SchedulerExtensionTest.php

@@ -22,10 +22,15 @@ public function testRegister(): void
 				],
 			]);
 			$compiler->addExtension('scheduler', new SchedulerExtension());
+			$compiler->loadConfig(__DIR__ . '/jobs.config.neon');
 		});
 		/** @var Container $container */
 		$container = new $class();
-		self::assertInstanceOf(IScheduler::class, $container->getByType(IScheduler::class));
+
+		$scheduler = $container->getByType(IScheduler::class);
+		self::assertInstanceOf(IScheduler::class, $scheduler);
+
+		self::assertCount(3, $scheduler->getAll());
 	}
 
 }

tests/DI/jobs.config.neon

@@ -0,0 +1,8 @@
+services:
+	callbackJob: Tests\Contributte\Scheduler\DI\CallbackJob
+
+scheduler:
+	jobs:
+		- {cron: '* * * * *', callback: Tests\Contributte\Scheduler\DI\CallbackJob::foo}
+		- {cron: '* * * * *', callback: [@callbackJob, bar]}
+		- Tests\Contributte\Scheduler\DI\CustomJob