diff --git a/Admin/Installer.php b/Admin/Installer.php index c3b442f..338dd5f 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -50,7 +50,7 @@ final class Installer extends InstallerAbstract self::importAccounts($app); } - private static function importAccounts(ApplicationAbstract $app) + private static function importAccounts(ApplicationAbstract $app) : void { /** @var \Modules\Accounting\Controller\ApiController $module */ $module = $app->moduleManager->getModuleInstance('Accounting', 'Api'); diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9376f2d..32cd708 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,15 +14,15 @@ declare(strict_types=1); namespace Modules\Accounting\Controller; -use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Message\RequestAbstract; -use phpOMS\Message\ResponseAbstract; -use phpOMS\Model\Message\FormValidation; use Modules\Accounting\Models\AccountAbstract; use Modules\Accounting\Models\AccountAbstractMapper; use Modules\Accounting\Models\AccountL11nMapper; use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\ISO639x1Enum; +use phpOMS\Message\Http\RequestStatusCode; +use phpOMS\Message\RequestAbstract; +use phpOMS\Message\ResponseAbstract; +use phpOMS\Model\Message\FormValidation; /** * Accounting controller class. @@ -95,7 +95,7 @@ final class ApiController extends Controller */ private function createAccountFromRequest(RequestAbstract $request) : AccountAbstract { - $account = new AccountAbstract(); + $account = new AccountAbstract(); $account->account = $request->getDataString('account') ?? ''; $account->setL11n($request->getDataString('content') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); diff --git a/Models/AccountAbstractMapper.php b/Models/AccountAbstractMapper.php index 61ed45f..4dc3cec 100644 --- a/Models/AccountAbstractMapper.php +++ b/Models/AccountAbstractMapper.php @@ -36,10 +36,10 @@ class AccountAbstractMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'accounting_account_id' => ['name' => 'accounting_account_id', 'type' => 'int', 'internal' => 'id'], + 'accounting_account_id' => ['name' => 'accounting_account_id', 'type' => 'int', 'internal' => 'id'], 'accounting_account_account' => ['name' => 'accounting_account_account', 'type' => 'string', 'internal' => 'account', 'autocomplete' => true], - 'accounting_account_type' => ['name' => 'accounting_account_type', 'type' => 'int', 'internal' => 'type'], - 'accounting_account_parent' => ['name' => 'accounting_account_parent', 'type' => 'string', 'internal' => 'parent'], + 'accounting_account_type' => ['name' => 'accounting_account_type', 'type' => 'int', 'internal' => 'type'], + 'accounting_account_parent' => ['name' => 'accounting_account_parent', 'type' => 'string', 'internal' => 'parent'], ]; /** diff --git a/Models/AccountL11nMapper.php b/Models/AccountL11nMapper.php index 7f8f9f8..9a225d6 100644 --- a/Models/AccountL11nMapper.php +++ b/Models/AccountL11nMapper.php @@ -37,10 +37,10 @@ final class AccountL11nMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'accounting_account_l11n_id' => ['name' => 'accounting_account_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'accounting_account_l11n_title' => ['name' => 'accounting_account_l11n_title', 'type' => 'string', 'internal' => 'content', 'autocomplete' => true], + 'accounting_account_l11n_id' => ['name' => 'accounting_account_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'accounting_account_l11n_title' => ['name' => 'accounting_account_l11n_title', 'type' => 'string', 'internal' => 'content', 'autocomplete' => true], 'accounting_account_l11n_account' => ['name' => 'accounting_account_l11n_account', 'type' => 'int', 'internal' => 'ref'], - 'accounting_account_l11n_lang' => ['name' => 'accounting_account_l11n_lang', 'type' => 'string', 'internal' => 'language'], + 'accounting_account_l11n_lang' => ['name' => 'accounting_account_l11n_lang', 'type' => 'string', 'internal' => 'language'], ]; /**