WS exchange to devices bridge + bootstrap cleaning (#24)

FastyBird · Nov 4, 2022 · 9d25efb · 9d25efb
1 parent 9552c31
commit 9d25efb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -33,6 +33,7 @@
     "ext-pcntl": "*",
     "cweagans/composer-patches": "^1.7",
     "evenement/evenement": "^3.0",
+    "fastybird/bootstrap-library": "dev-main",
     "fastybird/datetime-factory": "^0.6",
     "fastybird/devices-module": "dev-main",
     "fastybird/metadata-library": "dev-main",
@@ -45,7 +46,7 @@
   },
   "require-dev": {
     "brianium/paratest": "^6.6",
-    "contributte/translation": "^0.9",
+    "contributte/translation": "^2.0",
     "dg/bypass-finals": "^1.4",
     "infection/infection": "^0.26",
     "orisai/coding-standard": "^3.2",

diff --git a/src/DI/TuyaExtension.php b/src/DI/TuyaExtension.php
@@ -27,6 +27,7 @@
 use FastyBird\Connector\Tuya\Mappers;
 use FastyBird\Connector\Tuya\Schemas;
 use FastyBird\Connector\Tuya\Subscribers;
+use FastyBird\Library\Bootstrap\Boot as BootstrapBoot;
 use FastyBird\Module\Devices\DI as DevicesDI;
 use Nette;
 use Nette\DI;
@@ -46,12 +47,12 @@ class TuyaExtension extends DI\CompilerExtension
 	public const NAME = 'fbTuyaConnector';
 
 	public static function register(
-		Nette\Configurator $config,
+		Nette\Configurator|BootstrapBoot\Configurator $config,
 		string $extensionName = self::NAME,
 	): void
 	{
 		$config->onCompile[] = static function (
-			Nette\Configurator $config,
+			Nette\Configurator|BootstrapBoot\Configurator $config,
 			DI\Compiler $compiler,
 		) use ($extensionName): void {
 			$compiler->addExtension($extensionName, new TuyaExtension());

diff --git a/tests/cases/unit/BaseTestCase.php b/tests/cases/unit/BaseTestCase.php
@@ -3,6 +3,7 @@
 namespace FastyBird\Connector\Tuya\Tests\Cases\Unit;
 
 use FastyBird\Connector\Tuya\DI;
+use FastyBird\Library\Bootstrap\Boot as BootstrapBoot;
 use Nette;
 use PHPUnit\Framework\TestCase;
 use function constant;
@@ -28,7 +29,7 @@ protected function createContainer(string|null $additionalConfig = null): Nette\
 		$rootDir = __DIR__ . '/../..';
 		$vendorDir = defined('FB_VENDOR_DIR') ? constant('FB_VENDOR_DIR') : $rootDir . '/../vendor';
 
-		$config = new Nette\Configurator();
+		$config = new BootstrapBoot\Configurator();
 		$config->setTempDirectory(FB_TEMP_DIR);
 
 		$config->addParameters(['container' => ['class' => 'SystemContainer_' . md5((string) time())]]);

diff --git a/tests/cases/unit/DbTestCase.php b/tests/cases/unit/DbTestCase.php
@@ -8,6 +8,7 @@
 use FastyBird\Connector\Tuya\DI;
 use FastyBird\Connector\Tuya\Exceptions;
 use FastyBird\DateTimeFactory;
+use FastyBird\Library\Bootstrap\Boot as BootstrapBoot;
 use Nette;
 use Nettrine\ORM as NettrineORM;
 use PHPUnit\Framework\TestCase;
@@ -114,7 +115,7 @@ private function createContainer(): Nette\DI\Container
 		$rootDir = __DIR__ . '/../..';
 		$vendorDir = defined('FB_VENDOR_DIR') ? constant('FB_VENDOR_DIR') : $rootDir . '/../vendor';
 
-		$config = new Nette\Configurator();
+		$config = new BootstrapBoot\Configurator();
 		$config->setTempDirectory(FB_TEMP_DIR);
 
 		$config->addParameters(['container' => ['class' => 'SystemContainer_' . md5((string) time())]]);