diff --git a/Router/SocketRouter.php b/Router/SocketRouter.php index 952328a18..5619323eb 100644 --- a/Router/SocketRouter.php +++ b/Router/SocketRouter.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace phpOMS\Router; +use phpOMS\Account\Account; + /** * Router class for socket routes. * @@ -79,7 +81,7 @@ final class SocketRouter implements RouterInterface */ public function add( string $route, - $destination, + mixed $destination, array $validation = [], string $dataPattern = '' ) : void { @@ -97,11 +99,11 @@ final class SocketRouter implements RouterInterface /** * Route request. * - * @param string $uri Route - * @param string $app Application name - * @param int $orgId Organization id - * @param mixed $account Account - * @param array $data Data + * @param string $uri Route + * @param string $app Application name + * @param int $orgId Organization id + * @param Account $account Account + * @param array $data Data * * @return array[] * @@ -111,7 +113,7 @@ final class SocketRouter implements RouterInterface string $uri, string $app = null, int $orgId = null, - $account = null, + Account $account = null, array $data = null ) : array { diff --git a/Router/WebRouter.php b/Router/WebRouter.php index bf63bd445..990ef1134 100644 --- a/Router/WebRouter.php +++ b/Router/WebRouter.php @@ -14,6 +14,8 @@ declare(strict_types=1); namespace phpOMS\Router; +use phpOMS\Account\Account; + /** * Router class for web routes. * @@ -85,7 +87,7 @@ final class WebRouter implements RouterInterface */ public function add( string $route, - $destination, + mixed $destination, int $verb = RouteVerb::GET, bool $csrf = false, array $validation = [], string $dataPattern = '' @@ -106,13 +108,13 @@ final class WebRouter implements RouterInterface /** * Route request. * - * @param string $uri Route - * @param string $csrf CSRF token - * @param int $verb Route verb - * @param string $app Application name - * @param int $orgId Organization id - * @param mixed $account Account - * @param array $data Validation + * @param string $uri Route + * @param string $csrf CSRF token + * @param int $verb Route verb + * @param string $app Application name + * @param int $orgId Organization id + * @param Account $account Account + * @param array $data Validation * * @return array[] * @@ -124,7 +126,7 @@ final class WebRouter implements RouterInterface int $verb = RouteVerb::GET, string $app = null, int $orgId = null, - $account = null, + Account $account = null, array $data = null ) : array { diff --git a/tests/Router/SocketRouterTest.php b/tests/Router/SocketRouterTest.php index 9f2225a89..627456cda 100644 --- a/tests/Router/SocketRouterTest.php +++ b/tests/Router/SocketRouterTest.php @@ -14,8 +14,6 @@ declare(strict_types=1); namespace phpOMS\tests\Router; -use Modules\Admin\Controller\BackendController; -use Modules\Admin\Models\PermissionState; use phpOMS\Account\Account; use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionType; @@ -108,9 +106,9 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase $perm = new class( null, null, - BackendController::MODULE_NAME, + 'TEST', 0, - PermissionState::SETTINGS, + 1, null, null, PermissionType::READ @@ -141,9 +139,9 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase $perm2 = new class( null, null, - BackendController::MODULE_NAME, + 'TEST', 0, - PermissionState::SETTINGS, + 1, null, null, PermissionType::CREATE @@ -154,7 +152,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase null, 'InvalidModule', 0, - PermissionState::SETTINGS, + 1, null, null, PermissionType::READ @@ -163,7 +161,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase $perm4 = new class( null, null, - BackendController::MODULE_NAME, + 'TEST', 0, 99, null, diff --git a/tests/Router/WebRouterTest.php b/tests/Router/WebRouterTest.php index 19d07dfef..6fa92abe4 100644 --- a/tests/Router/WebRouterTest.php +++ b/tests/Router/WebRouterTest.php @@ -14,8 +14,6 @@ declare(strict_types=1); namespace phpOMS\tests\Router; -use Modules\Admin\Controller\BackendController; -use Modules\Admin\Models\PermissionState; use phpOMS\Account\Account; use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionType; @@ -199,9 +197,9 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase $perm = new class( null, null, - BackendController::MODULE_NAME, + 'TEST', 0, - PermissionState::SETTINGS, + 1, null, null, PermissionType::READ @@ -239,9 +237,9 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase $perm2 = new class( null, null, - BackendController::MODULE_NAME, + 'TEST', 0, - PermissionState::SETTINGS, + 1, null, null, PermissionType::CREATE @@ -252,7 +250,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase null, 'InvalidModule', 0, - PermissionState::SETTINGS, + 1, null, null, PermissionType::READ @@ -261,7 +259,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase $perm4 = new class( null, null, - BackendController::MODULE_NAME, + 'TEST', 0, 99, null, diff --git a/tests/Router/socketRouterTestFilePermission.php b/tests/Router/socketRouterTestFilePermission.php index 6624bf0da..9569b75f5 100644 --- a/tests/Router/socketRouterTestFilePermission.php +++ b/tests/Router/socketRouterTestFilePermission.php @@ -1,7 +1,5 @@ [ 'dest' => '\Modules\Admin\Controller:viewSettingsGeneral', 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => 'TEST', 'type' => PermissionType::READ, - 'state' => PermissionState::SETTINGS, + 'state' => 1, ], ], ], diff --git a/tests/Router/webRouterTestFilePermission.php b/tests/Router/webRouterTestFilePermission.php index 5f5fc731b..8044fbbf1 100644 --- a/tests/Router/webRouterTestFilePermission.php +++ b/tests/Router/webRouterTestFilePermission.php @@ -1,7 +1,5 @@ '\Modules\Admin\Controller:viewSettingsGeneral', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => 'TEST', 'type' => PermissionType::READ, - 'state' => PermissionState::SETTINGS, + 'state' => 1, ], ], ],