Migrate bootstrap library (#21)

FastyBird · Nov 4, 2022 · 27303c0 · 27303c0
1 parent 27f5bbf
commit 27303c0
Show file tree

Hide file tree

Showing 23 changed files with 70 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "ext-bcmath": "*",
     "ext-pcntl": "*",
     "cweagans/composer-patches": "^1.7",
-    "fastybird/bootstrap": "^0.9",
+    "fastybird/bootstrap-library": "dev-main",
     "fastybird/exchange-library": "dev-main",
     "fastybird/json-api": "^0.13",
     "fastybird/metadata-library": "dev-main",

diff --git a/config/example.neon b/config/example.neon
@@ -26,10 +26,10 @@ extensions:
     ipubDoctrineCrud                    : IPub\DoctrineCrud\DI\DoctrineCrudExtension
     ipubDoctrineTimestampable           : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension
     ipubDoctrineDynamicDiscriminatorMap : IPub\DoctrineDynamicDiscriminatorMap\DI\DoctrineDynamicDiscriminatorMapExtension
-    fbBootstrap                         : FastyBird\Bootstrap\DI\BootstrapExtension
     fbDateTimeFactory                   : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
     fbJsonApi                           : FastyBird\JsonApi\DI\JsonApiExtension
     fbSimpleAuth                        : FastyBird\SimpleAuth\DI\SimpleAuthExtension
+    fbBootstrapLibrary                  : FastyBird\Library\Bootstrap\DI\BootstrapExtension
     fbMetadataLibrary                   : FastyBird\Library\Metadata\DI\MetadataExtension
     fbExchangeLibrary                   : FastyBird\Library\Exchange\DI\ExchangeExtension
     fbDevicesModule                     : FastyBird\Module\Devices\DI\DevicesExtension

diff --git a/src/DI/DevicesExtension.php b/src/DI/DevicesExtension.php
@@ -16,7 +16,7 @@
 namespace FastyBird\Module\Devices\DI;
 
 use Doctrine\Persistence;
-use FastyBird\Bootstrap;
+use FastyBird\Library\Bootstrap;
 use FastyBird\Library\Exchange\DI as ExchangeDI;
 use FastyBird\Module\Devices\Commands;
 use FastyBird\Module\Devices\Connectors;

diff --git a/src/Utilities/Database.php b/src/Utilities/Database.php
@@ -18,7 +18,7 @@
 use Doctrine\DBAL;
 use Doctrine\ORM;
 use Doctrine\Persistence;
-use FastyBird\Bootstrap;
+use FastyBird\Library\Bootstrap;
 use FastyBird\Module\Devices\Exceptions;
 use Nette;
 use Throwable;

diff --git a/tests/cases/unit/Controllers/ChannelControlsV1Test.php b/tests/cases/unit/Controllers/ChannelControlsV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -22,6 +23,7 @@ final class ChannelControlsV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/ChannelPropertiesV1Test.php b/tests/cases/unit/Controllers/ChannelPropertiesV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -23,6 +24,7 @@ final class ChannelPropertiesV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -185,6 +187,7 @@ public function channelPropertiesRead(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -312,6 +315,7 @@ public function channelPropertiesCreate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -429,6 +433,7 @@ public function channelPropertiesUpdate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/ChannelsV1Test.php b/tests/cases/unit/Controllers/ChannelsV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -23,6 +24,7 @@ final class ChannelsV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -167,6 +169,7 @@ public function channelsRead(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -283,6 +286,7 @@ public function channelsCreate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -390,6 +394,7 @@ public function channelsUpdate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/ConnectorControlsV1Test.php b/tests/cases/unit/Controllers/ConnectorControlsV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -22,6 +23,7 @@ final class ConnectorControlsV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/ConnectorsV1Test.php b/tests/cases/unit/Controllers/ConnectorsV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -23,6 +24,7 @@ final class ConnectorsV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -155,6 +157,7 @@ public function connectorsRead(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/DeviceAttributesV1Test.php b/tests/cases/unit/Controllers/DeviceAttributesV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -22,6 +23,7 @@ final class DeviceAttributesV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/DeviceChildrenV1Test.php b/tests/cases/unit/Controllers/DeviceChildrenV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -22,6 +23,7 @@ final class DeviceChildrenV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/DeviceControlsV1Test.php b/tests/cases/unit/Controllers/DeviceControlsV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -22,6 +23,7 @@ final class DeviceControlsV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/DeviceParentsV1Test.php b/tests/cases/unit/Controllers/DeviceParentsV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -22,6 +23,7 @@ final class DeviceParentsV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/DevicePropertiesV1Test.php b/tests/cases/unit/Controllers/DevicePropertiesV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -23,6 +24,7 @@ final class DevicePropertiesV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -167,6 +169,7 @@ public function devicePropertiesRead(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -285,6 +288,7 @@ public function devicePropertiesCreate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -394,6 +398,7 @@ public function devicePropertiesUpdate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/Controllers/DevicesV1Test.php b/tests/cases/unit/Controllers/DevicesV1Test.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\Controllers;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Tests\Cases\Unit\DbTestCase;
 use FastyBird\Module\Devices\Tests\Tools;
 use Fig\Http\Message\RequestMethodInterface;
@@ -23,6 +24,7 @@ final class DevicesV1Test extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -173,6 +175,7 @@ public function devicesRead(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -331,6 +334,7 @@ public function devicesCreate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException
@@ -436,6 +440,7 @@ public function devicesUpdate(): array
 	}
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws InvalidArgumentException
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException

diff --git a/tests/cases/unit/DI/DevicesModuleExtensionTests.php b/tests/cases/unit/DI/DevicesModuleExtensionTests.php
@@ -2,6 +2,7 @@
 
 namespace FastyBird\Module\Devices\Tests\Cases\Unit\DI;
 
+use FastyBird\Library\Bootstrap\Exceptions as BootstrapExceptions;
 use FastyBird\Module\Devices\Commands;
 use FastyBird\Module\Devices\Controllers;
 use FastyBird\Module\Devices\Exceptions;
@@ -20,6 +21,7 @@ final class DevicesModuleExtensionTests extends DbTestCase
 {
 
 	/**
+	 * @throws BootstrapExceptions\InvalidArgument
 	 * @throws Exceptions\InvalidArgument
 	 * @throws Nette\DI\MissingServiceException
 	 * @throws RuntimeException