From aa7bb25b3604d79b83a5be5bf88c15756ee916ac Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 24 Feb 2020 21:22:35 +0100 Subject: [PATCH] move ApplicationAbstract --- .../ApplicationAbstract.php | 2 +- Application/ApplicationInfo.php | 0 Application/ApplicationManager.php | 48 +++++++++++++++++++ Application/infoLayout.json | 21 ++++++++ Dispatcher/Dispatcher.php | 2 +- Module/InstallerAbstract.php | 28 +++++------ Module/ModuleAbstract.php | 2 +- Module/{InfoManager.php => ModuleInfo.php} | 4 +- Module/ModuleManager.php | 26 +++++----- Module/StatusAbstract.php | 16 +++---- Module/UninstallerAbstract.php | 12 ++--- Module/UpdaterAbstract.php | 4 +- Socket/Client/Client.php | 2 +- Socket/Server/Server.php | 2 +- .../ApplicationAbstractTest.php | 10 ++-- tests/Dispatcher/DispatcherTest.php | 2 +- tests/Module/ModuleAbstractTest.php | 2 +- ...InfoManagerTest.php => ModuleInfoTest.php} | 28 +++++------ tests/Module/ModuleManagerTest.php | 2 +- tests/Module/NullModuleTest.php | 2 +- tests/Socket/Client/ClientTest.php | 2 +- tests/Socket/Client/ClientTestHelper.php | 2 +- tests/Socket/Server/ServerTest.php | 2 +- tests/Views/ViewTest.php | 2 +- 24 files changed, 146 insertions(+), 77 deletions(-) rename ApplicationAbstract.php => Application/ApplicationAbstract.php (99%) create mode 100644 Application/ApplicationInfo.php create mode 100644 Application/ApplicationManager.php create mode 100644 Application/infoLayout.json rename Module/{InfoManager.php => ModuleInfo.php} (99%) rename tests/{ => Application}/ApplicationAbstractTest.php (76%) rename tests/Module/{InfoManagerTest.php => ModuleInfoTest.php} (80%) diff --git a/ApplicationAbstract.php b/Application/ApplicationAbstract.php similarity index 99% rename from ApplicationAbstract.php rename to Application/ApplicationAbstract.php index beaf9aa23..6935ea4fe 100644 --- a/ApplicationAbstract.php +++ b/Application/ApplicationAbstract.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace phpOMS; +namespace phpOMS\Application; use phpOMS\Account\AccountManager; use phpOMS\Config\SettingsInterface; diff --git a/Application/ApplicationInfo.php b/Application/ApplicationInfo.php new file mode 100644 index 000000000..e69de29bb diff --git a/Application/ApplicationManager.php b/Application/ApplicationManager.php new file mode 100644 index 000000000..7e1d15af1 --- /dev/null +++ b/Application/ApplicationManager.php @@ -0,0 +1,48 @@ +get('insert')); $queryModule->prefix($dbPool->get('insert')->prefix); @@ -79,13 +79,13 @@ abstract class InstallerAbstract * Install module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function install(DatabasePool $dbPool, InfoManager $info) : void + public static function install(DatabasePool $dbPool, ModuleInfo $info) : void { self::createTables($dbPool, $info); self::registerInDatabase($dbPool, $info); @@ -98,13 +98,13 @@ abstract class InstallerAbstract * Create tables for module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - private static function createTables(DatabasePool $dbPool, InfoManager $info) : void + private static function createTables(DatabasePool $dbPool, ModuleInfo $info) : void { $path = \dirname($info->getPath()) . '/Admin/Install/db.json'; @@ -127,13 +127,13 @@ abstract class InstallerAbstract * Activate after install. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - private static function activate(DatabasePool $dbPool, InfoManager $info) : void + private static function activate(DatabasePool $dbPool, ModuleInfo $info) : void { /** @var StatusAbstract $class */ $class = '\Modules\\' . $info->getDirectory() . '\Admin\Status'; @@ -143,13 +143,13 @@ abstract class InstallerAbstract /** * Re-init module. * - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function reInit(InfoManager $info) : void + public static function reInit(ModuleInfo $info) : void { self::initRoutes($info); self::initHooks($info); @@ -158,7 +158,7 @@ abstract class InstallerAbstract /** * Init routes. * - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * @@ -166,7 +166,7 @@ abstract class InstallerAbstract * * @since 1.0.0 */ - private static function initRoutes(InfoManager $info) : void + private static function initRoutes(ModuleInfo $info) : void { $directories = new Directory(\dirname($info->getPath()) . '/Admin/Routes'); @@ -224,7 +224,7 @@ abstract class InstallerAbstract /** * Init hooks. * - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * @@ -232,7 +232,7 @@ abstract class InstallerAbstract * * @since 1.0.0 */ - private static function initHooks(InfoManager $info) : void + private static function initHooks(ModuleInfo $info) : void { $directories = new Directory(\dirname($info->getPath()) . '/Admin/Hooks'); diff --git a/Module/ModuleAbstract.php b/Module/ModuleAbstract.php index 02acd6d0e..be0169e2b 100644 --- a/Module/ModuleAbstract.php +++ b/Module/ModuleAbstract.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Module; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\System\MimeType; diff --git a/Module/InfoManager.php b/Module/ModuleInfo.php similarity index 99% rename from Module/InfoManager.php rename to Module/ModuleInfo.php index ab1dcf4df..88be4a9f3 100644 --- a/Module/InfoManager.php +++ b/Module/ModuleInfo.php @@ -18,7 +18,7 @@ use phpOMS\System\File\PathException; use phpOMS\Utils\ArrayUtils; /** - * InfoManager class. + * ModuleInfo class. * * Handling the info files for modules * @@ -27,7 +27,7 @@ use phpOMS\Utils\ArrayUtils; * @link https://orange-management.org * @since 1.0.0 */ -final class InfoManager +final class ModuleInfo { /** * File path. diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php index 1b701b9d8..bcb587e32 100644 --- a/Module/ModuleManager.php +++ b/Module/ModuleManager.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Module; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Autoloader; use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Message\Http\HttpRequest; @@ -23,7 +23,7 @@ use phpOMS\Module\Exception\InvalidModuleException; use phpOMS\System\File\PathException; /** - * Modules class. + * Module manager class. * * General module functionality such as listings and initialization. * @@ -66,7 +66,7 @@ final class ModuleManager /** * Installed modules. * - * @var array + * @var array * @since 1.0.0 */ private array $installed = []; @@ -288,7 +288,7 @@ final class ModuleManager * * @param bool $useCache Use Cache * - * @return array + * @return array * * @since 1.0.0 */ @@ -323,11 +323,11 @@ final class ModuleManager * * @param string $module Module name * - * @return InfoManager + * @return ModuleInfo * * @since 1.0.0 */ - private function loadInfo(string $module) : InfoManager + private function loadInfo(string $module) : ModuleInfo { $path = \realpath($oldPath = $this->modulePath . '/' . $module . '/info.json'); @@ -335,7 +335,7 @@ final class ModuleManager throw new PathException($oldPath); } - $info = new InfoManager($path); + $info = new ModuleInfo($path); $info->load(); return $info; @@ -372,7 +372,7 @@ final class ModuleManager /** * Deactivate module. * - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * @@ -380,7 +380,7 @@ final class ModuleManager * * @since 1.0.0 */ - private function deactivateModule(InfoManager $info) : void + private function deactivateModule(ModuleInfo $info) : void { $class = '\\Modules\\' . $info->getDirectory() . '\\Admin\\Status'; @@ -423,7 +423,7 @@ final class ModuleManager /** * Activate module. * - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * @@ -431,7 +431,7 @@ final class ModuleManager * * @since 1.0.0 */ - private function activateModule(InfoManager $info) : void + private function activateModule(ModuleInfo $info) : void { $class = '\\Modules\\' . $info->getDirectory() . '\\Admin\\Status'; @@ -598,7 +598,7 @@ final class ModuleManager /** * Install module itself. * - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * @@ -606,7 +606,7 @@ final class ModuleManager * * @since 1.0.0 */ - private function installModule(InfoManager $info) : void + private function installModule(ModuleInfo $info) : void { $class = '\\Modules\\' . $info->getDirectory() . '\\Admin\\Installer'; diff --git a/Module/StatusAbstract.php b/Module/StatusAbstract.php index 9bad21bcc..dccb3dc41 100644 --- a/Module/StatusAbstract.php +++ b/Module/StatusAbstract.php @@ -33,13 +33,13 @@ abstract class StatusAbstract * Deactivate module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function activate(DatabasePool $dbPool, InfoManager $info) : void + public static function activate(DatabasePool $dbPool, ModuleInfo $info) : void { self::activateRoutes(__DIR__ . '/../../Web/Routes.php', __DIR__ . '/../../Modules/' . $info->getDirectory() . '/Admin/Routes/'); self::activateInDatabase($dbPool, $info); @@ -67,13 +67,13 @@ abstract class StatusAbstract * Deactivate module in database. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function activateInDatabase(DatabasePool $dbPool, InfoManager $info) : void + public static function activateInDatabase(DatabasePool $dbPool, ModuleInfo $info) : void { $query = new Builder($dbPool->get('update')); $query->prefix($dbPool->get('update')->prefix); @@ -87,13 +87,13 @@ abstract class StatusAbstract * Deactivate module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function deactivate(DatabasePool $dbPool, InfoManager $info) : void + public static function deactivate(DatabasePool $dbPool, ModuleInfo $info) : void { self::deactivateRoutes(__DIR__ . '/../../Web/Routes.php', __DIR__ . '/../../Modules/' . $info->getDirectory() . '/Admin/Routes/'); self::deactivateInDatabase($dbPool, $info); @@ -121,13 +121,13 @@ abstract class StatusAbstract * Deactivate module in database. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function deactivateInDatabase(DatabasePool $dbPool, InfoManager $info) : void + public static function deactivateInDatabase(DatabasePool $dbPool, ModuleInfo $info) : void { $query = new Builder($dbPool->get('update')); $query->prefix($dbPool->get('update')->prefix); diff --git a/Module/UninstallerAbstract.php b/Module/UninstallerAbstract.php index 314dc038b..8cf38cf32 100644 --- a/Module/UninstallerAbstract.php +++ b/Module/UninstallerAbstract.php @@ -32,7 +32,7 @@ abstract class UninstallerAbstract * Install module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * @@ -42,7 +42,7 @@ abstract class UninstallerAbstract * * @since 1.0.0 */ - public static function uninstall(DatabasePool $dbPool, InfoManager $info) : void + public static function uninstall(DatabasePool $dbPool, ModuleInfo $info) : void { self::dropTables($dbPool, $info); self::unregisterFromDatabase($dbPool, $info); @@ -52,13 +52,13 @@ abstract class UninstallerAbstract * Drop tables of module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function dropTables(DatabasePool $dbPool, InfoManager $info) : void + public static function dropTables(DatabasePool $dbPool, ModuleInfo $info) : void { $path = \dirname($info->getPath()) . '/Admin/Install/db.json'; @@ -87,13 +87,13 @@ abstract class UninstallerAbstract * Unregister module from database. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 */ - public static function unregisterFromDatabase(DatabasePool $dbPool, InfoManager $info) : void + public static function unregisterFromDatabase(DatabasePool $dbPool, ModuleInfo $info) : void { $queryLoad = new Builder($dbPool->get('delete')); $queryLoad->prefix($dbPool->get('delete')->prefix); diff --git a/Module/UpdaterAbstract.php b/Module/UpdaterAbstract.php index 5229d0aac..ed916f4f3 100644 --- a/Module/UpdaterAbstract.php +++ b/Module/UpdaterAbstract.php @@ -30,14 +30,14 @@ abstract class UpdaterAbstract * Install module. * * @param DatabasePool $dbPool Database instance - * @param InfoManager $info Module info + * @param ModuleInfo $info Module info * * @return void * * @since 1.0.0 * @codeCoverageIgnore */ - public static function update(DatabasePool $dbPool, InfoManager $info) : void + public static function update(DatabasePool $dbPool, ModuleInfo $info) : void { } } diff --git a/Socket/Client/Client.php b/Socket/Client/Client.php index a06561195..1ffcc0b1a 100644 --- a/Socket/Client/Client.php +++ b/Socket/Client/Client.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\Socket\Client; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Message\Socket\PacketManager; use phpOMS\Socket\Server\ClientManager; use phpOMS\Socket\SocketAbstract; diff --git a/Socket/Server/Server.php b/Socket/Server/Server.php index 72a0b46e2..4f2df6e86 100644 --- a/Socket/Server/Server.php +++ b/Socket/Server/Server.php @@ -15,7 +15,7 @@ declare(strict_types=1); namespace phpOMS\Socket\Server; use phpOMS\Account\Account; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Message\Socket\PacketManager; use phpOMS\Socket\Client\ClientConnection; use phpOMS\Socket\SocketAbstract; diff --git a/tests/ApplicationAbstractTest.php b/tests/Application/ApplicationAbstractTest.php similarity index 76% rename from tests/ApplicationAbstractTest.php rename to tests/Application/ApplicationAbstractTest.php index c8785fb48..5bf97a3e3 100644 --- a/tests/ApplicationAbstractTest.php +++ b/tests/Application/ApplicationAbstractTest.php @@ -12,12 +12,12 @@ */ declare(strict_types=1); -namespace phpOMS\tests; +namespace phpOMS\tests\Application; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; /** - * @testdox phpOMS\tests\ApplicationAbstractTest: Application abstraction + * @testdox phpOMS\tests\Application\ApplicationAbstractTest: Application abstraction * * @internal */ @@ -25,7 +25,7 @@ class ApplicationAbstractTest extends \PHPUnit\Framework\TestCase { /** * @testdox Application values can be set and returned - * @covers phpOMS\ApplicationAbstract + * @covers phpOMS\Application\ApplicationAbstract * @group framework */ public function testInputOutput() : void @@ -38,7 +38,7 @@ class ApplicationAbstractTest extends \PHPUnit\Framework\TestCase /** * @testdox Application values cannot be overwritten - * @covers phpOMS\ApplicationAbstract + * @covers phpOMS\Application\ApplicationAbstract * @group framework */ public function testInvalidInputOutput() : void diff --git a/tests/Dispatcher/DispatcherTest.php b/tests/Dispatcher/DispatcherTest.php index 5824348a7..d3261429f 100644 --- a/tests/Dispatcher/DispatcherTest.php +++ b/tests/Dispatcher/DispatcherTest.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\tests\Dispatcher; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Dispatcher\Dispatcher; use phpOMS\Localization\Localization; use phpOMS\Message\Http\HttpRequest; diff --git a/tests/Module/ModuleAbstractTest.php b/tests/Module/ModuleAbstractTest.php index e7fd45de9..c16d96915 100644 --- a/tests/Module/ModuleAbstractTest.php +++ b/tests/Module/ModuleAbstractTest.php @@ -16,7 +16,7 @@ namespace phpOMS\tests\Module; require_once __DIR__ . '/../Autoloader.php'; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Event\EventManager; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; diff --git a/tests/Module/InfoManagerTest.php b/tests/Module/ModuleInfoTest.php similarity index 80% rename from tests/Module/InfoManagerTest.php rename to tests/Module/ModuleInfoTest.php index c172fa970..74306b605 100644 --- a/tests/Module/InfoManagerTest.php +++ b/tests/Module/ModuleInfoTest.php @@ -16,23 +16,23 @@ namespace phpOMS\tests\Module; require_once __DIR__ . '/../Autoloader.php'; -use phpOMS\Module\InfoManager; +use phpOMS\Module\ModuleInfo; /** - * @testdox phpOMS\tests\Module\InfoManagerTest: Module info file manager + * @testdox phpOMS\tests\Module\ModuleInfoTest: Module info file manager * * @internal */ -class InfoManagerTest extends \PHPUnit\Framework\TestCase +class ModuleInfoTest extends \PHPUnit\Framework\TestCase { /** * @testdox A info file can be correctly loaded - * @covers phpOMS\Module\InfoManager + * @covers phpOMS\Module\ModuleInfo * @group framework */ public function testLoad() : void { - $info = new InfoManager(__DIR__ . '/info-test.json'); + $info = new ModuleInfo(__DIR__ . '/info-test.json'); $info->load(); $jarray = \json_decode(\file_get_contents(__DIR__ . '/info-test.json'), true); @@ -52,21 +52,21 @@ class InfoManagerTest extends \PHPUnit\Framework\TestCase /** * @testdox A info file can be modified - * @covers phpOMS\Module\InfoManager + * @covers phpOMS\Module\ModuleInfo * @group framework */ public function testChange() : void { $jarray = \json_decode(\file_get_contents(__DIR__ . '/info-test.json'), true); - $info = new InfoManager(__DIR__ . '/info-test.json'); + $info = new ModuleInfo(__DIR__ . '/info-test.json'); $info->load(); $info->set('/name/internal', 'ABC'); self::assertEquals('ABC', $info->getInternalName()); $info->update(); - $info2 = new InfoManager(__DIR__ . '/info-test.json'); + $info2 = new ModuleInfo(__DIR__ . '/info-test.json'); $info2->load(); self::assertEquals($info->getInternalName(), $info2->getInternalName()); @@ -76,40 +76,40 @@ class InfoManagerTest extends \PHPUnit\Framework\TestCase /** * @testdox A invalid info file path load throws a PathException - * @covers phpOMS\Module\InfoManager + * @covers phpOMS\Module\ModuleInfo * @group framework */ public function testInvalidPathLoad() : void { self::expectException(\phpOMS\System\File\PathException::class); - $info = new InfoManager(__DIR__ . '/invalid.json'); + $info = new ModuleInfo(__DIR__ . '/invalid.json'); $info->load(); } /** * @testdox A invalid info file path update throws a PathException - * @covers phpOMS\Module\InfoManager + * @covers phpOMS\Module\ModuleInfo * @group framework */ public function testInvalidPathUpdate() : void { self::expectException(\phpOMS\System\File\PathException::class); - $info = new InfoManager(__DIR__ . '/invalid.json'); + $info = new ModuleInfo(__DIR__ . '/invalid.json'); $info->update(); } /** * @testdox A invalid change data throws a InvalidArgumentException - * @covers phpOMS\Module\InfoManager + * @covers phpOMS\Module\ModuleInfo * @group framework */ public function testInvalidDataSet() : void { self::expectException(\InvalidArgumentException::class); - $info = new InfoManager(__DIR__ . '/info-test.json'); + $info = new ModuleInfo(__DIR__ . '/info-test.json'); $info->load(); $testObj = new class() { diff --git a/tests/Module/ModuleManagerTest.php b/tests/Module/ModuleManagerTest.php index f1e402714..435d61510 100644 --- a/tests/Module/ModuleManagerTest.php +++ b/tests/Module/ModuleManagerTest.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace phpOMS\tests\Module; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Dispatcher\Dispatcher; use phpOMS\Message\Http\HttpRequest; use phpOMS\Module\ModuleManager; diff --git a/tests/Module/NullModuleTest.php b/tests/Module/NullModuleTest.php index 16cf2ed55..3209b018a 100644 --- a/tests/Module/NullModuleTest.php +++ b/tests/Module/NullModuleTest.php @@ -16,7 +16,7 @@ namespace phpOMS\tests\Module; require_once __DIR__ . '/../Autoloader.php'; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Module\NullModule; /** diff --git a/tests/Socket/Client/ClientTest.php b/tests/Socket/Client/ClientTest.php index a85b79c03..49e301a47 100644 --- a/tests/Socket/Client/ClientTest.php +++ b/tests/Socket/Client/ClientTest.php @@ -16,7 +16,7 @@ namespace phpOMS\tests\Socket\Client; use Model\CoreSettings; use phpOMS\Account\AccountManager; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Autoloader; use phpOMS\DataStorage\Cache\CachePool; use phpOMS\Dispatcher\Dispatcher; diff --git a/tests/Socket/Client/ClientTestHelper.php b/tests/Socket/Client/ClientTestHelper.php index 532bf44da..4961eaf69 100644 --- a/tests/Socket/Client/ClientTestHelper.php +++ b/tests/Socket/Client/ClientTestHelper.php @@ -16,7 +16,7 @@ namespace phpOMS\tests\Socket\Client; use Model\CoreSettings; use phpOMS\Account\AccountManager; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\DataStorage\Cache\CachePool; use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DataMapperAbstract; diff --git a/tests/Socket/Server/ServerTest.php b/tests/Socket/Server/ServerTest.php index bb0af56a0..ffe5d2efc 100644 --- a/tests/Socket/Server/ServerTest.php +++ b/tests/Socket/Server/ServerTest.php @@ -16,7 +16,7 @@ namespace phpOMS\tests\Socket\Server; use Model\CoreSettings; use phpOMS\Account\AccountManager; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Autoloader; use phpOMS\DataStorage\Cache\CachePool; use phpOMS\Dispatcher\Dispatcher; diff --git a/tests/Views/ViewTest.php b/tests/Views/ViewTest.php index a9da8381c..aecaec830 100644 --- a/tests/Views/ViewTest.php +++ b/tests/Views/ViewTest.php @@ -16,7 +16,7 @@ namespace phpOMS\tests\Views; require_once __DIR__ . '/../Autoloader.php'; -use phpOMS\ApplicationAbstract; +use phpOMS\Application\ApplicationAbstract; use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Localization\L11nManager; use phpOMS\Localization\Localization;