Code: fixes for PHP 8.0

contributte · May 25, 2023 · f1d25d1 · f1d25d1
1 parent 0101e6e
commit f1d25d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/DI/Pass/ConsolePass.php b/src/DI/Pass/ConsolePass.php
@@ -31,15 +31,17 @@ public function loadPassConfiguration(): void
 				$this->prefix('@logger.logger'),
 			]);
 
-		$builder->addDefinition($this->extension->prefix('console.statsCommand'))
-			->setFactory(StatsCommand::class, [$this->prefix('@transport.container'), []]); // @TODO transportNames
-
 		$builder->addDefinition($this->extension->prefix('console.debugCommand'))
 			->setFactory(DebugCommand::class, [[]]); // @TODO mapping
 
 		$builder->addDefinition($this->extension->prefix('console.setupTransportsCommand'))
 			->setFactory(SetupTransportsCommand::class, [$this->prefix('@transport.container'), []]); // @TODO transportNames
 
+		if (class_exists(StatsCommand::class)) {
+			$builder->addDefinition($this->extension->prefix('console.statsCommand'))
+				->setFactory(StatsCommand::class, [$this->prefix('@transport.container'), []]); // @TODO transportNames
+		}
+
 		if (PHP_VERSION === 'fake') { // @TODO failing queues
 			$builder->addDefinition($this->extension->prefix('console.failedMessageRemoveCommand'))
 				->setFactory(FailedMessagesRemoveCommand::class);

diff --git a/tests/Toolkit/Helpers.php b/tests/Toolkit/Helpers.php
@@ -4,6 +4,7 @@
 
 use Nette\DI\Config\Adapters\NeonAdapter;
 use Nette\Neon\Neon;
+use Nette\Utils\FileSystem;
 
 final class Helpers
 {
@@ -21,7 +22,7 @@ public static function neon(string $str): array
 	 */
 	public static function neonFile(string $file): array
 	{
-		return (new NeonAdapter())->process((array) Neon::decodeFile($file));
+		return (new NeonAdapter())->process((array) Neon::decode(FileSystem::read($file)));
 	}
 
 }