[core] Reorganizing project packages (#320)

FastyBird · Nov 25, 2024 · 7050c3c · 7050c3c
1 parent af47e53
commit 7050c3c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -34,11 +34,11 @@
   "require": {
     "php": ">=8.2.0",
     "cweagans/composer-patches": "^1.7",
-    "fastybird/application-library": "dev-main",
-    "fastybird/exchange-library": "dev-main",
+    "fastybird/application": "dev-main",
+    "fastybird/exchange": "dev-main",
     "fastybird/metadata-library": "dev-main",
     "ipub/websockets-wamp": "^1.4",
-    "nette/di": "^3.0",
+    "nette/di": "^3.2",
     "nette/utils": "^4.0",
     "psr/event-dispatcher": "^1.0",
     "psr/log": "^3.0",

diff --git a/src/Commands/WsServer.php b/src/Commands/WsServer.php
@@ -15,8 +15,8 @@
 
 namespace FastyBird\Plugin\WsServer\Commands;
 
-use FastyBird\Library\Application\Helpers as ApplicationHelpers;
-use FastyBird\Library\Exchange\Exchange as ExchangeExchange;
+use FastyBird\Core\Exchange\Exchange as ExchangeExchange;
+use FastyBird\Core\Tools\Helpers as ToolsHelpers;
 use FastyBird\Library\Metadata\Types as MetadataTypes;
 use FastyBird\Plugin\WsServer\Events;
 use IPub\WebSockets;
@@ -103,7 +103,7 @@ protected function execute(
 					[
 						'source' => MetadataTypes\Sources\Plugin::WS_SERVER->value,
 						'type' => 'server-command',
-						'exception' => ApplicationHelpers\Logger::buildException($ex),
+						'exception' => ToolsHelpers\Logger::buildException($ex),
 					],
 				);
 			});
@@ -123,7 +123,7 @@ protected function execute(
 				[
 					'source' => MetadataTypes\Sources\Plugin::WS_SERVER->value,
 					'type' => 'server-command',
-					'exception' => ApplicationHelpers\Logger::buildException($ex),
+					'exception' => ToolsHelpers\Logger::buildException($ex),
 					'cmd' => $this->getName(),
 				],
 			);
@@ -137,7 +137,7 @@ protected function execute(
 				[
 					'source' => MetadataTypes\Sources\Plugin::WS_SERVER->value,
 					'type' => 'server-command',
-					'exception' => ApplicationHelpers\Logger::buildException($ex),
+					'exception' => ToolsHelpers\Logger::buildException($ex),
 					'cmd' => $this->getName(),
 				],
 			);

diff --git a/src/DI/WsServerExtension.php b/src/DI/WsServerExtension.php
@@ -15,8 +15,8 @@
 
 namespace FastyBird\Plugin\WsServer\DI;
 
-use FastyBird\Library\Application\Boot as ApplicationBoot;
-use FastyBird\Library\Exchange\Exchange as ExchangeExchange;
+use FastyBird\Core\Application\Boot as ApplicationBoot;
+use FastyBird\Core\Exchange\Exchange as ExchangeExchange;
 use FastyBird\Plugin\WsServer\Commands;
 use FastyBird\Plugin\WsServer\Events;
 use FastyBird\Plugin\WsServer\Exceptions;

diff --git a/src/Subscribers/Client.php b/src/Subscribers/Client.php
@@ -16,8 +16,8 @@
 namespace FastyBird\Plugin\WsServer\Subscribers;
 
 use Doctrine\DBAL;
-use FastyBird\Library\Application\Exceptions as ApplicationExceptions;
-use FastyBird\Library\Application\Helpers as ApplicationHelpers;
+use FastyBird\Core\Tools\Exceptions as ToolsExceptions;
+use FastyBird\Core\Tools\Helpers as ToolsHelpers;
 use FastyBird\Library\Metadata\Types as MetadataTypes;
 use FastyBird\Plugin\WsServer;
 use FastyBird\Plugin\WsServer\Events;
@@ -45,7 +45,7 @@ class Client implements EventDispatcher\EventSubscriberInterface
 	private array $allowedOrigins;
 
 	public function __construct(
-		private readonly ApplicationHelpers\Database $database,
+		private readonly ToolsHelpers\Database $database,
 		private readonly Log\LoggerInterface $logger = new Log\NullLogger(),
 		string|null $wsKeys = null,
 		string|null $allowedOrigins = null,
@@ -72,8 +72,8 @@ public function clientConnected(Events\ClientConnected $event): void
 	}
 
 	/**
-	 * @throws ApplicationExceptions\InvalidState
 	 * @throws DBAL\Exception
+	 * @throws ToolsExceptions\InvalidState
 	 * @throws WebSockets\Exceptions\InvalidArgumentException
 	 * @throws WebSockets\Exceptions\TerminateException
 	 */

diff --git a/tests/cases/unit/BaseTestCase.php b/tests/cases/unit/BaseTestCase.php
@@ -3,8 +3,8 @@
 namespace FastyBird\Plugin\WsServer\Tests\Cases\Unit;
 
 use Error;
-use FastyBird\Library\Application\Boot as ApplicationBoot;
-use FastyBird\Library\Application\Exceptions as ApplicationExceptions;
+use FastyBird\Core\Application\Boot as ApplicationBoot;
+use FastyBird\Core\Application\Exceptions as ApplicationExceptions;
 use FastyBird\Plugin\WsServer;
 use Nette;
 use Nette\DI;

diff --git a/tests/common.neon b/tests/common.neon
@@ -17,12 +17,12 @@ extensions:
     ipubWebSocketsWAMP      : IPub\WebSocketsWAMP\DI\WebSocketsWAMPExtension
     ipubWebSockets          : IPub\WebSockets\DI\WebSocketsExtension
     ipubPhone               : IPub\Phone\DI\PhoneExtension
-    fbMetadataLibrary       : FastyBird\Library\Metadata\DI\MetadataExtension
-    fbExchangeLibrary       : FastyBird\Library\Exchange\DI\ExchangeExtension
+    fbTools                 : FastyBird\Core\Tools\DI\ToolsExtension
+    fbExchange              : FastyBird\Core\Exchange\DI\ExchangeExtension
 
 services:
     - {factory: Symfony\Component\EventDispatcher\EventDispatcher}
 
-fbMetadataLibrary:
+fbApplication:
     documents:
-        mapping: []
+        mapping: []