diff --git a/config/example.neon b/config/example.neon index ab1c3e07..190a6a3c 100644 --- a/config/example.neon +++ b/config/example.neon @@ -27,7 +27,7 @@ extensions: ipubDoctrineTimestampable : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension ipubDoctrineDynamicDiscriminatorMap : IPub\DoctrineDynamicDiscriminatorMap\DI\DoctrineDynamicDiscriminatorMapExtension fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension - fbExchange : FastyBird\Exchange\DI\ExchangeExtension + fbExchange : FastyBird\Library\Exchange\DI\ExchangeExtension fbJsonApi : FastyBird\JsonApi\DI\JsonApiExtension fbSimpleAuth : FastyBird\SimpleAuth\DI\SimpleAuthExtension diff --git a/public/lib/models/connectors/index.ts b/public/lib/models/connectors/index.ts index 880cf0cb..99d7166e 100644 --- a/public/lib/models/connectors/index.ts +++ b/public/lib/models/connectors/index.ts @@ -24,7 +24,7 @@ import { ConnectorsResponseInterface, FbBusConnectorUpdateInterface, FbMqttConnectorUpdateInterface, - Connector\ModbusUpdateInterface, + ModbusConnectorUpdateInterface, ShellyConnectorUpdateInterface, SonoffConnectorUpdateInterface, TuyaUpdateInterface, @@ -162,7 +162,7 @@ const moduleActions: ActionTree = { } }, - async edit({ state, commit }, payload: { connector: ConnectorInterface, data: FbMqttConnectorUpdateInterface | FbBusConnectorUpdateInterface | ShellyConnectorUpdateInterface | TuyaUpdateInterface | SonoffConnectorUpdateInterface | Connector\ModbusUpdateInterface }): Promise> { + async edit({ state, commit }, payload: { connector: ConnectorInterface, data: FbMqttConnectorUpdateInterface | FbBusConnectorUpdateInterface | ShellyConnectorUpdateInterface | TuyaUpdateInterface | SonoffConnectorUpdateInterface | ModbusConnectorUpdateInterface }): Promise> { if (state.semaphore.updating.includes(payload.connector.id)) { throw new Error('devices-module.connectors.update.inProgress') } diff --git a/public/lib/models/connectors/types.ts b/public/lib/models/connectors/types.ts index b11fae36..aa91965e 100644 --- a/public/lib/models/connectors/types.ts +++ b/public/lib/models/connectors/types.ts @@ -119,7 +119,7 @@ export interface SonoffConnectorUpdateInterface extends ConnectorUpdateInterface name?: string } -export interface Connector\ModbusUpdateInterface extends ConnectorUpdateInterface { +export interface ModbusConnectorUpdateInterface extends ConnectorUpdateInterface { serialInterface?: string | null baudRate?: number | null } diff --git a/src/Commands/Connector.php b/src/Commands/Connector.php index 0d742e6f..f63a69ff 100644 --- a/src/Commands/Connector.php +++ b/src/Commands/Connector.php @@ -22,11 +22,11 @@ use FastyBird\DevicesModule\Events; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Exchange\Consumer as ExchangeConsumer; -use FastyBird\Metadata; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Exchange\Consumer as ExchangeConsumer; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineOrmQuery\Exceptions as DoctrineOrmQueryExceptions; use Psr\EventDispatcher as PsrEventDispatcher; use Psr\Log; diff --git a/src/Commands/Initialize.php b/src/Commands/Initialize.php index a62bbc04..e918fc7a 100644 --- a/src/Commands/Initialize.php +++ b/src/Commands/Initialize.php @@ -16,7 +16,7 @@ namespace FastyBird\DevicesModule\Commands; use FastyBird\DevicesModule\DataStorage; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Psr\Log; use Symfony\Component\Console; use Symfony\Component\Console\Input; diff --git a/src/Connectors/ConnectorFactory.php b/src/Connectors/ConnectorFactory.php index 3d51d713..b9864cbe 100644 --- a/src/Connectors/ConnectorFactory.php +++ b/src/Connectors/ConnectorFactory.php @@ -15,7 +15,7 @@ namespace FastyBird\DevicesModule\Connectors; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; /** * Connector factory interface diff --git a/src/Constants.php b/src/Constants.php index 21eac502..24e147fd 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -15,7 +15,7 @@ namespace FastyBird\DevicesModule; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; /** * Service constants diff --git a/src/Consumers/Connector.php b/src/Consumers/Connector.php index 2f507425..596bedff 100644 --- a/src/Consumers/Connector.php +++ b/src/Consumers/Connector.php @@ -16,10 +16,10 @@ namespace FastyBird\DevicesModule\Consumers; use FastyBird\DevicesModule\DataStorage; -use FastyBird\Exchange\Consumer as ExchangeConsumer; -use FastyBird\Metadata\Constants as MetadataConstants; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Exchange\Consumer as ExchangeConsumer; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Types as MetadataTypes; use League\Flysystem; use Nette; use Nette\Utils; @@ -53,19 +53,22 @@ public function consume( ): void { if ( - Utils\Strings::startsWith(strval($routingKey->getValue()), MetadataConstants::MESSAGE_BUS_ENTITY_PREFIX_KEY) + Utils\Strings::startsWith( + strval($routingKey->getValue()), + Metadata\Constants::MESSAGE_BUS_ENTITY_PREFIX_KEY, + ) && ( Utils\Strings::contains( strval($routingKey->getValue()), - MetadataConstants::MESSAGE_BUS_ENTITY_CREATED_KEY, + Metadata\Constants::MESSAGE_BUS_ENTITY_CREATED_KEY, ) || Utils\Strings::contains( strval($routingKey->getValue()), - MetadataConstants::MESSAGE_BUS_ENTITY_UPDATED_KEY, + Metadata\Constants::MESSAGE_BUS_ENTITY_UPDATED_KEY, ) || Utils\Strings::contains( strval($routingKey->getValue()), - MetadataConstants::MESSAGE_BUS_ENTITY_DELETED_KEY, + Metadata\Constants::MESSAGE_BUS_ENTITY_DELETED_KEY, ) ) ) { diff --git a/src/Controllers/ChannelPropertiesV1.php b/src/Controllers/ChannelPropertiesV1.php index 693e2ba0..4fbdc632 100644 --- a/src/Controllers/ChannelPropertiesV1.php +++ b/src/Controllers/ChannelPropertiesV1.php @@ -24,7 +24,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\StatusCodeInterface; use InvalidArgumentException; use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions; diff --git a/src/Controllers/ChannelsV1.php b/src/Controllers/ChannelsV1.php index 0deff9fd..4f18ee02 100644 --- a/src/Controllers/ChannelsV1.php +++ b/src/Controllers/ChannelsV1.php @@ -24,7 +24,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\StatusCodeInterface; use InvalidArgumentException; use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions; diff --git a/src/Controllers/ConnectorPropertiesV1.php b/src/Controllers/ConnectorPropertiesV1.php index 58ae9c40..7f43706c 100644 --- a/src/Controllers/ConnectorPropertiesV1.php +++ b/src/Controllers/ConnectorPropertiesV1.php @@ -25,7 +25,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\StatusCodeInterface; use InvalidArgumentException; use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions; diff --git a/src/Controllers/ConnectorsV1.php b/src/Controllers/ConnectorsV1.php index f80c7b40..c6545aee 100644 --- a/src/Controllers/ConnectorsV1.php +++ b/src/Controllers/ConnectorsV1.php @@ -23,7 +23,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\StatusCodeInterface; use IPub\DoctrineOrmQuery\Exceptions as DoctrineOrmQueryExceptions; use Nette\Utils; diff --git a/src/Controllers/DevicePropertiesV1.php b/src/Controllers/DevicePropertiesV1.php index 1809ab3d..f439fcfb 100644 --- a/src/Controllers/DevicePropertiesV1.php +++ b/src/Controllers/DevicePropertiesV1.php @@ -24,7 +24,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\StatusCodeInterface; use InvalidArgumentException; use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions; diff --git a/src/Controllers/DevicesV1.php b/src/Controllers/DevicesV1.php index c5d23438..92ddca75 100644 --- a/src/Controllers/DevicesV1.php +++ b/src/Controllers/DevicesV1.php @@ -24,7 +24,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\StatusCodeInterface; use InvalidArgumentException; use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions; diff --git a/src/DI/DevicesModuleExtension.php b/src/DI/DevicesModuleExtension.php index 6fa65f21..48006ed5 100644 --- a/src/DI/DevicesModuleExtension.php +++ b/src/DI/DevicesModuleExtension.php @@ -36,6 +36,7 @@ use Nette\Schema; use stdClass; use function assert; +use function is_dir; use function is_string; use function ucfirst; use const DIRECTORY_SEPARATOR; @@ -556,6 +557,13 @@ public function beforeCompile(): void 'addPaths', [[__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'Entities']], ); + + if (is_dir(__DIR__ . '/../../tests/fixtures/dummy')) { + $ormAnnotationDriverService->addSetup( + 'addPaths', + [[__DIR__ . '/../../tests/fixtures/dummy']], + ); + } } $ormAnnotationDriverChainService = $builder->getDefinitionByType( @@ -567,6 +575,13 @@ public function beforeCompile(): void $ormAnnotationDriverService, 'FastyBird\DevicesModule\Entities', ]); + + if (is_dir(__DIR__ . '/../../tests/fixtures/dummy')) { + $ormAnnotationDriverChainService->addSetup('addDriver', [ + $ormAnnotationDriverService, + 'FastyBird\DevicesModule\Tests\Fixtures\Dummy', + ]); + } } /** diff --git a/src/Entities/Channels/Channel.php b/src/Entities/Channels/Channel.php index fc29bcb2..6f2ce8fe 100644 --- a/src/Entities/Channels/Channel.php +++ b/src/Entities/Channels/Channel.php @@ -18,7 +18,7 @@ use Doctrine\Common; use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineTimestampable; use Ramsey\Uuid; diff --git a/src/Entities/Channels/Controls/Control.php b/src/Entities/Channels/Controls/Control.php index c85173dd..1bae6561 100644 --- a/src/Entities/Channels/Controls/Control.php +++ b/src/Entities/Channels/Controls/Control.php @@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineTimestampable; use Ramsey\Uuid; diff --git a/src/Entities/Channels/Properties/Dynamic.php b/src/Entities/Channels/Properties/Dynamic.php index 4b59bcb5..6a9e8ac0 100644 --- a/src/Entities/Channels/Properties/Dynamic.php +++ b/src/Entities/Channels/Properties/Dynamic.php @@ -16,7 +16,7 @@ namespace FastyBird\DevicesModule\Entities\Channels\Properties; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * @ORM\Entity diff --git a/src/Entities/Channels/Properties/Mapped.php b/src/Entities/Channels/Properties/Mapped.php index e059a7a3..6a6f0e4e 100644 --- a/src/Entities/Channels/Properties/Mapped.php +++ b/src/Entities/Channels/Properties/Mapped.php @@ -19,7 +19,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use Ramsey\Uuid; use function array_merge; diff --git a/src/Entities/Channels/Properties/Property.php b/src/Entities/Channels/Properties/Property.php index 4615f7e6..3790719e 100644 --- a/src/Entities/Channels/Properties/Property.php +++ b/src/Entities/Channels/Properties/Property.php @@ -20,9 +20,9 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; -use FastyBird\Metadata\ValueObjects as MetadataValueObjects; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use Ramsey\Uuid; use function array_merge; diff --git a/src/Entities/Channels/Properties/Variable.php b/src/Entities/Channels/Properties/Variable.php index f407c059..f628e1d5 100644 --- a/src/Entities/Channels/Properties/Variable.php +++ b/src/Entities/Channels/Properties/Variable.php @@ -18,7 +18,7 @@ use DateTimeInterface; use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Exceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * @ORM\Entity diff --git a/src/Entities/Connectors/Connector.php b/src/Entities/Connectors/Connector.php index 01dc0e3a..30ef8a23 100644 --- a/src/Entities/Connectors/Connector.php +++ b/src/Entities/Connectors/Connector.php @@ -18,7 +18,7 @@ use Doctrine\Common; use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\SimpleAuth\Entities as SimpleAuthEntities; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineDynamicDiscriminatorMap\Entities as DoctrineDynamicDiscriminatorMapEntities; diff --git a/src/Entities/Connectors/Controls/Control.php b/src/Entities/Connectors/Controls/Control.php index b521e2a3..79a4b84e 100644 --- a/src/Entities/Connectors/Controls/Control.php +++ b/src/Entities/Connectors/Controls/Control.php @@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineTimestampable; use Ramsey\Uuid; diff --git a/src/Entities/Connectors/Properties/Dynamic.php b/src/Entities/Connectors/Properties/Dynamic.php index 88ada660..7a9269b7 100644 --- a/src/Entities/Connectors/Properties/Dynamic.php +++ b/src/Entities/Connectors/Properties/Dynamic.php @@ -16,7 +16,7 @@ namespace FastyBird\DevicesModule\Entities\Connectors\Properties; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * @ORM\Entity diff --git a/src/Entities/Connectors/Properties/Variable.php b/src/Entities/Connectors/Properties/Variable.php index 9a0682d5..3ecf423c 100644 --- a/src/Entities/Connectors/Properties/Variable.php +++ b/src/Entities/Connectors/Properties/Variable.php @@ -16,7 +16,7 @@ namespace FastyBird\DevicesModule\Entities\Connectors\Properties; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * @ORM\Entity diff --git a/src/Entities/Devices/Attributes/Attribute.php b/src/Entities/Devices/Attributes/Attribute.php index 703c504f..b6dd486d 100644 --- a/src/Entities/Devices/Attributes/Attribute.php +++ b/src/Entities/Devices/Attributes/Attribute.php @@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineTimestampable; use Nette\Utils; diff --git a/src/Entities/Devices/Controls/Control.php b/src/Entities/Devices/Controls/Control.php index 00ec7999..c41ba089 100644 --- a/src/Entities/Devices/Controls/Control.php +++ b/src/Entities/Devices/Controls/Control.php @@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineTimestampable; use Ramsey\Uuid; diff --git a/src/Entities/Devices/Device.php b/src/Entities/Devices/Device.php index b89c0721..679b6b11 100644 --- a/src/Entities/Devices/Device.php +++ b/src/Entities/Devices/Device.php @@ -18,7 +18,7 @@ use Doctrine\Common; use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\SimpleAuth\Entities as SimpleAuthEntities; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineDynamicDiscriminatorMap\Entities as DoctrineDynamicDiscriminatorMapEntities; diff --git a/src/Entities/Devices/Properties/Dynamic.php b/src/Entities/Devices/Properties/Dynamic.php index 6ae1c94a..36349e08 100644 --- a/src/Entities/Devices/Properties/Dynamic.php +++ b/src/Entities/Devices/Properties/Dynamic.php @@ -16,7 +16,7 @@ namespace FastyBird\DevicesModule\Entities\Devices\Properties; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * @ORM\Entity diff --git a/src/Entities/Devices/Properties/Mapped.php b/src/Entities/Devices/Properties/Mapped.php index 6f828c8e..f2d2770e 100644 --- a/src/Entities/Devices/Properties/Mapped.php +++ b/src/Entities/Devices/Properties/Mapped.php @@ -19,8 +19,8 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use Ramsey\Uuid; use function array_merge; diff --git a/src/Entities/Devices/Properties/Property.php b/src/Entities/Devices/Properties/Property.php index 9d4d9bb1..8398c945 100644 --- a/src/Entities/Devices/Properties/Property.php +++ b/src/Entities/Devices/Properties/Property.php @@ -20,9 +20,9 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; -use FastyBird\Metadata\ValueObjects as MetadataValueObjects; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use Ramsey\Uuid; use function array_merge; diff --git a/src/Entities/Devices/Properties/Variable.php b/src/Entities/Devices/Properties/Variable.php index 230733d9..bb3689fa 100644 --- a/src/Entities/Devices/Properties/Variable.php +++ b/src/Entities/Devices/Properties/Variable.php @@ -18,7 +18,7 @@ use DateTimeInterface; use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Exceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * @ORM\Entity diff --git a/src/Entities/Entity.php b/src/Entities/Entity.php index deff5183..b00ea2b0 100644 --- a/src/Entities/Entity.php +++ b/src/Entities/Entity.php @@ -15,7 +15,7 @@ namespace FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineCrud; use Ramsey\Uuid; diff --git a/src/Entities/Property.php b/src/Entities/Property.php index 4a3817c0..7cb9b71d 100644 --- a/src/Entities/Property.php +++ b/src/Entities/Property.php @@ -20,10 +20,10 @@ use Doctrine\ORM\Mapping as ORM; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; -use FastyBird\Metadata\ValueObjects as MetadataValueObjects; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects; use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine; use IPub\DoctrineTimestampable; use Nette\Utils; diff --git a/src/Events/AfterConnectorStart.php b/src/Events/AfterConnectorStart.php index bd643cf5..db4a5a65 100644 --- a/src/Events/AfterConnectorStart.php +++ b/src/Events/AfterConnectorStart.php @@ -15,7 +15,7 @@ namespace FastyBird\DevicesModule\Events; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Symfony\Contracts\EventDispatcher; /** diff --git a/src/Events/BeforeConnectorStart.php b/src/Events/BeforeConnectorStart.php index 08a8e26a..dc616a01 100644 --- a/src/Events/BeforeConnectorStart.php +++ b/src/Events/BeforeConnectorStart.php @@ -15,7 +15,7 @@ namespace FastyBird\DevicesModule\Events; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Symfony\Contracts\EventDispatcher; /** diff --git a/src/Events/StateEntityCreated.php b/src/Events/StateEntityCreated.php index 061516eb..b846a46f 100644 --- a/src/Events/StateEntityCreated.php +++ b/src/Events/StateEntityCreated.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Symfony\Contracts\EventDispatcher; /** diff --git a/src/Events/StateEntityDeleted.php b/src/Events/StateEntityDeleted.php index a38464e8..8ad3eb53 100644 --- a/src/Events/StateEntityDeleted.php +++ b/src/Events/StateEntityDeleted.php @@ -16,7 +16,7 @@ namespace FastyBird\DevicesModule\Events; use FastyBird\DevicesModule\Entities; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Symfony\Contracts\EventDispatcher; /** diff --git a/src/Events/StateEntityUpdated.php b/src/Events/StateEntityUpdated.php index 250a9f71..09e77552 100644 --- a/src/Events/StateEntityUpdated.php +++ b/src/Events/StateEntityUpdated.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Symfony\Contracts\EventDispatcher; /** diff --git a/src/Hydrators/Properties/Property.php b/src/Hydrators/Properties/Property.php index b0ff4d87..5cecbcc4 100644 --- a/src/Hydrators/Properties/Property.php +++ b/src/Hydrators/Properties/Property.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\JsonApi\Hydrators as JsonApiHydrators; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\JsonAPIDocument; use function array_map; use function boolval; diff --git a/src/Models/DataStorage/ChannelControlsRepository.php b/src/Models/DataStorage/ChannelControlsRepository.php index dfe2d0e3..322fa8a1 100644 --- a/src/Models/DataStorage/ChannelControlsRepository.php +++ b/src/Models/DataStorage/ChannelControlsRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Ramsey\Uuid; diff --git a/src/Models/DataStorage/ChannelPropertiesRepository.php b/src/Models/DataStorage/ChannelPropertiesRepository.php index 2a4a9e07..45851b64 100644 --- a/src/Models/DataStorage/ChannelPropertiesRepository.php +++ b/src/Models/DataStorage/ChannelPropertiesRepository.php @@ -18,9 +18,9 @@ use Countable; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/DataStorage/ChannelsRepository.php b/src/Models/DataStorage/ChannelsRepository.php index 4122f339..bd4bc600 100644 --- a/src/Models/DataStorage/ChannelsRepository.php +++ b/src/Models/DataStorage/ChannelsRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/DataStorage/ConnectorControlsRepository.php b/src/Models/DataStorage/ConnectorControlsRepository.php index 7599d35a..1ece05ea 100644 --- a/src/Models/DataStorage/ConnectorControlsRepository.php +++ b/src/Models/DataStorage/ConnectorControlsRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Ramsey\Uuid; diff --git a/src/Models/DataStorage/ConnectorPropertiesRepository.php b/src/Models/DataStorage/ConnectorPropertiesRepository.php index f939b38b..1c9b1ed1 100644 --- a/src/Models/DataStorage/ConnectorPropertiesRepository.php +++ b/src/Models/DataStorage/ConnectorPropertiesRepository.php @@ -18,9 +18,9 @@ use Countable; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/DataStorage/ConnectorsRepository.php b/src/Models/DataStorage/ConnectorsRepository.php index a58af87e..e4e4358a 100644 --- a/src/Models/DataStorage/ConnectorsRepository.php +++ b/src/Models/DataStorage/ConnectorsRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/DataStorage/DeviceAttributesRepository.php b/src/Models/DataStorage/DeviceAttributesRepository.php index bfbe39be..dac193a4 100644 --- a/src/Models/DataStorage/DeviceAttributesRepository.php +++ b/src/Models/DataStorage/DeviceAttributesRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/DataStorage/DeviceControlsRepository.php b/src/Models/DataStorage/DeviceControlsRepository.php index caf1a403..7f7ba6b7 100644 --- a/src/Models/DataStorage/DeviceControlsRepository.php +++ b/src/Models/DataStorage/DeviceControlsRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Ramsey\Uuid; diff --git a/src/Models/DataStorage/DevicePropertiesRepository.php b/src/Models/DataStorage/DevicePropertiesRepository.php index b1d9bfc6..939018ce 100644 --- a/src/Models/DataStorage/DevicePropertiesRepository.php +++ b/src/Models/DataStorage/DevicePropertiesRepository.php @@ -18,9 +18,9 @@ use Countable; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/DataStorage/DevicesRepository.php b/src/Models/DataStorage/DevicesRepository.php index 859c8407..33f90959 100644 --- a/src/Models/DataStorage/DevicesRepository.php +++ b/src/Models/DataStorage/DevicesRepository.php @@ -16,8 +16,8 @@ namespace FastyBird\DevicesModule\Models\DataStorage; use Countable; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IteratorAggregate; use Nette; use Nette\Utils; diff --git a/src/Models/States/ChannelPropertiesManager.php b/src/Models/States/ChannelPropertiesManager.php index 9f641d75..6ab22aba 100644 --- a/src/Models/States/ChannelPropertiesManager.php +++ b/src/Models/States/ChannelPropertiesManager.php @@ -21,9 +21,9 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\States; use FastyBird\DevicesModule\Utilities; -use FastyBird\Exchange\Entities as ExchangeEntities; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Exchange\Entities as ExchangeEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use Nette; use Nette\Utils; use Psr\EventDispatcher as PsrEventDispatcher; diff --git a/src/Models/States/ChannelPropertiesRepository.php b/src/Models/States/ChannelPropertiesRepository.php index 0a9ffcc3..9074ae00 100644 --- a/src/Models/States/ChannelPropertiesRepository.php +++ b/src/Models/States/ChannelPropertiesRepository.php @@ -18,7 +18,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Nette; use Ramsey\Uuid; diff --git a/src/Models/States/ChannelPropertyStateManager.php b/src/Models/States/ChannelPropertyStateManager.php index dc24a948..188e0c54 100644 --- a/src/Models/States/ChannelPropertyStateManager.php +++ b/src/Models/States/ChannelPropertyStateManager.php @@ -17,9 +17,9 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Metadata; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use Nette; use Nette\Utils; use Psr\Log; diff --git a/src/Models/States/ConnectorConnectionStateManager.php b/src/Models/States/ConnectorConnectionStateManager.php index 0b69e14c..8e449a25 100644 --- a/src/Models/States/ConnectorConnectionStateManager.php +++ b/src/Models/States/ConnectorConnectionStateManager.php @@ -19,10 +19,10 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Queries; -use FastyBird\Metadata; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineOrmQuery\Exceptions as DoctrineOrmQueryExceptions; use Nette; use Nette\Utils; diff --git a/src/Models/States/ConnectorPropertiesManager.php b/src/Models/States/ConnectorPropertiesManager.php index 0210a808..08d00d1c 100644 --- a/src/Models/States/ConnectorPropertiesManager.php +++ b/src/Models/States/ConnectorPropertiesManager.php @@ -21,8 +21,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\States; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use Nette; use Nette\Utils; use Psr\EventDispatcher as PsrEventDispatcher; diff --git a/src/Models/States/ConnectorPropertiesRepository.php b/src/Models/States/ConnectorPropertiesRepository.php index 2e3ab387..dddeaf94 100644 --- a/src/Models/States/ConnectorPropertiesRepository.php +++ b/src/Models/States/ConnectorPropertiesRepository.php @@ -18,7 +18,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Nette; use Ramsey\Uuid; diff --git a/src/Models/States/DeviceConnectionStateManager.php b/src/Models/States/DeviceConnectionStateManager.php index 84c26886..4eb06b1c 100644 --- a/src/Models/States/DeviceConnectionStateManager.php +++ b/src/Models/States/DeviceConnectionStateManager.php @@ -19,10 +19,10 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Queries; -use FastyBird\Metadata; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\DoctrineOrmQuery\Exceptions as DoctrineOrmQueryExceptions; use Nette; use Nette\Utils; diff --git a/src/Models/States/DevicePropertiesManager.php b/src/Models/States/DevicePropertiesManager.php index 035d7042..89141676 100644 --- a/src/Models/States/DevicePropertiesManager.php +++ b/src/Models/States/DevicePropertiesManager.php @@ -21,8 +21,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\States; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use Nette; use Nette\Utils; use Psr\EventDispatcher as PsrEventDispatcher; diff --git a/src/Models/States/DevicePropertiesRepository.php b/src/Models/States/DevicePropertiesRepository.php index 91d1c423..be29744b 100644 --- a/src/Models/States/DevicePropertiesRepository.php +++ b/src/Models/States/DevicePropertiesRepository.php @@ -18,7 +18,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Nette; use Ramsey\Uuid; diff --git a/src/Models/States/DevicePropertyStateManager.php b/src/Models/States/DevicePropertyStateManager.php index 76371838..ebeceacc 100644 --- a/src/Models/States/DevicePropertyStateManager.php +++ b/src/Models/States/DevicePropertyStateManager.php @@ -17,9 +17,9 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Metadata; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use Nette; use Nette\Utils; use Psr\Log; diff --git a/src/Models/States/IChannelPropertiesManager.php b/src/Models/States/IChannelPropertiesManager.php index 1894da73..a2d9fcd1 100644 --- a/src/Models/States/IChannelPropertiesManager.php +++ b/src/Models/States/IChannelPropertiesManager.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Nette\Utils; /** diff --git a/src/Models/States/IChannelPropertiesRepository.php b/src/Models/States/IChannelPropertiesRepository.php index 1a731c07..9ba801bb 100644 --- a/src/Models/States/IChannelPropertiesRepository.php +++ b/src/Models/States/IChannelPropertiesRepository.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Ramsey\Uuid; /** diff --git a/src/Models/States/IConnectorPropertiesManager.php b/src/Models/States/IConnectorPropertiesManager.php index d6cd2d3c..77a36256 100644 --- a/src/Models/States/IConnectorPropertiesManager.php +++ b/src/Models/States/IConnectorPropertiesManager.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Nette\Utils; /** diff --git a/src/Models/States/IConnectorPropertiesRepository.php b/src/Models/States/IConnectorPropertiesRepository.php index d17e4fe5..9adec299 100644 --- a/src/Models/States/IConnectorPropertiesRepository.php +++ b/src/Models/States/IConnectorPropertiesRepository.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Ramsey\Uuid; /** diff --git a/src/Models/States/IDevicePropertiesManager.php b/src/Models/States/IDevicePropertiesManager.php index 54796e2f..ecab9f05 100644 --- a/src/Models/States/IDevicePropertiesManager.php +++ b/src/Models/States/IDevicePropertiesManager.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Nette\Utils; /** diff --git a/src/Models/States/IDevicePropertiesRepository.php b/src/Models/States/IDevicePropertiesRepository.php index 06656e11..9bc6654a 100644 --- a/src/Models/States/IDevicePropertiesRepository.php +++ b/src/Models/States/IDevicePropertiesRepository.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\States; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use Ramsey\Uuid; /** diff --git a/src/Router/Routes.php b/src/Router/Routes.php index f95235c9..0d008a8f 100644 --- a/src/Router/Routes.php +++ b/src/Router/Routes.php @@ -18,7 +18,7 @@ use FastyBird\DevicesModule; use FastyBird\DevicesModule\Controllers; use FastyBird\DevicesModule\Middleware; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use FastyBird\SimpleAuth\Middleware as SimpleAuthMiddleware; use IPub\SlimRouter\Routing; diff --git a/src/Schemas/Channels/Channel.php b/src/Schemas/Channels/Channel.php index 78ece278..e9d89459 100644 --- a/src/Schemas/Channels/Channel.php +++ b/src/Schemas/Channels/Channel.php @@ -20,7 +20,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function count; diff --git a/src/Schemas/Channels/Controls/Control.php b/src/Schemas/Channels/Controls/Control.php index 68edba0e..91f33189 100644 --- a/src/Schemas/Channels/Controls/Control.php +++ b/src/Schemas/Channels/Controls/Control.php @@ -20,7 +20,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; diff --git a/src/Schemas/Channels/Properties/Dynamic.php b/src/Schemas/Channels/Properties/Dynamic.php index 49650ce1..d71d3867 100644 --- a/src/Schemas/Channels/Properties/Dynamic.php +++ b/src/Schemas/Channels/Properties/Dynamic.php @@ -20,8 +20,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Channels/Properties/Mapped.php b/src/Schemas/Channels/Properties/Mapped.php index a123de51..f67179f2 100644 --- a/src/Schemas/Channels/Properties/Mapped.php +++ b/src/Schemas/Channels/Properties/Mapped.php @@ -20,8 +20,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Channels/Properties/Property.php b/src/Schemas/Channels/Properties/Property.php index e4bc4391..b18a0f79 100644 --- a/src/Schemas/Channels/Properties/Property.php +++ b/src/Schemas/Channels/Properties/Property.php @@ -22,7 +22,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use Throwable; diff --git a/src/Schemas/Channels/Properties/Variable.php b/src/Schemas/Channels/Properties/Variable.php index 6d557040..4880185e 100644 --- a/src/Schemas/Channels/Properties/Variable.php +++ b/src/Schemas/Channels/Properties/Variable.php @@ -19,8 +19,8 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Connectors/Blank.php b/src/Schemas/Connectors/Blank.php index 2464cd56..25d2802a 100644 --- a/src/Schemas/Connectors/Blank.php +++ b/src/Schemas/Connectors/Blank.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Schemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * Modbus connector entity schema diff --git a/src/Schemas/Connectors/Controls/Control.php b/src/Schemas/Connectors/Controls/Control.php index 4f663605..3ca9fdc3 100644 --- a/src/Schemas/Connectors/Controls/Control.php +++ b/src/Schemas/Connectors/Controls/Control.php @@ -20,7 +20,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; diff --git a/src/Schemas/Connectors/Properties/Dynamic.php b/src/Schemas/Connectors/Properties/Dynamic.php index ced65468..856c25ad 100644 --- a/src/Schemas/Connectors/Properties/Dynamic.php +++ b/src/Schemas/Connectors/Properties/Dynamic.php @@ -20,8 +20,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Connectors/Properties/Property.php b/src/Schemas/Connectors/Properties/Property.php index 4b333259..648196f5 100644 --- a/src/Schemas/Connectors/Properties/Property.php +++ b/src/Schemas/Connectors/Properties/Property.php @@ -20,7 +20,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function strval; diff --git a/src/Schemas/Connectors/Properties/Variable.php b/src/Schemas/Connectors/Properties/Variable.php index 0d08b5fe..8ed27e3f 100644 --- a/src/Schemas/Connectors/Properties/Variable.php +++ b/src/Schemas/Connectors/Properties/Variable.php @@ -19,8 +19,8 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Devices/Attributes/Attribute.php b/src/Schemas/Devices/Attributes/Attribute.php index 7c93d407..a8859595 100644 --- a/src/Schemas/Devices/Attributes/Attribute.php +++ b/src/Schemas/Devices/Attributes/Attribute.php @@ -20,7 +20,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function is_scalar; diff --git a/src/Schemas/Devices/Blank.php b/src/Schemas/Devices/Blank.php index 0131763c..bed2cd09 100644 --- a/src/Schemas/Devices/Blank.php +++ b/src/Schemas/Devices/Blank.php @@ -17,7 +17,7 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Schemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; /** * Blank device entity schema diff --git a/src/Schemas/Devices/Controls/Control.php b/src/Schemas/Devices/Controls/Control.php index 500ac3e6..29b4dadf 100644 --- a/src/Schemas/Devices/Controls/Control.php +++ b/src/Schemas/Devices/Controls/Control.php @@ -20,7 +20,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; diff --git a/src/Schemas/Devices/Properties/Dynamic.php b/src/Schemas/Devices/Properties/Dynamic.php index e0bbec1f..e5b6806c 100644 --- a/src/Schemas/Devices/Properties/Dynamic.php +++ b/src/Schemas/Devices/Properties/Dynamic.php @@ -20,8 +20,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Devices/Properties/Mapped.php b/src/Schemas/Devices/Properties/Mapped.php index 42ffe69f..fd5fd939 100644 --- a/src/Schemas/Devices/Properties/Mapped.php +++ b/src/Schemas/Devices/Properties/Mapped.php @@ -20,8 +20,8 @@ use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Schemas/Devices/Properties/Property.php b/src/Schemas/Devices/Properties/Property.php index 59dfb32f..2f1acdf5 100644 --- a/src/Schemas/Devices/Properties/Property.php +++ b/src/Schemas/Devices/Properties/Property.php @@ -22,7 +22,7 @@ use FastyBird\DevicesModule\Router; use FastyBird\DevicesModule\Schemas; use FastyBird\JsonApi\Schemas as JsonApiSchemas; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use IPub\SlimRouter\Routing; use Neomerx\JsonApi; use Throwable; diff --git a/src/Schemas/Devices/Properties/Variable.php b/src/Schemas/Devices/Properties/Variable.php index 4c8c20f0..da67c8c6 100644 --- a/src/Schemas/Devices/Properties/Variable.php +++ b/src/Schemas/Devices/Properties/Variable.php @@ -19,8 +19,8 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Schemas; use FastyBird\DevicesModule\Utilities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use Neomerx\JsonApi; use function array_merge; diff --git a/src/Subscribers/DynamicProperties.php b/src/Subscribers/DynamicProperties.php index db7fff5a..06a16cfb 100644 --- a/src/Subscribers/DynamicProperties.php +++ b/src/Subscribers/DynamicProperties.php @@ -20,11 +20,11 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\States; -use FastyBird\Exchange\Entities as ExchangeEntities; -use FastyBird\Exchange\Publisher as ExchangePublisher; -use FastyBird\Metadata\Entities as MetadataEntities; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Exchange\Entities as ExchangeEntities; +use FastyBird\Library\Exchange\Publisher as ExchangePublisher; +use FastyBird\Library\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use Nette; use Nette\Utils; use Symfony\Component\EventDispatcher; diff --git a/src/Subscribers/ModuleEntities.php b/src/Subscribers/ModuleEntities.php index b8b5584e..8a3fb269 100644 --- a/src/Subscribers/ModuleEntities.php +++ b/src/Subscribers/ModuleEntities.php @@ -22,11 +22,11 @@ use FastyBird\DevicesModule\Entities; use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; -use FastyBird\Exchange\Entities as ExchangeEntities; -use FastyBird\Exchange\Exceptions as ExchangeExceptions; -use FastyBird\Exchange\Publisher as ExchangePublisher; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Exchange\Entities as ExchangeEntities; +use FastyBird\Library\Exchange\Exceptions as ExchangeExceptions; +use FastyBird\Library\Exchange\Publisher as ExchangePublisher; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; use IPub\Phone\Exceptions as PhoneExceptions; use League\Flysystem; use Nette; diff --git a/src/Utilities/ValueHelper.php b/src/Utilities/ValueHelper.php index 982567b9..26e8b2c2 100644 --- a/src/Utilities/ValueHelper.php +++ b/src/Utilities/ValueHelper.php @@ -18,9 +18,9 @@ use Consistence; use DateTime; use DateTimeInterface; -use FastyBird\Metadata\Exceptions as MetadataExceptions; -use FastyBird\Metadata\Types as MetadataTypes; -use FastyBird\Metadata\ValueObjects as MetadataValueObjects; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects; use Nette\Utils; use function array_filter; use function count; diff --git a/tests/cases/unit/Models/DataStorage/ConnectorsRepositoryTest.php b/tests/cases/unit/Models/DataStorage/ConnectorsRepositoryTest.php index 7bc586f6..ac981fc3 100644 --- a/tests/cases/unit/Models/DataStorage/ConnectorsRepositoryTest.php +++ b/tests/cases/unit/Models/DataStorage/ConnectorsRepositoryTest.php @@ -6,7 +6,7 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Tests\Cases\Unit\DbTestCase; -use FastyBird\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; use League\Flysystem; use Nette; use Nette\Utils; diff --git a/tests/cases/unit/Router/RouterTest.php b/tests/cases/unit/Router/RouterTest.php index c90e8ae7..68178461 100644 --- a/tests/cases/unit/Router/RouterTest.php +++ b/tests/cases/unit/Router/RouterTest.php @@ -4,7 +4,7 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Tests\Cases\Unit\DbTestCase; -use FastyBird\Metadata; +use FastyBird\Library\Metadata; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; use InvalidArgumentException; diff --git a/tests/cases/unit/Subscribers/EntitiesSubscriberTest.php b/tests/cases/unit/Subscribers/EntitiesSubscriberTest.php index 98f2b77f..ac25a4cf 100644 --- a/tests/cases/unit/Subscribers/EntitiesSubscriberTest.php +++ b/tests/cases/unit/Subscribers/EntitiesSubscriberTest.php @@ -8,10 +8,10 @@ use FastyBird\DevicesModule\Exceptions; use FastyBird\DevicesModule\Models; use FastyBird\DevicesModule\Subscribers; -use FastyBird\Exchange\Entities as ExchangeEntities; -use FastyBird\Exchange\Publisher as ExchangePublisher; -use FastyBird\Metadata; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Exchange\Entities as ExchangeEntities; +use FastyBird\Library\Exchange\Publisher as ExchangePublisher; +use FastyBird\Library\Metadata; +use FastyBird\Library\Metadata\Entities as MetadataEntities; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Ramsey\Uuid; diff --git a/tests/cases/unit/Types/DataTypeTest.php b/tests/cases/unit/Types/DataTypeTest.php index cd1d15b6..fd30eeaf 100644 --- a/tests/cases/unit/Types/DataTypeTest.php +++ b/tests/cases/unit/Types/DataTypeTest.php @@ -3,7 +3,7 @@ namespace FastyBird\DevicesModule\Tests\Cases\Unit\Types; use Consistence\Enum\InvalidEnumValueException; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; use PHPUnit\Framework\TestCase; final class DataTypeTest extends TestCase diff --git a/tests/common.neon b/tests/common.neon index 6a1c0eec..6e591a97 100644 --- a/tests/common.neon +++ b/tests/common.neon @@ -29,9 +29,9 @@ extensions: ipubDoctrineTimestampable : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension ipubPhone : IPub\Phone\DI\PhoneExtension fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension - fbExchange : FastyBird\Exchange\DI\ExchangeExtension + fbExchange : FastyBird\Library\Exchange\DI\ExchangeExtension fbJsonApi : FastyBird\JsonApi\DI\JsonApiExtension - fbMetadata : FastyBird\Metadata\DI\MetadataExtension + fbMetadata : FastyBird\Library\Metadata\DI\MetadataExtension fbSimpleAuth : FastyBird\SimpleAuth\DI\SimpleAuthExtension services: @@ -48,6 +48,14 @@ services: tags: [connector_type: dummy] - {factory: FastyBird\DevicesModule\Tests\Fixtures\Dummy\DummyConnectorSchema} +decorator: + Doctrine\Persistence\Mapping\Driver\MappingDriverChain: + setup: + - addDriver(@nettrineOrmAnnotations.annotationDriver, 'FastyBird\DevicesModule\Tests\Fixtures\Dummy') + Doctrine\ORM\Mapping\Driver\AnnotationDriver: + setup: + - addPaths([%appDir%/fixtures/dummy]) + contributteTranslation: locales: default: en_US diff --git a/tests/fixtures/dummy/DummyConnectorFactory.php b/tests/fixtures/dummy/DummyConnectorFactory.php index 0c61d3a3..f1e56bfc 100644 --- a/tests/fixtures/dummy/DummyConnectorFactory.php +++ b/tests/fixtures/dummy/DummyConnectorFactory.php @@ -4,7 +4,7 @@ use FastyBird\DevicesModule\Connectors; use FastyBird\DevicesModule\Connectors\Connector; -use FastyBird\Metadata\Entities as MetadataEntities; +use FastyBird\Library\Metadata\Entities as MetadataEntities; class DummyConnectorFactory implements Connectors\ConnectorFactory { diff --git a/tests/fixtures/dummy/DummyConnectorSchema.php b/tests/fixtures/dummy/DummyConnectorSchema.php index b80d023f..c9a829c6 100644 --- a/tests/fixtures/dummy/DummyConnectorSchema.php +++ b/tests/fixtures/dummy/DummyConnectorSchema.php @@ -3,7 +3,7 @@ namespace FastyBird\DevicesModule\Tests\Fixtures\Dummy; use FastyBird\DevicesModule\Schemas; -use FastyBird\Metadata\Types as MetadataTypes; +use FastyBird\Library\Metadata\Types as MetadataTypes; final class DummyConnectorSchema extends Schemas\Connectors\Connector { diff --git a/tools/phpstan.config.src.neon b/tools/phpstan.config.src.neon index 4564ef50..c2017cbf 100644 --- a/tools/phpstan.config.src.neon +++ b/tools/phpstan.config.src.neon @@ -12,7 +12,7 @@ parameters: - ../tests/stubs/SchemaInterface.stub ignoreErrors: - - message: '#^Method FastyBird\\DevicesModule\\Entities\\Devices\\Device::getSource\(\) never returns FastyBird\\Metadata\\Types\\ConnectorSource so it can be removed from the return type.#' - - message: '#^Method FastyBird\\DevicesModule\\Entities\\Devices\\Device::getSource\(\) never returns FastyBird\\Metadata\\Types\\PluginSource so it can be removed from the return type.#' - - message: '#^Method FastyBird\\DevicesModule\\Entities\\Connectors\\Connector::getSource\(\) never returns FastyBird\\Metadata\\Types\\ConnectorSource so it can be removed from the return type.#' - - message: '#^Method FastyBird\\DevicesModule\\Entities\\Connectors\\Connector::getSource\(\) never returns FastyBird\\Metadata\\Types\\PluginSource so it can be removed from the return type.#' + - message: '#^Method FastyBird\\DevicesModule\\Entities\\Devices\\Device::getSource\(\) never returns FastyBird\\Library\\Metadata\\Types\\ConnectorSource so it can be removed from the return type.#' + - message: '#^Method FastyBird\\DevicesModule\\Entities\\Devices\\Device::getSource\(\) never returns FastyBird\\Library\\Metadata\\Types\\PluginSource so it can be removed from the return type.#' + - message: '#^Method FastyBird\\DevicesModule\\Entities\\Connectors\\Connector::getSource\(\) never returns FastyBird\\Library\\Metadata\\Types\\ConnectorSource so it can be removed from the return type.#' + - message: '#^Method FastyBird\\DevicesModule\\Entities\\Connectors\\Connector::getSource\(\) never returns FastyBird\\Library\\Metadata\\Types\\PluginSource so it can be removed from the return type.#'