diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 8ddfe7c..0ceb387 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -92,8 +92,8 @@ final class ApiController extends Controller */ private function createBoardFromRequest(RequestAbstract $request) : DashboardBoard { - $board = new DashboardBoard(); - $board->title = (string) ($request->getData('title') ?? ''); + $board = new DashboardBoard(); + $board->title = (string) ($request->getData('title') ?? ''); $board->account = $request->header->account; $board->setStatus(DashboardBoardStatus::ACTIVE); @@ -159,9 +159,9 @@ final class ApiController extends Controller */ private function createComponentFromRequest(RequestAbstract $request) : DashboardComponent { - $component = new DashboardComponent(); - $component->board = (int) ($request->getData('board') ?? 0); - $component->order = (int) ($request->getData('order') ?? 0); + $component = new DashboardComponent(); + $component->board = (int) ($request->getData('board') ?? 0); + $component->order = (int) ($request->getData('order') ?? 0); $component->module = (string) ($request->getData('module') ?? ''); return $component; diff --git a/Models/NullDashboardBoard.php b/Models/NullDashboardBoard.php index 4845509..dd12a62 100755 --- a/Models/NullDashboardBoard.php +++ b/Models/NullDashboardBoard.php @@ -24,7 +24,7 @@ namespace Modules\Dashboard\Models; */ final class NullDashboardBoard extends DashboardBoard { - /** + /** * Constructor * * @param int $id Model id diff --git a/Models/NullDashboardComponent.php b/Models/NullDashboardComponent.php index fa26fd0..5be181c 100755 --- a/Models/NullDashboardComponent.php +++ b/Models/NullDashboardComponent.php @@ -24,7 +24,7 @@ namespace Modules\Dashboard\Models; */ final class NullDashboardComponent extends DashboardComponent { - /** + /** * Constructor * * @param int $id Model id diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 051ac7e..f5fc99c 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -392,4 +392,4 @@ function phpServe() : void }); } -phpServe(); +\phpServe(); diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 1f9ae36..8d8e20a 100644 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -16,22 +16,21 @@ namespace Modules\Dashboard\tests\Controller; use Model\CoreSettings; use Modules\Admin\Models\AccountPermission; -use phpOMS\DataStorage\Session\HttpSession; use phpOMS\Account\Account; use phpOMS\Account\AccountManager; use phpOMS\Account\PermissionType; use phpOMS\Application\ApplicationAbstract; +use phpOMS\DataStorage\Session\HttpSession; use phpOMS\Dispatcher\Dispatcher; use phpOMS\Event\EventManager; -use phpOMS\Module\ModuleAbstract; -use phpOMS\Module\ModuleManager; -use phpOMS\Router\WebRouter; -use phpOMS\Utils\TestUtils; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; +use phpOMS\Module\ModuleAbstract; +use phpOMS\Module\ModuleManager; +use phpOMS\Router\WebRouter; use phpOMS\Uri\HttpUri; -use phpOMS\System\MimeType; +use phpOMS\Utils\TestUtils; /** * @testdox Modules\Dashboard\tests\Controller\ApiControllerTest: Dashboard api controller diff --git a/tests/Models/DashboardBoardTest.php b/tests/Models/DashboardBoardTest.php index 770bb5d..50b8660 100644 --- a/tests/Models/DashboardBoardTest.php +++ b/tests/Models/DashboardBoardTest.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\Dashboard\tests\Models; use Modules\Dashboard\Models\DashboardBoard; -use Modules\Dashboard\Models\DashboardComponent; use Modules\Dashboard\Models\DashboardBoardStatus; +use Modules\Dashboard\Models\DashboardComponent; /** * @internal @@ -41,7 +41,7 @@ final class DashboardBoardTest extends \PHPUnit\Framework\TestCase { self::assertEquals(0, $this->board->getId()); self::assertEquals('', $this->board->title); - self::assertEquals(null, $this->board->account); + self::assertNull($this->board->account); self::assertEquals([], $this->board->getComponents()); self::assertEquals(DashboardBoardStatus::ACTIVE, $this->board->getStatus()); self::assertInstanceOf('\Modules\Dashboard\Models\NullDashboardComponent', $this->board->getComponent(0)); @@ -86,17 +86,17 @@ final class DashboardBoardTest extends \PHPUnit\Framework\TestCase */ public function testSerialize() : void { - $this->board->title = 'Title'; + $this->board->title = 'Title'; $this->board->account = 2; $this->board->setStatus(DashboardBoardStatus::INACTIVE); self::assertEquals( [ - 'id' => 0, - 'account' => 2, - 'title' => 'Title', + 'id' => 0, + 'account' => 2, + 'title' => 'Title', 'status' => DashboardBoardStatus::INACTIVE, - 'components' => [], + 'components' => [], ], $this->board->jsonSerialize() ); diff --git a/tests/Models/DashboardComponentTest.php b/tests/Models/DashboardComponentTest.php index c9cf1ab..5051e8a 100644 --- a/tests/Models/DashboardComponentTest.php +++ b/tests/Models/DashboardComponentTest.php @@ -50,17 +50,17 @@ final class DashboardComponentTest extends \PHPUnit\Framework\TestCase */ public function testSerialize() : void { - $this->component->board = 3; - $this->component->order = 2; - $this->component->module = 'Test'; + $this->component->board = 3; + $this->component->order = 2; + $this->component->module = 'Test'; $this->component->component = 'Component'; self::assertEquals( [ - 'id' => 0, - 'board' => 3, - 'order' => 2, - 'module' => 'Test', + 'id' => 0, + 'board' => 3, + 'order' => 2, + 'module' => 'Test', 'component' => 'Component', ], $this->component->jsonSerialize()