Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-10 14:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make framework test more independent

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-12-04 21:08:15 +01:00
parent 4dff9b5357
commit 863d69af78
6 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Router/SocketRouter.php
View File

@ -14,6 +14,8 @@ declare(strict_types=1);
namespace phpOMS\Router; namespace phpOMS\Router;
use phpOMS\Account\Account;
/** /**
* Router class for socket routes. * Router class for socket routes.
* *
@ -79,7 +81,7 @@ final class SocketRouter implements RouterInterface
*/ */
public function add( public function add(
string $route, string $route,
$destination, mixed $destination,
array $validation = [], array $validation = [],
string $dataPattern = '' string $dataPattern = ''
) : void { ) : void {
@ -97,11 +99,11 @@ final class SocketRouter implements RouterInterface
/** /**
* Route request. * Route request.
* *
* @param string $uri Route * @param string $uri Route
* @param string $app Application name * @param string $app Application name
* @param int $orgId Organization id * @param int $orgId Organization id
* @param mixed $account Account * @param Account $account Account
* @param array $data Data * @param array $data Data
* *
* @return array[] * @return array[]
* *
@ -111,7 +113,7 @@ final class SocketRouter implements RouterInterface
string $uri, string $uri,
string $app = null, string $app = null,
int $orgId = null, int $orgId = null,
$account = null, Account $account = null,
array $data = null array $data = null
) : array ) : array
{ {

20
Router/WebRouter.php
View File

@ -14,6 +14,8 @@ declare(strict_types=1);
namespace phpOMS\Router; namespace phpOMS\Router;
use phpOMS\Account\Account;
/** /**
* Router class for web routes. * Router class for web routes.
* *
@ -85,7 +87,7 @@ final class WebRouter implements RouterInterface
*/ */
public function add( public function add(
string $route, string $route,
$destination, mixed $destination,
int $verb = RouteVerb::GET, int $verb = RouteVerb::GET,
bool $csrf = false, array $validation = [], bool $csrf = false, array $validation = [],
string $dataPattern = '' string $dataPattern = ''
@ -106,13 +108,13 @@ final class WebRouter implements RouterInterface
/** /**
* Route request. * Route request.
* *
* @param string $uri Route * @param string $uri Route
* @param string $csrf CSRF token * @param string $csrf CSRF token
* @param int $verb Route verb * @param int $verb Route verb
* @param string $app Application name * @param string $app Application name
* @param int $orgId Organization id * @param int $orgId Organization id
* @param mixed $account Account * @param Account $account Account
* @param array $data Validation * @param array $data Validation
* *
* @return array[] * @return array[]
* *
@ -124,7 +126,7 @@ final class WebRouter implements RouterInterface
int $verb = RouteVerb::GET, int $verb = RouteVerb::GET,
string $app = null, string $app = null,
int $orgId = null, int $orgId = null,
$account = null, Account $account = null,
array $data = null array $data = null
) : array ) : array
{ {

14
tests/Router/SocketRouterTest.php
View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace phpOMS\tests\Router; namespace phpOMS\tests\Router;
use Modules\Admin\Controller\BackendController;
use Modules\Admin\Models\PermissionState;
use phpOMS\Account\Account; use phpOMS\Account\Account;
use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionAbstract;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
@ -108,9 +106,9 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase
$perm = new class( $perm = new class(
null, null,
null, null,
BackendController::MODULE_NAME, 'TEST',
0, 0,
PermissionState::SETTINGS, 1,
null, null,
null, null,
PermissionType::READ PermissionType::READ
@ -141,9 +139,9 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase
$perm2 = new class( $perm2 = new class(
null, null,
null, null,
BackendController::MODULE_NAME, 'TEST',
0, 0,
PermissionState::SETTINGS, 1,
null, null,
null, null,
PermissionType::CREATE PermissionType::CREATE
@ -154,7 +152,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase
null, null,
'InvalidModule', 'InvalidModule',
0, 0,
PermissionState::SETTINGS, 1,
null, null,
null, null,
PermissionType::READ PermissionType::READ
@ -163,7 +161,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase
$perm4 = new class( $perm4 = new class(
null, null,
null, null,
BackendController::MODULE_NAME, 'TEST',
0, 0,
99, 99,
null, null,

14
tests/Router/WebRouterTest.php
View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace phpOMS\tests\Router; namespace phpOMS\tests\Router;
use Modules\Admin\Controller\BackendController;
use Modules\Admin\Models\PermissionState;
use phpOMS\Account\Account; use phpOMS\Account\Account;
use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionAbstract;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
@ -199,9 +197,9 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
$perm = new class( $perm = new class(
null, null,
null, null,
BackendController::MODULE_NAME, 'TEST',
0, 0,
PermissionState::SETTINGS, 1,
null, null,
null, null,
PermissionType::READ PermissionType::READ
@ -239,9 +237,9 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
$perm2 = new class( $perm2 = new class(
null, null,
null, null,
BackendController::MODULE_NAME, 'TEST',
0, 0,
PermissionState::SETTINGS, 1,
null, null,
null, null,
PermissionType::CREATE PermissionType::CREATE
@ -252,7 +250,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
null, null,
'InvalidModule', 'InvalidModule',
0, 0,
PermissionState::SETTINGS, 1,
null, null,
null, null,
PermissionType::READ PermissionType::READ
@ -261,7 +259,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
$perm4 = new class( $perm4 = new class(
null, null,
null, null,
BackendController::MODULE_NAME, 'TEST',
0, 0,
99, 99,
null, null,

6
tests/Router/socketRouterTestFilePermission.php
View File

@ -1,7 +1,5 @@
<?php declare(strict_types=1); <?php declare(strict_types=1);
use Modules\Admin\Controller\BackendController;
use Modules\Admin\Models\PermissionState;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
return [ return [
@ -9,9 +7,9 @@ return [
0 => [ 0 => [
'dest' => '\Modules\Admin\Controller:viewSettingsGeneral', 'dest' => '\Modules\Admin\Controller:viewSettingsGeneral',
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => 'TEST',
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SETTINGS, 'state' => 1,
], ],
], ],
], ],

6
tests/Router/webRouterTestFilePermission.php
View File

@ -1,7 +1,5 @@
<?php declare(strict_types=1); <?php declare(strict_types=1);
use Modules\Admin\Controller\BackendController;
use Modules\Admin\Models\PermissionState;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
@ -11,9 +9,9 @@ return [
'dest' => '\Modules\Admin\Controller:viewSettingsGeneral', 'dest' => '\Modules\Admin\Controller:viewSettingsGeneral',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => 'TEST',
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SETTINGS, 'state' => 1,
], ],
], ],
], ],