From 6b221040b18e2f6fa367463212e97ef89bc22b7f Mon Sep 17 00:00:00 2001 From: Adam Kadlec Date: Mon, 25 Nov 2024 20:48:57 +0100 Subject: [PATCH 1/3] Clearing core dependencies --- src/FastyBird/Core/Application/composer.json | 4 ++-- src/FastyBird/Core/Application/config/common.neon | 1 - src/FastyBird/Core/Application/tests/common.neon | 1 - src/FastyBird/Core/Exchange/tests/common.neon | 1 - src/FastyBird/Core/Tools/tests/common.neon | 3 ++- .../Module/Devices/src/Subscribers/StateEntities.php | 7 ------- src/FastyBird/Module/Devices/tests/common.neon | 1 - 7 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/FastyBird/Core/Application/composer.json b/src/FastyBird/Core/Application/composer.json index 70058579c..92031049d 100644 --- a/src/FastyBird/Core/Application/composer.json +++ b/src/FastyBird/Core/Application/composer.json @@ -41,10 +41,10 @@ "contributte/vite": "^0.2", "cweagans/composer-patches": "^1.7", "doctrine/orm": "2.15.*", - "fastybird/datetime-factory": "^0.7.1", - "fastybird/metadata-library": "dev-main", "fastybird/simple-auth": "^0.14", + "ipub/doctrine-crud": "^5.1", "ipub/doctrine-timestampable": "^2.0", + "ipub/slim-router": "^0.2", "nette/bootstrap": "^3.2", "nette/application": "^3.1", "nette/caching": "^3.3", diff --git a/src/FastyBird/Core/Application/config/common.neon b/src/FastyBird/Core/Application/config/common.neon index 31c316b4a..3a176c211 100644 --- a/src/FastyBird/Core/Application/config/common.neon +++ b/src/FastyBird/Core/Application/config/common.neon @@ -21,7 +21,6 @@ extensions: # contributteCacheDebug : Contributte\Cache\DI\DebugStorageExtension orisaiObjectMapper : OriNette\ObjectMapper\DI\ObjectMapperExtension fbApplication : FastyBird\Core\Application\DI\ApplicationExtension - fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension ################################## # Nette extensions configuration # diff --git a/src/FastyBird/Core/Application/tests/common.neon b/src/FastyBird/Core/Application/tests/common.neon index c86e6448f..b99a73360 100644 --- a/src/FastyBird/Core/Application/tests/common.neon +++ b/src/FastyBird/Core/Application/tests/common.neon @@ -23,7 +23,6 @@ extensions: nettrineOrmCache : Nettrine\ORM\DI\OrmCacheExtension ipubDoctrineCrud : IPub\DoctrineCrud\DI\DoctrineCrudExtension ipubDoctrineTimestampable : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension - ipubPhone : IPub\Phone\DI\PhoneExtension fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension fbJsonApi : FastyBird\JsonApi\DI\JsonApiExtension fbSimpleAuth : FastyBird\SimpleAuth\DI\SimpleAuthExtension diff --git a/src/FastyBird/Core/Exchange/tests/common.neon b/src/FastyBird/Core/Exchange/tests/common.neon index 288be42a5..3bfad2167 100644 --- a/src/FastyBird/Core/Exchange/tests/common.neon +++ b/src/FastyBird/Core/Exchange/tests/common.neon @@ -14,7 +14,6 @@ php: date.timezone: Europe/Prague extensions: - ipubPhone : IPub\Phone\DI\PhoneExtension fbTools : FastyBird\Core\Tools\DI\ToolsExtension fbApplication: diff --git a/src/FastyBird/Core/Tools/tests/common.neon b/src/FastyBird/Core/Tools/tests/common.neon index 37529609c..ebff3a6af 100644 --- a/src/FastyBird/Core/Tools/tests/common.neon +++ b/src/FastyBird/Core/Tools/tests/common.neon @@ -14,4 +14,5 @@ php: date.timezone: Europe/Prague extensions: - fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension + ipubDoctrineTimestampable : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension + fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension diff --git a/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php b/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php index 243bbd4d7..9e3769d5f 100644 --- a/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php +++ b/src/FastyBird/Module/Devices/src/Subscribers/StateEntities.php @@ -28,7 +28,6 @@ use FastyBird\Module\Devices\Events; use FastyBird\Module\Devices\Exceptions; use FastyBird\Module\Devices\States; -use IPub\Phone\Exceptions as PhoneExceptions; use Nette; use Nette\Caching as NetteCaching; use Symfony\Component\EventDispatcher; @@ -80,8 +79,6 @@ public static function getSubscribedEvents(): array * @throws ToolsExceptions\InvalidData * @throws ToolsExceptions\Logic * @throws ToolsExceptions\MalformedInput - * @throws PhoneExceptions\NoValidCountryException - * @throws PhoneExceptions\NoValidPhoneException */ public function stateCreated( Events\ConnectorPropertyStateEntityCreated|Events\DevicePropertyStateEntityCreated|Events\ChannelPropertyStateEntityCreated $event, @@ -104,8 +101,6 @@ public function stateCreated( * @throws ToolsExceptions\InvalidData * @throws ToolsExceptions\Logic * @throws ToolsExceptions\MalformedInput - * @throws PhoneExceptions\NoValidCountryException - * @throws PhoneExceptions\NoValidPhoneException */ public function stateUpdated( Events\ConnectorPropertyStateEntityUpdated|Events\DevicePropertyStateEntityUpdated|Events\ChannelPropertyStateEntityUpdated $event, @@ -139,8 +134,6 @@ private function cleanCache( * @throws ToolsExceptions\InvalidData * @throws ToolsExceptions\Logic * @throws ToolsExceptions\MalformedInput - * @throws PhoneExceptions\NoValidCountryException - * @throws PhoneExceptions\NoValidPhoneException */ private function publishDocument( MetadataTypes\Sources\Source $source, diff --git a/src/FastyBird/Module/Devices/tests/common.neon b/src/FastyBird/Module/Devices/tests/common.neon index 26b64c2a0..f33cea1de 100644 --- a/src/FastyBird/Module/Devices/tests/common.neon +++ b/src/FastyBird/Module/Devices/tests/common.neon @@ -23,7 +23,6 @@ extensions: nettrineOrmCache : Nettrine\ORM\DI\OrmCacheExtension ipubDoctrineCrud : IPub\DoctrineCrud\DI\DoctrineCrudExtension ipubDoctrineTimestampable : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension - ipubPhone : IPub\Phone\DI\PhoneExtension fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension fbJsonApi : FastyBird\JsonApi\DI\JsonApiExtension fbSimpleAuth : FastyBird\SimpleAuth\DI\SimpleAuthExtension From b3c0a5432107b5e7d9d67e73ce03c5068093b87a Mon Sep 17 00:00:00 2001 From: Adam Kadlec Date: Mon, 25 Nov 2024 21:08:36 +0100 Subject: [PATCH 2/3] Dependencies --- src/FastyBird/Core/Exchange/tests/common.neon | 3 --- src/FastyBird/Plugin/ApiKey/tests/common.neon | 3 --- src/FastyBird/Plugin/WebServer/composer.json | 1 + src/FastyBird/Plugin/WebServer/tests/common.neon | 1 + src/FastyBird/Plugin/WsServer/composer.json | 1 + src/FastyBird/Plugin/WsServer/tests/common.neon | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/FastyBird/Core/Exchange/tests/common.neon b/src/FastyBird/Core/Exchange/tests/common.neon index 3bfad2167..f3f70980e 100644 --- a/src/FastyBird/Core/Exchange/tests/common.neon +++ b/src/FastyBird/Core/Exchange/tests/common.neon @@ -13,9 +13,6 @@ php: date.timezone: Europe/Prague -extensions: - fbTools : FastyBird\Core\Tools\DI\ToolsExtension - fbApplication: documents: mapping: [] diff --git a/src/FastyBird/Plugin/ApiKey/tests/common.neon b/src/FastyBird/Plugin/ApiKey/tests/common.neon index dea024a50..d59b790b4 100644 --- a/src/FastyBird/Plugin/ApiKey/tests/common.neon +++ b/src/FastyBird/Plugin/ApiKey/tests/common.neon @@ -79,9 +79,6 @@ fbJsonApi: meta: copyright: FastyBird s.r.o -fbDateTimeFactory: - frozen: DateTimeImmutable('2020-04-01T12:00:00+00:00') - fbApplication: documents: mapping: [] \ No newline at end of file diff --git a/src/FastyBird/Plugin/WebServer/composer.json b/src/FastyBird/Plugin/WebServer/composer.json index 01ba9a69e..0f7e3def7 100644 --- a/src/FastyBird/Plugin/WebServer/composer.json +++ b/src/FastyBird/Plugin/WebServer/composer.json @@ -40,6 +40,7 @@ "cweagans/composer-patches": "^1.7", "fastybird/application": "dev-main", "fastybird/metadata-library": "dev-main", + "fastybird/tools": "dev-main", "fig/http-message-util": "^1.1", "ipub/slim-router": "^0.2", "nette/bootstrap": "^3.2", diff --git a/src/FastyBird/Plugin/WebServer/tests/common.neon b/src/FastyBird/Plugin/WebServer/tests/common.neon index bdb8660b4..ce3074542 100644 --- a/src/FastyBird/Plugin/WebServer/tests/common.neon +++ b/src/FastyBird/Plugin/WebServer/tests/common.neon @@ -15,6 +15,7 @@ php: extensions: fbTools : FastyBird\Core\Tools\DI\ToolsExtension + fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension fbApplication: documents: diff --git a/src/FastyBird/Plugin/WsServer/composer.json b/src/FastyBird/Plugin/WsServer/composer.json index efaec81a5..b75b4547a 100644 --- a/src/FastyBird/Plugin/WsServer/composer.json +++ b/src/FastyBird/Plugin/WsServer/composer.json @@ -37,6 +37,7 @@ "fastybird/application": "dev-main", "fastybird/exchange": "dev-main", "fastybird/metadata-library": "dev-main", + "fastybird/tools": "dev-main", "ipub/websockets-wamp": "^1.4", "nette/di": "^3.2", "nette/utils": "^4.0", diff --git a/src/FastyBird/Plugin/WsServer/tests/common.neon b/src/FastyBird/Plugin/WsServer/tests/common.neon index e80631fa0..6f269a1de 100644 --- a/src/FastyBird/Plugin/WsServer/tests/common.neon +++ b/src/FastyBird/Plugin/WsServer/tests/common.neon @@ -16,9 +16,9 @@ php: extensions: ipubWebSocketsWAMP : IPub\WebSocketsWAMP\DI\WebSocketsWAMPExtension ipubWebSockets : IPub\WebSockets\DI\WebSocketsExtension - ipubPhone : IPub\Phone\DI\PhoneExtension fbTools : FastyBird\Core\Tools\DI\ToolsExtension fbExchange : FastyBird\Core\Exchange\DI\ExchangeExtension + fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension services: - {factory: Symfony\Component\EventDispatcher\EventDispatcher} From 47857a0ebe0169d883f137c27dc2e302f548f4dc Mon Sep 17 00:00:00 2001 From: Adam Kadlec Date: Mon, 25 Nov 2024 21:28:31 +0100 Subject: [PATCH 3/3] Configuration --- src/FastyBird/Core/Tools/tests/common.neon | 1 - 1 file changed, 1 deletion(-) diff --git a/src/FastyBird/Core/Tools/tests/common.neon b/src/FastyBird/Core/Tools/tests/common.neon index ebff3a6af..c3355c187 100644 --- a/src/FastyBird/Core/Tools/tests/common.neon +++ b/src/FastyBird/Core/Tools/tests/common.neon @@ -14,5 +14,4 @@ php: date.timezone: Europe/Prague extensions: - ipubDoctrineTimestampable : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension