mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-02-11 22:38:42 +00:00
Merge branch 'develop' of https://github.com/Orange-Management/phpOMS into develop
This commit is contained in:
commit
5fb18505dc
|
|
@ -147,7 +147,7 @@ final class ApplicationManager
|
||||||
return $providing;
|
return $providing;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all installed modules.
|
* Get all installed modules.
|
||||||
*
|
*
|
||||||
* @param bool $useCache Use Cache
|
* @param bool $useCache Use Cache
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ namespace phpOMS\Application;
|
||||||
|
|
||||||
use phpOMS\Config\SettingsInterface;
|
use phpOMS\Config\SettingsInterface;
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
use phpOMS\DataStorage\Database\Query\Builder;
|
|
||||||
use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
|
use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
|
||||||
use phpOMS\System\File\Local\Directory;
|
use phpOMS\System\File\Local\Directory;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,10 @@ declare(strict_types=1);
|
||||||
namespace phpOMS\Application;
|
namespace phpOMS\Application;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
use phpOMS\DataStorage\Database\Query\Builder;
|
|
||||||
use phpOMS\Utils\Parser\Php\ArrayParser;
|
|
||||||
use phpOMS\System\File\PermissionException;
|
|
||||||
use phpOMS\System\File\PathException;
|
use phpOMS\System\File\PathException;
|
||||||
|
use phpOMS\System\File\PermissionException;
|
||||||
use phpOMS\Utils\ArrayUtils;
|
use phpOMS\Utils\ArrayUtils;
|
||||||
|
use phpOMS\Utils\Parser\Php\ArrayParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Status abstract class.
|
* Status abstract class.
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,8 @@ final class L11nManager
|
||||||
/**
|
/**
|
||||||
* Load language file which contains multiple languages.
|
* Load language file which contains multiple languages.
|
||||||
*
|
*
|
||||||
* @param string $from Module name
|
* @param string $from Module name
|
||||||
* @param string $file File to import language from
|
* @param string $file File to import language from
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ namespace phpOMS\Module;
|
||||||
use phpOMS\Application\ApplicationInfo;
|
use phpOMS\Application\ApplicationInfo;
|
||||||
use phpOMS\Config\SettingsInterface;
|
use phpOMS\Config\SettingsInterface;
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
use phpOMS\DataStorage\Database\Query\Builder;
|
|
||||||
use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
|
use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ namespace phpOMS\Module;
|
||||||
|
|
||||||
use phpOMS\Application\ApplicationInfo;
|
use phpOMS\Application\ApplicationInfo;
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
use phpOMS\DataStorage\Database\Query\Builder;
|
|
||||||
use phpOMS\System\File\Local\Directory;
|
use phpOMS\System\File\Local\Directory;
|
||||||
use phpOMS\System\File\Local\File;
|
use phpOMS\System\File\Local\File;
|
||||||
use phpOMS\System\File\PathException;
|
use phpOMS\System\File\PathException;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user