diff --git a/Admin/Installer.php b/Admin/Installer.php index f4cfd3f..bdcd03c 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -14,13 +14,13 @@ declare(strict_types=1); namespace Modules\Admin\Admin; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Config\SettingsInterface; use phpOMS\DataStorage\Database\Connection\SQLiteConnection; use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Module\InstallerAbstract; use phpOMS\Module\ModuleInfo; -use phpOMS\Application\ApplicationAbstract; use phpOMS\System\File\PathException; /** @@ -207,8 +207,8 @@ final class Installer extends InstallerAbstract /** * Create settings. * - * @param ApplicationAbstract $app Database instance - * @param array $settings Media info + * @param ApplicationAbstract $app Database instance + * @param array $settings Media info * * @return array * diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 990fb06..9d21156 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -26,6 +26,7 @@ use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\GroupPermission; use Modules\Admin\Models\GroupPermissionMapper; use Modules\Admin\Models\LocalizationMapper; +use Modules\Admin\Models\Module; use Modules\Admin\Models\ModuleMapper; use Modules\Admin\Models\ModuleStatusUpdateType; use Modules\Admin\Models\NullAccount; @@ -39,10 +40,13 @@ use phpOMS\Account\GroupStatus; use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionOwner; use phpOMS\Account\PermissionType; +use phpOMS\Application\ApplicationInfo; use phpOMS\Application\ApplicationManager; use phpOMS\Auth\LoginReturnType; +use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Localization\Localization; use phpOMS\Message\Http\HttpRequest; +use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestMethod; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\Rest; @@ -56,6 +60,8 @@ use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\Notify; use phpOMS\Model\Message\NotifyType; use phpOMS\Model\Message\Reload; +use phpOMS\Module\ModuleInfo; +use phpOMS\Module\ModuleStatus; use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\File; use phpOMS\System\MimeType; @@ -65,12 +71,6 @@ use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\StringUtils; use phpOMS\Validation\Network\Email as EmailValidator; use phpOMS\Version\Version; -use phpOMS\Application\ApplicationInfo; -use phpOMS\Module\ModuleInfo; -use Modules\Admin\Models\Module; -use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\Message\Http\HttpResponse; -use phpOMS\Module\ModuleStatus; /** * Admin controller class. @@ -1101,10 +1101,10 @@ final class ApiController extends Controller } // install module - $moduleObj = new Module(); - $moduleObj->id = $module; - $moduleObj->theme = 'Default'; - $moduleObj->path = $moduleInfo->getDirectory(); + $moduleObj = new Module(); + $moduleObj->id = $module; + $moduleObj->theme = 'Default'; + $moduleObj->path = $moduleInfo->getDirectory(); $moduleObj->version = $moduleInfo->getVersion(); $moduleObj->setStatus(ModuleStatus::AVAILABLE); @@ -1140,7 +1140,7 @@ final class ApiController extends Controller // install receiving from application (receiving from module is already installed during the module installation) $appManager = new ApplicationManager($this->app); - $receiving = $appManager->getProvidingForModule($module); + $receiving = $appManager->getProvidingForModule($module); foreach ($receiving as $app => $modules) { foreach ($modules as $module) { $this->app->moduleManager->installProviding('/Web/' . $app, $module); diff --git a/Models/App.php b/Models/App.php index 5056fa1..6153863 100644 --- a/Models/App.php +++ b/Models/App.php @@ -70,4 +70,3 @@ class App return $this->id; } } - diff --git a/Models/Module.php b/Models/Module.php index ac3ef89..02cfc12 100755 --- a/Models/Module.php +++ b/Models/Module.php @@ -161,12 +161,12 @@ class Module public function toArray() : array { return [ - 'id' => $this->id, - 'name' => $this->name, - 'path' => $this->path, + 'id' => $this->id, + 'name' => $this->name, + 'path' => $this->path, 'version' => $this->version, - 'status' => $this->status, - 'createdAt' => $this->createdAt, + 'status' => $this->status, + 'createdAt' => $this->createdAt, ]; } } diff --git a/Models/ModuleMapper.php b/Models/ModuleMapper.php index 6902026..8cb5d62 100755 --- a/Models/ModuleMapper.php +++ b/Models/ModuleMapper.php @@ -33,11 +33,11 @@ final class ModuleMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'module_id' => ['name' => 'module_id', 'type' => 'string', 'internal' => 'id'], - 'module_path' => ['name' => 'module_path', 'type' => 'string', 'internal' => 'path'], - 'module_theme' => ['name' => 'module_theme', 'type' => 'string', 'internal' => 'theme'], + 'module_id' => ['name' => 'module_id', 'type' => 'string', 'internal' => 'id'], + 'module_path' => ['name' => 'module_path', 'type' => 'string', 'internal' => 'path'], + 'module_theme' => ['name' => 'module_theme', 'type' => 'string', 'internal' => 'theme'], 'module_version' => ['name' => 'module_version', 'type' => 'string', 'internal' => 'version'], - 'module_status' => ['name' => 'module_status', 'type' => 'int', 'internal' => 'status'], + 'module_status' => ['name' => 'module_status', 'type' => 'int', 'internal' => 'status'], ]; /**